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

avformat/mxfdec: extend mxf_handle_missing_index_segment for all clip wrapped essences

Browse Source 
Also make sure we set a valid track index sid and a valid track edit rate in
order for the index to be useful.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2018-05-20 21:10:50 +02:00
parent 3cb19ba97e
commit 459282389c
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libavformat/mxfdec.c
View File

@@ -2879,35 +2879,33 @@ static void mxf_handle_small_eubc(AVFormatContext *s)
} }
/** /**
* Deal with the case where OPAtom files does not have any IndexTableSegments. * Deal with the case where ClipWrapped essences does not have any IndexTableSegments.
*/ */
static int mxf_handle_missing_index_segment(MXFContext *mxf) static int mxf_handle_missing_index_segment(MXFContext *mxf, AVStream *st)
{ {
AVFormatContext *s = mxf->fc; MXFTrack *track = st->priv_data;
AVStream *st = NULL;
MXFIndexTableSegment *segment = NULL; MXFIndexTableSegment *segment = NULL;
MXFPartition *p = NULL; MXFPartition *p = NULL;
int essence_partition_count = 0; int essence_partition_count = 0;
int i, ret; int i, ret;
st = mxf_get_opatom_stream(mxf);
if (!st)
return 0;
/* TODO: support raw video without an index if they exist */ /* TODO: support raw video without an index if they exist */
if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO || !is_pcm(st->codecpar->codec_id)) if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO || !is_pcm(st->codecpar->codec_id) || track->wrapping != ClipWrapped)
return 0; return 0;
/* check if file already has a IndexTableSegment */ /* check if track already has an IndexTableSegment */
for (i = 0; i < mxf->metadata_sets_count; i++) { for (i = 0; i < mxf->metadata_sets_count; i++) {
if (mxf->metadata_sets[i]->type == IndexTableSegment) if (mxf->metadata_sets[i]->type == IndexTableSegment) {
return 0; MXFIndexTableSegment *s = (MXFIndexTableSegment*)mxf->metadata_sets[i];
if (s->body_sid == track->body_sid)
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++) {
/* BodySID == 0 -> no essence */ /* BodySID == 0 -> no essence */
if (!mxf->partitions[i].body_sid) if (mxf->partitions[i].body_sid != track->body_sid)
continue; continue;
p = &mxf->partitions[i]; p = &mxf->partitions[i];
@@ -2926,12 +2924,19 @@ static int mxf_handle_missing_index_segment(MXFContext *mxf)
return ret; return ret;
} }
/* Make sure we have nonzero unique index_sid, body_sid will be ok, because
* using the same SID for index is forbidden in MXF. */
if (!track->index_sid)
track->index_sid = track->body_sid;
track->edit_rate = av_inv_q(st->time_base);
segment->type = IndexTableSegment; segment->type = IndexTableSegment;
/* stream will be treated as small EditUnitByteCount */ /* stream will be treated as small EditUnitByteCount */
segment->edit_unit_byte_count = (av_get_bits_per_sample(st->codecpar->codec_id) * st->codecpar->channels) >> 3; segment->edit_unit_byte_count = (av_get_bits_per_sample(st->codecpar->codec_id) * st->codecpar->channels) >> 3;
segment->index_start_position = 0; segment->index_start_position = 0;
segment->index_duration = s->streams[0]->duration; segment->index_duration = st->duration;
segment->index_sid = p->index_sid; segment->index_edit_rate = track->edit_rate;
segment->index_sid = track->index_sid;
segment->body_sid = p->body_sid; segment->body_sid = p->body_sid;
return 0; return 0;
} }
@@ -3102,7 +3107,9 @@ static int mxf_read_header(AVFormatContext *s)
if ((ret = mxf_parse_structural_metadata(mxf)) < 0) if ((ret = mxf_parse_structural_metadata(mxf)) < 0)
goto fail; goto fail;
mxf_handle_missing_index_segment(mxf); for (int i = 0; i < s->nb_streams; i++)
mxf_handle_missing_index_segment(mxf, s->streams[i]);
if ((ret = mxf_compute_index_tables(mxf)) < 0) if ((ret = mxf_compute_index_tables(mxf)) < 0)
goto fail; goto fail;