Commit 2ac736a6 authored by Reimar Döffinger's avatar Reimar Döffinger

Extend mov edit list support to work for a first padding entry with

time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.

Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c3df4a3b
...@@ -1278,8 +1278,9 @@ static void mov_build_index(MOVContext *mov, AVStream *st) ...@@ -1278,8 +1278,9 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
/* adjust first dts according to edit list */ /* adjust first dts according to edit list */
if (sc->time_offset) { if (sc->time_offset) {
int rescaled = sc->time_offset < 0 ? av_rescale(sc->time_offset, sc->time_scale, mov->time_scale) : sc->time_offset;
assert(sc->time_offset % sc->time_rate == 0); assert(sc->time_offset % sc->time_rate == 0);
current_dts = - (sc->time_offset / sc->time_rate); current_dts = - (rescaled / sc->time_rate);
} }
/* only use old uncompressed audio chunk demuxing when stts specifies it */ /* only use old uncompressed audio chunk demuxing when stts specifies it */
...@@ -1774,12 +1775,12 @@ static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom) ...@@ -1774,12 +1775,12 @@ static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
for(i=0; i<edit_count; i++){ for(i=0; i<edit_count; i++){
int time; int time;
get_be32(pb); /* Track duration */ int duration = get_be32(pb); /* Track duration */
time = get_be32(pb); /* Media time */ time = get_be32(pb); /* Media time */
get_be32(pb); /* Media rate */ get_be32(pb); /* Media rate */
if (i == 0 && time != -1) { if (i == 0 && time >= -1) {
sc->time_offset = time; sc->time_offset = time != -1 ? time : -duration;
sc->time_rate = av_gcd(sc->time_rate, time); sc->time_rate = av_gcd(sc->time_rate, FFABS(sc->time_offset));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment