highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfdec: track metadata sets by their type

Browse Source 
We typically are only interesed in a single type of metadata set, so it is
better to keep them separated instead of always filtering for them.

Also use av_dynarray_add for increasing their array.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2024-02-17 22:53:00 +01:00
parent aa299faa9a
commit 4ebf478f4c
2 changed files with 60 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mxf.h
View File

@@ -55,6 +55,7 @@ enum MXFMetadataSetType {
GroupOfSoundfieldGroupsLabelSubDescriptor, GroupOfSoundfieldGroupsLabelSubDescriptor,
FFV1SubDescriptor, FFV1SubDescriptor,
JPEG2000SubDescriptor, JPEG2000SubDescriptor,
MetadataSetTypeNB
}; };
enum MXFFrameLayout { enum MXFFrameLayout {

110
libavformat/mxfdec.c
View File

@@ -116,9 +116,13 @@ typedef struct MXFPartition {
typedef struct MXFMetadataSet { typedef struct MXFMetadataSet {
UID uid; UID uid;
uint64_t partition_score; uint64_t partition_score;
enum MXFMetadataSetType type;
} MXFMetadataSet; } MXFMetadataSet;
typedef struct MXFMetadataSetGroup {
MXFMetadataSet **metadata_sets;
int metadata_sets_count;
} MXFMetadataSetGroup;
typedef struct MXFCryptoContext { typedef struct MXFCryptoContext {
MXFMetadataSet meta; MXFMetadataSet meta;
UID source_container_ul; UID source_container_ul;
@@ -302,8 +306,7 @@ typedef struct MXFContext {
int packages_count; int packages_count;
UID *essence_container_data_refs; UID *essence_container_data_refs;
int essence_container_data_count; int essence_container_data_count;
MXFMetadataSet **metadata_sets; MXFMetadataSetGroup metadata_set_groups[MetadataSetTypeNB];
int metadata_sets_count;
AVFormatContext *fc; AVFormatContext *fc;
struct AVAES *aesc; struct AVAES *aesc;
uint8_t *local_tags; uint8_t *local_tags;
@@ -374,10 +377,10 @@ static const uint8_t mxf_mastering_display_uls[4][16] = {
#define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y))) #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y)))
static void mxf_free_metadataset(MXFMetadataSet **ctx, int freectx) static void mxf_free_metadataset(MXFMetadataSet **ctx, enum MXFMetadataSetType type)
{ {
MXFIndexTableSegment *seg; MXFIndexTableSegment *seg;
switch ((*ctx)->type) { switch (type) {
case Descriptor: case Descriptor:
case MultipleDescriptor: case MultipleDescriptor:
av_freep(&((MXFDescriptor *)*ctx)->extradata); av_freep(&((MXFDescriptor *)*ctx)->extradata);
@@ -422,10 +425,8 @@ static void mxf_free_metadataset(MXFMetadataSet **ctx, int freectx)
default: default:
break; break;
} }
if (freectx) {
av_freep(ctx); av_freep(ctx);
} }
}
static int64_t klv_decode_ber_length(AVIOContext *pb) static int64_t klv_decode_ber_length(AVIOContext *pb)
{ {
@@ -915,34 +916,32 @@ static uint64_t partition_score(MXFPartition *p)
return (score << 60) | ((uint64_t)p->pack_ofs >> 4); return (score << 60) | ((uint64_t)p->pack_ofs >> 4);
} }
static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set) static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set, enum MXFMetadataSetType type)
{ {
MXFMetadataSet **tmp; MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type];
enum MXFMetadataSetType type = (*metadata_set)->type; int ret;
// Index Table is special because it might be added manually without // Index Table is special because it might be added manually without
// partition and we iterate thorugh all instances of them. Also some files // partition and we iterate thorugh all instances of them. Also some files
// use the same Instance UID for different index tables... // use the same Instance UID for different index tables...
if (type != IndexTableSegment) { if (type != IndexTableSegment) {
for (int i = 0; i < mxf->metadata_sets_count; i++) { for (int i = 0; i < mg->metadata_sets_count; i++) {
if (!memcmp((*metadata_set)->uid, mxf->metadata_sets[i]->uid, 16) && type == mxf->metadata_sets[i]->type) { if (!memcmp((*metadata_set)->uid, mg->metadata_sets[i]->uid, 16)) {
uint64_t old_s = mxf->metadata_sets[i]->partition_score; uint64_t old_s = mg->metadata_sets[i]->partition_score;
uint64_t new_s = (*metadata_set)->partition_score; uint64_t new_s = (*metadata_set)->partition_score;
if (old_s > new_s) { if (old_s > new_s) {
mxf_free_metadataset(metadata_set, 1); mxf_free_metadataset(metadata_set, type);
return 0; return 0;
} }
} }
} }
} }
tmp = av_realloc_array(mxf->metadata_sets, mxf->metadata_sets_count + 1, sizeof(*mxf->metadata_sets));
if (!tmp) { ret = av_dynarray_add_nofree(&mg->metadata_sets, &mg->metadata_sets_count, *metadata_set);
mxf_free_metadataset(metadata_set, 1); if (ret < 0) {
return AVERROR(ENOMEM); mxf_free_metadataset(metadata_set, type);
return ret;
} }
mxf->metadata_sets = tmp;
mxf->metadata_sets[mxf->metadata_sets_count] = *metadata_set;
mxf->metadata_sets_count++;
return 0; return 0;
} }
@@ -1576,16 +1575,14 @@ static const MXFCodecUL *mxf_get_codec_ul(const MXFCodecUL *uls, UID *uid)
static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMetadataSetType type) static void *mxf_resolve_strong_ref(MXFContext *mxf, UID *strong_ref, enum MXFMetadataSetType type)
{ {
int i; MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type];
if (!strong_ref) if (!strong_ref)
return NULL; return NULL;
for (i = mxf->metadata_sets_count - 1; i >= 0; i--) { for (int i = mg->metadata_sets_count - 1; i >= 0; i--)
if (!memcmp(*strong_ref, mxf->metadata_sets[i]->uid, 16) && if (!memcmp(*strong_ref, mg->metadata_sets[i]->uid, 16))
(mxf->metadata_sets[i]->type == type)) { return mg->metadata_sets[i];
return mxf->metadata_sets[i];
}
}
return NULL; return NULL;
} }
@@ -1742,12 +1739,10 @@ static int mxf_get_sorted_table_segments(MXFContext *mxf, int *nb_sorted_segment
int i, j, nb_segments = 0; int i, j, nb_segments = 0;
MXFIndexTableSegment **unsorted_segments; MXFIndexTableSegment **unsorted_segments;
int last_body_sid = -1, last_index_sid = -1, last_index_start = -1; int last_body_sid = -1, last_index_sid = -1, last_index_start = -1;
MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[IndexTableSegment];
/* count number of segments, allocate arrays and copy unsorted segments */ /* count number of segments, allocate arrays and copy unsorted segments */
for (i = 0; i < mxf->metadata_sets_count; i++) nb_segments = mg->metadata_sets_count;
if (mxf->metadata_sets[i]->type == IndexTableSegment)
nb_segments++;
if (!nb_segments) if (!nb_segments)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -1758,16 +1753,14 @@ static int mxf_get_sorted_table_segments(MXFContext *mxf, int *nb_sorted_segment
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
for (i = nb_segments = 0; i < mxf->metadata_sets_count; i++) { for (i = nb_segments = 0; i < mg->metadata_sets_count; i++) {
if (mxf->metadata_sets[i]->type == IndexTableSegment) { MXFIndexTableSegment *s = (MXFIndexTableSegment*)mg->metadata_sets[i];
MXFIndexTableSegment *s = (MXFIndexTableSegment*)mxf->metadata_sets[i];
if (s->edit_unit_byte_count || s->nb_index_entries) if (s->edit_unit_byte_count || s->nb_index_entries)
unsorted_segments[nb_segments++] = s; unsorted_segments[nb_segments++] = s;
else else
av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment at %"PRId64" missing EditUnitByteCount and IndexEntryArray\n", av_log(mxf->fc, AV_LOG_WARNING, "IndexSID %i segment at %"PRId64" missing EditUnitByteCount and IndexEntryArray\n",
s->index_sid, s->index_start_position); s->index_sid, s->index_start_position);
} }
}
if (!nb_segments) { if (!nb_segments) {
av_freep(sorted_segments); av_freep(sorted_segments);
@@ -2484,9 +2477,10 @@ static int set_language(AVFormatContext *s, const char *rfc5646, AVDictionary **
static MXFMCASubDescriptor *find_mca_link_id(MXFContext *mxf, enum MXFMetadataSetType type, UID *mca_link_id) static MXFMCASubDescriptor *find_mca_link_id(MXFContext *mxf, enum MXFMetadataSetType type, UID *mca_link_id)
{ {
for (int k = 0; k < mxf->metadata_sets_count; k++) { MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type];
MXFMCASubDescriptor *group = (MXFMCASubDescriptor*)mxf->metadata_sets[k]; for (int k = 0; k < mg->metadata_sets_count; k++) {
if (group->meta.type == type && !memcmp(&group->mca_link_id, mca_link_id, 16)) MXFMCASubDescriptor *group = (MXFMCASubDescriptor*)mg->metadata_sets[k];
if (!memcmp(&group->mca_link_id, mca_link_id, 16))
return group; return group;
} }
return NULL; return NULL;
@@ -2622,7 +2616,6 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
MXFPackage *material_package = NULL; MXFPackage *material_package = NULL;
int i, j, k, ret; int i, j, k, ret;
av_log(mxf->fc, AV_LOG_TRACE, "metadata sets count %d\n", mxf->metadata_sets_count);
/* TODO: handle multiple material packages (OP3x) */ /* TODO: handle multiple material packages (OP3x) */
for (i = 0; i < mxf->packages_count; i++) { for (i = 0; i < mxf->packages_count; i++) {
material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage); material_package = mxf_resolve_strong_ref(mxf, &mxf->packages_refs[i], MaterialPackage);
@@ -2807,13 +2800,11 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
/* HACK: replacing the original key with mxf_encrypted_essence_container /* HACK: replacing the original key with mxf_encrypted_essence_container
* is not allowed according to s429-6, try to find correct information anyway */ * is not allowed according to s429-6, try to find correct information anyway */
if (IS_KLV_KEY(essence_container_ul, mxf_encrypted_essence_container)) { if (IS_KLV_KEY(essence_container_ul, mxf_encrypted_essence_container)) {
MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[CryptoContext];
av_log(mxf->fc, AV_LOG_INFO, "broken encrypted mxf file\n"); av_log(mxf->fc, AV_LOG_INFO, "broken encrypted mxf file\n");
for (k = 0; k < mxf->metadata_sets_count; k++) { if (mg->metadata_sets_count) {
MXFMetadataSet *metadata = mxf->metadata_sets[k]; MXFMetadataSet *metadata = mg->metadata_sets[0];
if (metadata->type == CryptoContext) {
essence_container_ul = &((MXFCryptoContext *)metadata)->source_container_ul; essence_container_ul = &((MXFCryptoContext *)metadata)->source_container_ul;
break;
}
} }
} }
@@ -3261,7 +3252,6 @@ static const MXFMetadataReadTableEntry mxf_metadata_read_table[] = {
static int mxf_metadataset_init(MXFMetadataSet *ctx, enum MXFMetadataSetType type, MXFPartition *partition) static int mxf_metadataset_init(MXFMetadataSet *ctx, enum MXFMetadataSetType type, MXFPartition *partition)
{ {
ctx->type = type;
ctx->partition_score = partition_score(partition); ctx->partition_score = partition_score(partition);
switch (type){ switch (type){
case MultipleDescriptor: case MultipleDescriptor:
@@ -3300,7 +3290,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
UID uid = {0}; UID uid = {0};
if (next < 0 || next > INT64_MAX - size) { if (next < 0 || next > INT64_MAX - size) {
if (meta) { if (meta) {
mxf_free_metadataset(&meta, 1); mxf_free_metadataset(&meta, type);
} }
return next < 0 ? next : AVERROR_INVALIDDATA; return next < 0 ? next : AVERROR_INVALIDDATA;
} }
@@ -3326,7 +3316,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
avio_read(pb, meta->uid, 16); avio_read(pb, meta->uid, 16);
} else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) { } else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) {
if (meta) { if (meta) {
mxf_free_metadataset(&meta, 1); mxf_free_metadataset(&meta, type);
} }
return ret; return ret;
} }
@@ -3335,7 +3325,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
* it extending past the end of the KLV though (zzuf5.mxf). */ * it extending past the end of the KLV though (zzuf5.mxf). */
if (avio_tell(pb) > klv_end) { if (avio_tell(pb) > klv_end) {
if (meta) { if (meta) {
mxf_free_metadataset(&meta, 1); mxf_free_metadataset(&meta, type);
} }
av_log(mxf->fc, AV_LOG_ERROR, av_log(mxf->fc, AV_LOG_ERROR,
@@ -3345,7 +3335,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
} else if (avio_tell(pb) <= next) /* only seek forward, else this can loop for a long time */ } else if (avio_tell(pb) <= next) /* only seek forward, else this can loop for a long time */
avio_seek(pb, next, SEEK_SET); avio_seek(pb, next, SEEK_SET);
} }
return meta ? mxf_add_metadata_set(mxf, &meta) : 0; return meta ? mxf_add_metadata_set(mxf, &meta, type) : 0;
} }
/** /**
@@ -3601,18 +3591,17 @@ static int mxf_handle_missing_index_segment(MXFContext *mxf, AVStream *st)
int essence_partition_count = 0; int essence_partition_count = 0;
int edit_unit_byte_count = 0; int edit_unit_byte_count = 0;
int i, ret; int i, ret;
MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[IndexTableSegment];
if (!track || track->wrapping != ClipWrapped) if (!track || track->wrapping != ClipWrapped)
return 0; return 0;
/* check if track already has an IndexTableSegment */ /* check if track already has an IndexTableSegment */
for (i = 0; i < mxf->metadata_sets_count; i++) { for (i = 0; i < mg->metadata_sets_count; i++) {
if (mxf->metadata_sets[i]->type == IndexTableSegment) { MXFIndexTableSegment *s = (MXFIndexTableSegment*)mg->metadata_sets[i];
MXFIndexTableSegment *s = (MXFIndexTableSegment*)mxf->metadata_sets[i];
if (s->body_sid == track->body_sid) if (s->body_sid == track->body_sid)
return 0; return 0;
} }
}
/* find the essence partition */ /* find the essence partition */
for (i = 0; i < mxf->partitions_count; i++) { for (i = 0; i < mxf->partitions_count; i++) {
@@ -3643,7 +3632,7 @@ static int mxf_handle_missing_index_segment(MXFContext *mxf, AVStream *st)
if (!(segment = av_mallocz(sizeof(*segment)))) if (!(segment = av_mallocz(sizeof(*segment))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if ((ret = mxf_add_metadata_set(mxf, (MXFMetadataSet**)&segment))) if ((ret = mxf_add_metadata_set(mxf, (MXFMetadataSet**)&segment, IndexTableSegment)))
return ret; return ret;
/* Make sure we have nonzero unique index_sid, body_sid will be ok, because /* Make sure we have nonzero unique index_sid, body_sid will be ok, because
@@ -3651,7 +3640,6 @@ static int mxf_handle_missing_index_segment(MXFContext *mxf, AVStream *st)
if (!track->index_sid) if (!track->index_sid)
track->index_sid = track->body_sid; track->index_sid = track->body_sid;
segment->meta.type = IndexTableSegment;
/* stream will be treated as small EditUnitByteCount */ /* stream will be treated as small EditUnitByteCount */
segment->edit_unit_byte_count = edit_unit_byte_count; segment->edit_unit_byte_count = edit_unit_byte_count;
segment->index_start_position = 0; segment->index_start_position = 0;
@@ -4120,12 +4108,14 @@ static int mxf_read_close(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) for (i = 0; i < s->nb_streams; i++)
s->streams[i]->priv_data = NULL; s->streams[i]->priv_data = NULL;
for (i = 0; i < mxf->metadata_sets_count; i++) { for (int type = 0; type < FF_ARRAY_ELEMS(mxf->metadata_set_groups); type++) {
mxf_free_metadataset(mxf->metadata_sets + i, 1); MXFMetadataSetGroup *mg = &mxf->metadata_set_groups[type];
for (i = 0; i < mg->metadata_sets_count; i++)
mxf_free_metadataset(mg->metadata_sets + i, type);
mg->metadata_sets_count = 0;
av_freep(&mg->metadata_sets);
} }
mxf->metadata_sets_count = 0;
av_freep(&mxf->partitions); av_freep(&mxf->partitions);
av_freep(&mxf->metadata_sets);
av_freep(&mxf->aesc); av_freep(&mxf->aesc);
av_freep(&mxf->local_tags); av_freep(&mxf->local_tags);