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

Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'

Browse Source 
* commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42':
  Revert "mov: Change DTS-based seek into CTS-based seek."

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-02 20:52:34 +01:00
commit cb39fe9336
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavformat/mov.c
View File

@ -2358,7 +2358,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
int64_t current_offset; int64_t current_offset;
int64_t current_dts = 0; int64_t current_dts = 0;
unsigned int stts_index = 0; unsigned int stts_index = 0;
unsigned int ctts_index = 0;
unsigned int stsc_index = 0; unsigned int stsc_index = 0;
unsigned int stss_index = 0; unsigned int stss_index = 0;
unsigned int stps_index = 0; unsigned int stps_index = 0;
@ -2407,7 +2406,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
sc->stts_count == 1 && sc->stts_data[0].duration == 1)) { sc->stts_count == 1 && sc->stts_data[0].duration == 1)) {
unsigned int current_sample = 0; unsigned int current_sample = 0;
unsigned int stts_sample = 0; unsigned int stts_sample = 0;
unsigned int ctts_sample = 0;
unsigned int sample_size; unsigned int sample_size;
unsigned int distance = 0; unsigned int distance = 0;
unsigned int rap_group_index = 0; unsigned int rap_group_index = 0;
@ -2415,6 +2413,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
int rap_group_present = sc->rap_group_count && sc->rap_group; int rap_group_present = sc->rap_group_count && sc->rap_group;
int key_off = (sc->keyframe_count && sc->keyframes[0] > 0) || (sc->stps_count && sc->stps_data[0] > 0); int key_off = (sc->keyframe_count && sc->keyframes[0] > 0) || (sc->stps_count && sc->stps_data[0] > 0);
current_dts -= sc->dts_shift;
if (!sc->sample_count || st->nb_index_entries) if (!sc->sample_count || st->nb_index_entries)
return; return;
if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries) if (sc->sample_count >= UINT_MAX / sizeof(*st->index_entries) - st->nb_index_entries)
@ -2479,15 +2479,14 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
if (sc->pseudo_stream_id == -1 || if (sc->pseudo_stream_id == -1 ||
sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) { sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) {
AVIndexEntry *e = &st->index_entries[st->nb_index_entries++]; AVIndexEntry *e = &st->index_entries[st->nb_index_entries++];
int64_t current_cts = current_dts + (sc->ctts_data ? sc->ctts_data[ctts_index].duration : 0);
e->pos = current_offset; e->pos = current_offset;
e->timestamp = current_cts; e->timestamp = current_dts;
e->size = sample_size; e->size = sample_size;
e->min_distance = distance; e->min_distance = distance;
e->flags = keyframe ? AVINDEX_KEYFRAME : 0; e->flags = keyframe ? AVINDEX_KEYFRAME : 0;
av_dlog(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", cts %"PRId64", " av_dlog(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
"size %d, distance %d, keyframe %d\n", st->index, current_sample, "size %d, distance %d, keyframe %d\n", st->index, current_sample,
current_offset, current_cts, sample_size, distance, keyframe); current_offset, current_dts, sample_size, distance, keyframe);
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->nb_index_entries < 100) if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->nb_index_entries < 100)
ff_rfps_add_frame(mov->fc, st, current_dts); ff_rfps_add_frame(mov->fc, st, current_dts);
} }
@ -2497,16 +2496,11 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
current_dts += sc->stts_data[stts_index].duration; current_dts += sc->stts_data[stts_index].duration;
distance++; distance++;
stts_sample++; stts_sample++;
ctts_sample++;
current_sample++; current_sample++;
if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) { if (stts_index + 1 < sc->stts_count && stts_sample == sc->stts_data[stts_index].count) {
stts_sample = 0; stts_sample = 0;
stts_index++; stts_index++;
} }
if (ctts_index + 1 < sc->ctts_count && ctts_sample == sc->ctts_data[ctts_index].count) {
ctts_sample = 0;
ctts_index++;
}
} }
} }
if (st->duration > 0) if (st->duration > 0)
@ -3175,15 +3169,13 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int sample_flags = i ? frag->flags : first_sample_flags; int sample_flags = i ? frag->flags : first_sample_flags;
unsigned sample_duration = frag->duration; unsigned sample_duration = frag->duration;
int keyframe = 0; int keyframe = 0;
int sample_cts = 0;
int64_t cts;
if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb);
if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb);
if (flags & MOV_TRUN_SAMPLE_FLAGS) sample_flags = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_FLAGS) sample_flags = avio_rb32(pb);
if (flags & MOV_TRUN_SAMPLE_CTS) sample_cts = avio_rb32(pb); sc->ctts_data[sc->ctts_count].count = 1;
sc->ctts_data[sc->ctts_count].count = 1; sc->ctts_data[sc->ctts_count].duration = (flags & MOV_TRUN_SAMPLE_CTS) ?
sc->ctts_data[sc->ctts_count].duration = sample_cts; avio_rb32(pb) : 0;
mov_update_dts_shift(sc, sc->ctts_data[sc->ctts_count].duration); mov_update_dts_shift(sc, sc->ctts_data[sc->ctts_count].duration);
if (frag->time != AV_NOPTS_VALUE) { if (frag->time != AV_NOPTS_VALUE) {
if (c->use_mfra_for == FF_MOV_FLAG_MFRA_PTS) { if (c->use_mfra_for == FF_MOV_FLAG_MFRA_PTS) {
@ -3207,8 +3199,6 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
frag->time = AV_NOPTS_VALUE; frag->time = AV_NOPTS_VALUE;
} }
cts = dts + sample_cts;
sc->ctts_count++; sc->ctts_count++;
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
keyframe = 1; keyframe = 1;
@ -3218,14 +3208,14 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES)); MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES));
if (keyframe) if (keyframe)
distance = 0; distance = 0;
err = av_add_index_entry(st, offset, cts, sample_size, distance, err = av_add_index_entry(st, offset, dts, sample_size, distance,
keyframe ? AVINDEX_KEYFRAME : 0); keyframe ? AVINDEX_KEYFRAME : 0);
if (err < 0) { if (err < 0) {
av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n"); av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n");
} }
av_dlog(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", cts %"PRId64", " av_dlog(c->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
"size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i, "size %d, distance %d, keyframe %d\n", st->index, sc->sample_count+i,
offset, cts, sample_size, distance, keyframe); offset, dts, sample_size, distance, keyframe);
distance++; distance++;
dts += sample_duration; dts += sample_duration;
offset += sample_size; offset += sample_size;
@ -4189,16 +4179,7 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
MOVStreamContext *msc = avst->priv_data; MOVStreamContext *msc = avst->priv_data;
if (msc->pb && msc->current_sample < avst->nb_index_entries) { if (msc->pb && msc->current_sample < avst->nb_index_entries) {
AVIndexEntry *current_sample = &avst->index_entries[msc->current_sample]; AVIndexEntry *current_sample = &avst->index_entries[msc->current_sample];
int64_t dts; int64_t dts = av_rescale(current_sample->timestamp, AV_TIME_BASE, msc->time_scale);
if (msc->ctts_data && msc->ctts_index >= msc->ctts_count)
av_log(s, AV_LOG_WARNING, "CTTS list too small\n");
if (msc->ctts_data && msc->ctts_index < msc->ctts_count)
dts = av_rescale(current_sample->timestamp - msc->dts_shift - msc->ctts_data[msc->ctts_index].duration,
AV_TIME_BASE, msc->time_scale);
else
dts = av_rescale(current_sample->timestamp, AV_TIME_BASE, msc->time_scale);
av_dlog(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts); av_dlog(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts);
if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) || if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) ||
(s->pb->seekable && (s->pb->seekable &&
@ -4278,9 +4259,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
pkt->stream_index = sc->ffindex; pkt->stream_index = sc->ffindex;
pkt->pts = sample->timestamp; pkt->dts = sample->timestamp;
if (sc->ctts_data && sc->ctts_index < sc->ctts_count) { if (sc->ctts_data && sc->ctts_index < sc->ctts_count) {
pkt->dts = pkt->pts - sc->dts_shift - sc->ctts_data[sc->ctts_index].duration; pkt->pts = pkt->dts + sc->dts_shift + sc->ctts_data[sc->ctts_index].duration;
/* update ctts context */ /* update ctts context */
sc->ctts_sample++; sc->ctts_sample++;
if (sc->ctts_index < sc->ctts_count && if (sc->ctts_index < sc->ctts_count &&
@ -4293,8 +4274,8 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
} else { } else {
int64_t next_dts = (sc->current_sample < st->nb_index_entries) ? int64_t next_dts = (sc->current_sample < st->nb_index_entries) ?
st->index_entries[sc->current_sample].timestamp : st->duration; st->index_entries[sc->current_sample].timestamp : st->duration;
pkt->dts = pkt->pts;
pkt->duration = next_dts - pkt->dts; pkt->duration = next_dts - pkt->dts;
pkt->pts = pkt->dts;
} }
if (st->discard == AVDISCARD_ALL) if (st->discard == AVDISCARD_ALL)
goto retry; goto retry;