generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mxfdec: Bring back accumulated_offset that was removed in 5e67e3e

Browse Source 
I thought it had to do with file offsets, but's actually the offset inside
the essence container.
In other words, unbreak multiple EditUnitByteCounts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Tomas Härdin
2011-12-09 15:48:33 +01:00
committed by Michael Niedermayer
parent 80914cde6f
commit c0ee522df6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfdec.c
View File

@@ -1080,6 +1080,7 @@ static int mxf_absolute_bodysid_offset(MXFContext *mxf, int body_sid, int64_t of
static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st) static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st)
{ {
int64_t accumulated_offset = 0;
int j, k, ret, nb_sorted_segments; int j, k, ret, nb_sorted_segments;
MXFIndexTableSegment **sorted_segments = NULL; MXFIndexTableSegment **sorted_segments = NULL;
int n_delta = track_id - 1; /* TrackID = 1-based stream index */ int n_delta = track_id - 1; /* TrackID = 1-based stream index */
@@ -1104,6 +1105,10 @@ static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st)
int64_t segment_size; int64_t segment_size;
MXFIndexTableSegment *tableseg = sorted_segments[j]; MXFIndexTableSegment *tableseg = sorted_segments[j];
/* reset accumulated_offset on BodySID change */
if (j > 0 && tableseg->body_sid != sorted_segments[j-1]->body_sid)
accumulated_offset = 0;
if (n_delta >= tableseg->nb_delta_entries && st->index != 0) if (n_delta >= tableseg->nb_delta_entries && st->index != 0)
continue; continue;
duration = tableseg->index_duration > 0 ? tableseg->index_duration : duration = tableseg->index_duration > 0 ? tableseg->index_duration :
@@ -1155,7 +1160,7 @@ static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st)
size = 0; size = 0;
flags = !(tableseg->flag_entries[k] & 0x30) ? AVINDEX_KEYFRAME : 0; flags = !(tableseg->flag_entries[k] & 0x30) ? AVINDEX_KEYFRAME : 0;
} else { } else {
pos = (int64_t)(tableseg->index_start_position + k) * tableseg->edit_unit_byte_count; pos = (int64_t)k * tableseg->edit_unit_byte_count + accumulated_offset;
if (n_delta < tableseg->nb_delta_entries - 1) if (n_delta < tableseg->nb_delta_entries - 1)
size = tableseg->element_delta[n_delta+1] - tableseg->element_delta[n_delta]; size = tableseg->element_delta[n_delta+1] - tableseg->element_delta[n_delta];
else { else {
@@ -1183,6 +1188,7 @@ static int mxf_parse_index(MXFContext *mxf, int track_id, AVStream *st)
if ((ret = av_add_index_entry(st, pos, sample_duration * st->nb_index_entries, size, 0, flags)) < 0) if ((ret = av_add_index_entry(st, pos, sample_duration * st->nb_index_entries, size, 0, flags)) < 0)
return ret; return ret;
} }
accumulated_offset += segment_size;
} }
av_free(sorted_segments); av_free(sorted_segments);