Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

mxfdec: Make sure DataDefinition is consistent between material track and source track.

Browse source 
This fixes 0001GL.MXF.V1.mxf_opatom.mxf and 0001GL00.MXF.A1.mxf_opatom.mxf
getting two streams each due to both using the same SourcePackageID.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
Tomas Härdin 2011-11-28 10:51:00 +01:00 • committed by Janne Grunau
parent 0ac5e6a8c4
commit 0999151962
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libavformat/mxfdec.c
View file

@ -1153,6 +1153,18 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
if (!source_track) if (!source_track)
continue; continue;
if (!(source_track->sequence = mxf_resolve_strong_ref(mxf, &source_track->sequence_ref, Sequence))) {
av_log(mxf->fc, AV_LOG_ERROR, "could not resolve source track sequence strong ref\n");
return AVERROR_INVALIDDATA;
}
/* 0001GL00.MXF.A1.mxf_opatom.mxf has the same SourcePackageID as 0001GL.MXF.V1.mxf_opatom.mxf
* This would result in both files appearing to have two streams. Work around this by sanity checking DataDefinition */
if (memcmp(material_track->sequence->data_definition_ul, source_track->sequence->data_definition_ul, 16)) {
av_log(mxf->fc, AV_LOG_ERROR, "material track %d: DataDefinition mismatch\n", material_track->track_id);
continue;
}
st = avformat_new_stream(mxf->fc, NULL); st = avformat_new_stream(mxf->fc, NULL);
if (!st) { if (!st) {
av_log(mxf->fc, AV_LOG_ERROR, "could not allocate stream\n"); av_log(mxf->fc, AV_LOG_ERROR, "could not allocate stream\n");
@ -1166,11 +1178,6 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
st->start_time = component->start_position; st->start_time = component->start_position;
avpriv_set_pts_info(st, 64, material_track->edit_rate.num, material_track->edit_rate.den); avpriv_set_pts_info(st, 64, material_track->edit_rate.num, material_track->edit_rate.den);
if (!(source_track->sequence = mxf_resolve_strong_ref(mxf, &source_track->sequence_ref, Sequence))) {
av_log(mxf->fc, AV_LOG_ERROR, "could not resolve source track sequence strong ref\n");
return AVERROR_INVALIDDATA;
}
PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul); PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul);
codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul); codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
st->codec->codec_type = codec_ul->id; st->codec->codec_type = codec_ul->id;