From c0ee522df6c9ef09cdcb5bce7adb4b745aa6485a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <tomas.hardin@codemill.se>
Date: Fri, 9 Dec 2011 15:48:33 +0100
Subject: [PATCH] mxfdec: Bring back accumulated_offset that was removed in
5e67e3e
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>
---
libavformat/mxfdec.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index d61c1154dec..1f2782badea 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -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)
{
+ int64_t accumulated_offset = 0;
int j, k, ret, nb_sorted_segments;
MXFIndexTableSegment **sorted_segments = NULL;
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;
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)
continue;
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;
flags = !(tableseg->flag_entries[k] & 0x30) ? AVINDEX_KEYFRAME : 0;
} 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)
size = tableseg->element_delta[n_delta+1] - tableseg->element_delta[n_delta];
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)
return ret;
}
+ accumulated_offset += segment_size;
}
av_free(sorted_segments);
--
GitLab