mirror of https://git.ffmpeg.org/ffmpeg.git
mxfdec: Make sure DataDefinition is consistent between material track and source track
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.
This commit is contained in:
parent
1170749b39
commit
e1914b5a2f
|
@ -1117,6 +1117,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 -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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");
|
||||||
|
@ -1130,11 +1142,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 -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue