highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mov: Support empty first edit + normal second edit.

Browse Source 
(cherry picked from commit df342c91e6cfceb2537c2d1b2442dd685381a0ca)

Reviewed-by: Baptiste Coudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Yusuke Nakamura
2011-06-05 02:45:54 +09:00
committed by Michael Niedermayer
parent e7f008a534
commit 05e417aa63
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/isom.h
View File

@ -109,7 +109,9 @@ typedef struct MOVStreamContext {
unsigned int keyframe_count; unsigned int keyframe_count;
int *keyframes; int *keyframes;
int time_scale; int time_scale;
int64_t time_offset; ///< time offset of the first edit list entry int64_t empty_duration; ///< empty duration of the first edit list entry
int64_t start_time; ///< start time of the media
int64_t time_offset; ///< time offset of the edit list entries
int current_sample; int current_sample;
unsigned int bytes_per_frame; unsigned int bytes_per_frame;
unsigned int samples_per_frame; unsigned int samples_per_frame;

17
libavformat/mov.c
View File

@ -1651,9 +1651,10 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
uint64_t stream_size = 0; uint64_t stream_size = 0;
/* adjust first dts according to edit list */ /* adjust first dts according to edit list */
if (sc->time_offset && mov->time_scale > 0) { if ((sc->empty_duration || sc->start_time) && mov->time_scale > 0) {
if (sc->time_offset < 0) if (sc->empty_duration)
sc->time_offset = av_rescale(sc->time_offset, sc->time_scale, mov->time_scale); sc->empty_duration = av_rescale(sc->empty_duration, sc->time_scale, mov->time_scale);
sc->time_offset = sc->start_time - sc->empty_duration;
current_dts = -sc->time_offset; current_dts = -sc->time_offset;
if (sc->ctts_data && sc->stts_data && if (sc->ctts_data && sc->stts_data &&
sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) { sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) {
@ -2297,7 +2298,7 @@ free_and_return:
static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
MOVStreamContext *sc; MOVStreamContext *sc;
int i, edit_count, version; int i, edit_count, version, edit_start_index = 0;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
return 0; return 0;
@ -2321,9 +2322,11 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom)
time = (int32_t)avio_rb32(pb); /* media time */ time = (int32_t)avio_rb32(pb); /* media time */
} }
avio_rb32(pb); /* Media rate */ avio_rb32(pb); /* Media rate */
if (i == 0 && time >= -1) { if (i == 0 && time == -1) {
sc->time_offset = time != -1 ? time : -duration; sc->empty_duration = duration;
} edit_start_index = 1;
} else if (i == edit_start_index && time >= 0)
sc->start_time = time;
} }
if (edit_count > 1) if (edit_count > 1)