virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/cbs_internal: Use unions to shrink size of descriptors

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-08-04 11:02:14 +02:00
parent b37805ddbd
commit 9638f5b1a2
3 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/cbs.c
View File

@@ -857,8 +857,8 @@ static void cbs_default_free_unit_content(void *opaque, uint8_t *data)
const CodedBitstreamUnitTypeDescriptor *desc = opaque; const CodedBitstreamUnitTypeDescriptor *desc = opaque;
if (desc->content_type == CBS_CONTENT_TYPE_INTERNAL_REFS) { if (desc->content_type == CBS_CONTENT_TYPE_INTERNAL_REFS) {
int i; int i;
for (i = 0; i < desc->nb_ref_offsets; i++) { for (i = 0; i < desc->type.ref.nb_offsets; i++) {
void **ptr = (void**)(data + desc->ref_offsets[i]); void **ptr = (void**)(data + desc->type.ref.offsets[i]);
av_buffer_unref((AVBufferRef**)(ptr + 1)); av_buffer_unref((AVBufferRef**)(ptr + 1));
} }
} }
@@ -880,12 +880,12 @@ static const CodedBitstreamUnitTypeDescriptor
if (desc->nb_unit_types == 0) if (desc->nb_unit_types == 0)
break; break;
if (desc->nb_unit_types == CBS_UNIT_TYPE_RANGE) { if (desc->nb_unit_types == CBS_UNIT_TYPE_RANGE) {
if (unit->type >= desc->unit_type_range_start && if (unit->type >= desc->unit_type.range.start &&
unit->type <= desc->unit_type_range_end) unit->type <= desc->unit_type.range.end)
return desc; return desc;
} else { } else {
for (j = 0; j < desc->nb_unit_types; j++) { for (j = 0; j < desc->nb_unit_types; j++) {
if (desc->unit_types[j] == unit->type) if (desc->unit_type.list[j] == unit->type)
return desc; return desc;
} }
} }
@@ -910,7 +910,8 @@ int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx,
unit->content_ref = unit->content_ref =
av_buffer_create(unit->content, desc->content_size, av_buffer_create(unit->content, desc->content_size,
desc->content_free ? desc->content_free desc->content_type == CBS_CONTENT_TYPE_COMPLEX
? desc->type.complex.content_free
: cbs_default_free_unit_content, : cbs_default_free_unit_content,
(void*)desc, 0); (void*)desc, 0);
if (!unit->content_ref) { if (!unit->content_ref) {
@@ -936,10 +937,10 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
if (!copy) if (!copy)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < desc->nb_ref_offsets; i++) { for (i = 0; i < desc->type.ref.nb_offsets; i++) {
const uint8_t *const *src_ptr = (const uint8_t* const*)(src + desc->ref_offsets[i]); const uint8_t *const *src_ptr = (const uint8_t* const*)(src + desc->type.ref.offsets[i]);
const AVBufferRef *src_buf = *(AVBufferRef**)(src_ptr + 1); const AVBufferRef *src_buf = *(AVBufferRef**)(src_ptr + 1);
uint8_t **copy_ptr = (uint8_t**)(copy + desc->ref_offsets[i]); uint8_t **copy_ptr = (uint8_t**)(copy + desc->type.ref.offsets[i]);
AVBufferRef **copy_buf = (AVBufferRef**)(copy_ptr + 1); AVBufferRef **copy_buf = (AVBufferRef**)(copy_ptr + 1);
if (!*src_ptr) { if (!*src_ptr) {
@@ -962,7 +963,6 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
} }
*clone_ref = av_buffer_create(copy, desc->content_size, *clone_ref = av_buffer_create(copy, desc->content_size,
desc->content_free ? desc->content_free :
cbs_default_free_unit_content, cbs_default_free_unit_content,
(void*)desc, 0); (void*)desc, 0);
if (!*clone_ref) { if (!*clone_ref) {
@@ -974,7 +974,7 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
fail: fail:
for (--i; i >= 0; i--) for (--i; i >= 0; i--)
av_buffer_unref((AVBufferRef**)(copy + desc->ref_offsets[i])); av_buffer_unref((AVBufferRef**)(copy + desc->type.ref.offsets[i]));
av_freep(&copy); av_freep(&copy);
*clone_ref = NULL; *clone_ref = NULL;
return err; return err;
@@ -1010,9 +1010,9 @@ static int cbs_clone_unit_content(CodedBitstreamContext *ctx,
break; break;
case CBS_CONTENT_TYPE_COMPLEX: case CBS_CONTENT_TYPE_COMPLEX:
if (!desc->content_clone) if (!desc->type.complex.content_clone)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
err = desc->content_clone(&ref, unit); err = desc->type.complex.content_clone(&ref, unit);
break; break;
default: default:

67
libavcodec/cbs_internal.h
View File

@@ -60,13 +60,16 @@ typedef const struct CodedBitstreamUnitTypeDescriptor {
// used instead. // used instead.
int nb_unit_types; int nb_unit_types;
// Array of unit types that this entry describes. union {
const CodedBitstreamUnitType unit_types[CBS_MAX_UNIT_TYPES]; // Array of unit types that this entry describes.
CodedBitstreamUnitType list[CBS_MAX_UNIT_TYPES];
// Start and end of unit type range, used if nb_unit_types is // Start and end of unit type range, used if nb_unit_types is
// CBS_UNIT_TYPE_RANGE. // CBS_UNIT_TYPE_RANGE.
const CodedBitstreamUnitType unit_type_range_start; struct {
const CodedBitstreamUnitType unit_type_range_end; CodedBitstreamUnitType start;
CodedBitstreamUnitType end;
} range;
} unit_type;
// The type of content described. // The type of content described.
enum CBSContentType content_type; enum CBSContentType content_type;
@@ -74,18 +77,24 @@ typedef const struct CodedBitstreamUnitTypeDescriptor {
// the decomposed content of this type of unit. // the decomposed content of this type of unit.
size_t content_size; size_t content_size;
// Number of entries in the ref_offsets array. Only used if the union {
// content_type is CBS_CONTENT_TYPE_INTERNAL_REFS. struct {
int nb_ref_offsets; // Number of entries in the ref_offsets array. Only nonzero
// The structure must contain two adjacent elements: // if the content_type is CBS_CONTENT_TYPE_INTERNAL_REFS.
// type *field; int nb_offsets;
// AVBufferRef *field_ref; // The structure must contain two adjacent elements:
// where field points to something in the buffer referred to by // type *field;
// field_ref. This offset is then set to offsetof(struct, field). // AVBufferRef *field_ref;
size_t ref_offsets[CBS_MAX_REF_OFFSETS]; // where field points to something in the buffer referred to by
// field_ref. This offset is then set to offsetof(struct, field).
size_t offsets[CBS_MAX_REF_OFFSETS];
} ref;
void (*content_free)(void *opaque, uint8_t *data); struct {
int (*content_clone)(AVBufferRef **ref, CodedBitstreamUnit *unit); void (*content_free)(void *opaque, uint8_t *data);
int (*content_clone)(AVBufferRef **ref, CodedBitstreamUnit *unit);
} complex;
} type;
} CodedBitstreamUnitTypeDescriptor; } CodedBitstreamUnitTypeDescriptor;
typedef struct CodedBitstreamType { typedef struct CodedBitstreamType {
@@ -184,38 +193,38 @@ int ff_cbs_write_signed(CodedBitstreamContext *ctx, PutBitContext *pbc,
#define TYPE_LIST(...) { __VA_ARGS__ } #define TYPE_LIST(...) { __VA_ARGS__ }
#define CBS_UNIT_TYPE_POD(type, structure) { \ #define CBS_UNIT_TYPE_POD(type, structure) { \
.nb_unit_types = 1, \ .nb_unit_types = 1, \
.unit_types = { type }, \ .unit_type.list = { type }, \
.content_type = CBS_CONTENT_TYPE_POD, \ .content_type = CBS_CONTENT_TYPE_POD, \
.content_size = sizeof(structure), \ .content_size = sizeof(structure), \
} }
#define CBS_UNIT_TYPES_INTERNAL_REF(types, structure, ref_field) { \ #define CBS_UNIT_TYPES_INTERNAL_REF(types, structure, ref_field) { \
.nb_unit_types = FF_ARRAY_ELEMS((CodedBitstreamUnitType[])TYPE_LIST types), \ .nb_unit_types = FF_ARRAY_ELEMS((CodedBitstreamUnitType[])TYPE_LIST types), \
.unit_types = TYPE_LIST types, \ .unit_type.list = TYPE_LIST types, \
.content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, \ .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, \
.content_size = sizeof(structure), \ .content_size = sizeof(structure), \
.nb_ref_offsets = 1, \ .type.ref = { .nb_offsets = 1, \
.ref_offsets = { offsetof(structure, ref_field) }, \ .offsets = { offsetof(structure, ref_field) } }, \
} }
#define CBS_UNIT_TYPE_INTERNAL_REF(type, structure, ref_field) \ #define CBS_UNIT_TYPE_INTERNAL_REF(type, structure, ref_field) \
CBS_UNIT_TYPES_INTERNAL_REF((type), structure, ref_field) CBS_UNIT_TYPES_INTERNAL_REF((type), structure, ref_field)
#define CBS_UNIT_RANGE_INTERNAL_REF(range_start, range_end, structure, ref_field) { \ #define CBS_UNIT_RANGE_INTERNAL_REF(range_start, range_end, structure, ref_field) { \
.nb_unit_types = CBS_UNIT_TYPE_RANGE, \ .nb_unit_types = CBS_UNIT_TYPE_RANGE, \
.unit_type_range_start = range_start, \ .unit_type.range.start = range_start, \
.unit_type_range_end = range_end, \ .unit_type.range.end = range_end, \
.content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, \ .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, \
.content_size = sizeof(structure), \ .content_size = sizeof(structure), \
.nb_ref_offsets = 1, \ .type.ref = { .nb_offsets = 1, \
.ref_offsets = { offsetof(structure, ref_field) }, \ .offsets = { offsetof(structure, ref_field) } }, \
} }
#define CBS_UNIT_TYPES_COMPLEX(types, structure, free_func) { \ #define CBS_UNIT_TYPES_COMPLEX(types, structure, free_func) { \
.nb_unit_types = FF_ARRAY_ELEMS((CodedBitstreamUnitType[])TYPE_LIST types), \ .nb_unit_types = FF_ARRAY_ELEMS((CodedBitstreamUnitType[])TYPE_LIST types), \
.unit_types = TYPE_LIST types, \ .unit_type.list = TYPE_LIST types, \
.content_type = CBS_CONTENT_TYPE_COMPLEX, \ .content_type = CBS_CONTENT_TYPE_COMPLEX, \
.content_size = sizeof(structure), \ .content_size = sizeof(structure), \
.content_free = free_func, \ .type.complex = { .content_free = free_func }, \
} }
#define CBS_UNIT_TYPE_COMPLEX(type, structure, free_func) \ #define CBS_UNIT_TYPE_COMPLEX(type, structure, free_func) \
CBS_UNIT_TYPES_COMPLEX((type), structure, free_func) CBS_UNIT_TYPES_COMPLEX((type), structure, free_func)

10
libavcodec/cbs_mpeg2.c
View File

@@ -392,14 +392,14 @@ static const CodedBitstreamUnitTypeDescriptor cbs_mpeg2_unit_types[] = {
{ {
.nb_unit_types = CBS_UNIT_TYPE_RANGE, .nb_unit_types = CBS_UNIT_TYPE_RANGE,
.unit_type_range_start = 0x01, .unit_type.range.start = 0x01,
.unit_type_range_end = 0xaf, .unit_type.range.end = 0xaf,
.content_type = CBS_CONTENT_TYPE_INTERNAL_REFS, .content_type = CBS_CONTENT_TYPE_INTERNAL_REFS,
.content_size = sizeof(MPEG2RawSlice), .content_size = sizeof(MPEG2RawSlice),
.nb_ref_offsets = 2, .type.ref = { .nb_offsets = 2,
.ref_offsets = { offsetof(MPEG2RawSlice, header.extra_information_slice.extra_information), .offsets = { offsetof(MPEG2RawSlice, header.extra_information_slice.extra_information),
offsetof(MPEG2RawSlice, data) }, offsetof(MPEG2RawSlice, data) } },
}, },
CBS_UNIT_TYPE_INTERNAL_REF(MPEG2_START_USER_DATA, MPEG2RawUserData, CBS_UNIT_TYPE_INTERNAL_REF(MPEG2_START_USER_DATA, MPEG2RawUserData,