Skip to content

F
ffmpeg.wasm-core
Commit bd8f1fa1 authored by James Almer's avatar James Almer
Browse files
Options

avcodec/hevc_sei: rename HEVCSEIContext to HEVCSEI 

Cosmetic change skipped in 0b30cb8d
by mistake.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent baf14a99
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
libavcodec/hevc_parse.c
View file @ bd8f1fa1
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "hevc_parse.h" #include "hevc_parse.h"
static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps,
HEVCSEIContext *sei, int is_nalff, int nal_length_size, HEVCSEI *sei, int is_nalff, int nal_length_size,
int err_recognition, int apply_defdispwin, void *logctx) int err_recognition, int apply_defdispwin, void *logctx)
{ {
int i; int i;
...@@ -75,7 +75,7 @@ done: ...@@ -75,7 +75,7 @@ done:
} }
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
HEVCSEIContext *sei, int *is_nalff, int *nal_length_size, HEVCSEI *sei, int *is_nalff, int *nal_length_size,
int err_recognition, int apply_defdispwin, void *logctx) int err_recognition, int apply_defdispwin, void *logctx)
{ {
int ret = 0; int ret = 0;
......
libavcodec/hevc_parse.h
View file @ bd8f1fa1
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "hevc_sei.h" #include "hevc_sei.h"
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
HEVCSEIContext *sei, int *is_nalff, int *nal_length_size, HEVCSEI *sei, int *is_nalff, int *nal_length_size,
int err_recognition, int apply_defdispwin, void *logctx); int err_recognition, int apply_defdispwin, void *logctx);
#endif /* AVCODEC_HEVC_PARSE_H */ #endif /* AVCODEC_HEVC_PARSE_H */
libavcodec/hevc_parser.c
View file @ bd8f1fa1
...@@ -40,7 +40,7 @@ typedef struct HEVCParserContext { ...@@ -40,7 +40,7 @@ typedef struct HEVCParserContext {
H2645Packet pkt; H2645Packet pkt;
HEVCParamSets ps; HEVCParamSets ps;
HEVCSEIContext sei; HEVCSEI sei;
SliceHeader sh; SliceHeader sh;
int parsed_extradata; int parsed_extradata;
...@@ -54,7 +54,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal, ...@@ -54,7 +54,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
{ {
HEVCParserContext *ctx = s->priv_data; HEVCParserContext *ctx = s->priv_data;
HEVCParamSets *ps = &ctx->ps; HEVCParamSets *ps = &ctx->ps;
HEVCSEIContext *sei = &ctx->sei; HEVCSEI *sei = &ctx->sei;
SliceHeader *sh = &ctx->sh; SliceHeader *sh = &ctx->sh;
GetBitContext *gb = &nal->gb; GetBitContext *gb = &nal->gb;
const HEVCWindow *ow; const HEVCWindow *ow;
...@@ -180,7 +180,7 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, ...@@ -180,7 +180,7 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
{ {
HEVCParserContext *ctx = s->priv_data; HEVCParserContext *ctx = s->priv_data;
HEVCParamSets *ps = &ctx->ps; HEVCParamSets *ps = &ctx->ps;
HEVCSEIContext *sei = &ctx->sei; HEVCSEI *sei = &ctx->sei;
int is_global = buf == avctx->extradata; int is_global = buf == avctx->extradata;
int ret, i; int ret, i;
......
libavcodec/hevc_sei.c
View file @ bd8f1fa1
...@@ -124,7 +124,7 @@ static int decode_nal_sei_display_orientation(HEVCSEIDisplayOrientation *s, GetB ...@@ -124,7 +124,7 @@ static int decode_nal_sei_display_orientation(HEVCSEIDisplayOrientation *s, GetB
return 0; return 0;
} }
static int decode_nal_sei_pic_timing(HEVCSEIContext *s, GetBitContext *gb, const HEVCParamSets *ps, static int decode_nal_sei_pic_timing(HEVCSEI *s, GetBitContext *gb, const HEVCParamSets *ps,
void *logctx, int size) void *logctx, int size)
{ {
HEVCSEIPictureTiming *h = &s->picture_timing; HEVCSEIPictureTiming *h = &s->picture_timing;
...@@ -205,7 +205,7 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB ...@@ -205,7 +205,7 @@ static int decode_registered_user_data_closed_caption(HEVCSEIA53Caption *s, GetB
return 0; return 0;
} }
static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEIContext *s, GetBitContext *gb, static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEI *s, GetBitContext *gb,
int size) int size)
{ {
uint32_t country_code; uint32_t country_code;
...@@ -236,7 +236,7 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEIContext *s, GetB ...@@ -236,7 +236,7 @@ static int decode_nal_sei_user_data_registered_itu_t_t35(HEVCSEIContext *s, GetB
return 0; return 0;
} }
static int decode_nal_sei_active_parameter_sets(HEVCSEIContext *s, GetBitContext *gb, void *logctx) static int decode_nal_sei_active_parameter_sets(HEVCSEI *s, GetBitContext *gb, void *logctx)
{ {
int num_sps_ids_minus1; int num_sps_ids_minus1;
int i; int i;
...@@ -272,7 +272,7 @@ static int decode_nal_sei_alternative_transfer(HEVCSEIAlternativeTransfer *s, Ge ...@@ -272,7 +272,7 @@ static int decode_nal_sei_alternative_transfer(HEVCSEIAlternativeTransfer *s, Ge
return 0; return 0;
} }
static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEIContext *s, const HEVCParamSets *ps, static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEI *s, const HEVCParamSets *ps,
int type, int size, void *logctx) int type, int size, void *logctx)
{ {
switch (type) { switch (type) {
...@@ -301,7 +301,7 @@ static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEIContext *s, const HEV ...@@ -301,7 +301,7 @@ static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEIContext *s, const HEV
} }
} }
static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEIContext *s, static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEI *s,
int type, int size, void *logctx) int type, int size, void *logctx)
{ {
switch (type) { switch (type) {
...@@ -314,7 +314,7 @@ static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEIContext *s, ...@@ -314,7 +314,7 @@ static int decode_nal_sei_suffix(GetBitContext *gb, HEVCSEIContext *s,
} }
} }
static int decode_nal_sei_message(GetBitContext *gb, HEVCSEIContext *s, static int decode_nal_sei_message(GetBitContext *gb, HEVCSEI *s,
const HEVCParamSets *ps, int nal_unit_type, const HEVCParamSets *ps, int nal_unit_type,
void *logctx) void *logctx)
{ {
...@@ -344,7 +344,7 @@ static int more_rbsp_data(GetBitContext *gb) ...@@ -344,7 +344,7 @@ static int more_rbsp_data(GetBitContext *gb)
return get_bits_left(gb) > 0 && show_bits(gb, 8) != 0x80; return get_bits_left(gb) > 0 && show_bits(gb, 8) != 0x80;
} }
int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s, int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
const HEVCParamSets *ps, int type) const HEVCParamSets *ps, int type)
{ {
int ret; int ret;
...@@ -357,7 +357,7 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s, ...@@ -357,7 +357,7 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s,
return 1; return 1;
} }
void ff_hevc_reset_sei(HEVCSEIContext *s) void ff_hevc_reset_sei(HEVCSEI *s)
{ {
s->a53_caption.a53_caption_size = 0; s->a53_caption.a53_caption_size = 0;
av_freep(&s->a53_caption.a53_caption); av_freep(&s->a53_caption.a53_caption);
......
libavcodec/hevc_sei.h
View file @ bd8f1fa1
...@@ -106,7 +106,7 @@ typedef struct HEVCSEIAlternativeTransfer { ...@@ -106,7 +106,7 @@ typedef struct HEVCSEIAlternativeTransfer {
int preferred_transfer_characteristics; int preferred_transfer_characteristics;
} HEVCSEIAlternativeTransfer; } HEVCSEIAlternativeTransfer;
typedef struct HEVCSEIContext { typedef struct HEVCSEI {
HEVCSEIPictureHash picture_hash; HEVCSEIPictureHash picture_hash;
HEVCSEIFramePacking frame_packing; HEVCSEIFramePacking frame_packing;
HEVCSEIDisplayOrientation display_orientation; HEVCSEIDisplayOrientation display_orientation;
...@@ -116,11 +116,11 @@ typedef struct HEVCSEIContext { ...@@ -116,11 +116,11 @@ typedef struct HEVCSEIContext {
HEVCSEIContentLight content_light; HEVCSEIContentLight content_light;
int active_seq_parameter_set_id; int active_seq_parameter_set_id;
HEVCSEIAlternativeTransfer alternative_transfer; HEVCSEIAlternativeTransfer alternative_transfer;
} HEVCSEIContext; } HEVCSEI;
struct HEVCParamSets; struct HEVCParamSets;
int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s, int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEI *s,
const struct HEVCParamSets *ps, int type); const struct HEVCParamSets *ps, int type);
/** /**
...@@ -130,6 +130,6 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s, ...@@ -130,6 +130,6 @@ int ff_hevc_decode_nal_sei(GetBitContext *gb, void *logctx, HEVCSEIContext *s,
* *
* @param s HEVCContext. * @param s HEVCContext.
*/ */
void ff_hevc_reset_sei(HEVCSEIContext *s); void ff_hevc_reset_sei(HEVCSEI *s);
#endif /* AVCODEC_HEVC_SEI_H */ #endif /* AVCODEC_HEVC_SEI_H */
libavcodec/hevcdec.h
View file @ bd8f1fa1
...@@ -405,6 +405,7 @@ typedef struct HEVCContext { ...@@ -405,6 +405,7 @@ typedef struct HEVCContext {
uint8_t *sao_pixel_buffer_v[3]; uint8_t *sao_pixel_buffer_v[3];
HEVCParamSets ps; HEVCParamSets ps;
HEVCSEI sei;
AVBufferPool *tab_mvf_pool; AVBufferPool *tab_mvf_pool;
AVBufferPool *rpl_tab_pool; AVBufferPool *rpl_tab_pool;
...@@ -480,8 +481,6 @@ typedef struct HEVCContext { ...@@ -480,8 +481,6 @@ typedef struct HEVCContext {
int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
int nuh_layer_id; int nuh_layer_id;
HEVCSEIContext sei;
} HEVCContext; } HEVCContext;
/** /**
......
libavcodec/mediacodecdec.c
View file @ bd8f1fa1
...@@ -182,7 +182,7 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) ...@@ -182,7 +182,7 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
int ret; int ret;
HEVCParamSets ps; HEVCParamSets ps;
HEVCSEIContext sei; HEVCSEI sei;
const HEVCVPS *vps = NULL; const HEVCVPS *vps = NULL;
const HEVCPPS *pps = NULL; const HEVCPPS *pps = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment