RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dashdec: Correct seeking behaviour 

dash_read_seek() is called only once to issue a seek
of *all* streams to the specified timestamp. But to
avoid reopening each stream, do a "dry run" for streams
that are in a discarded state.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
sfan5 2018-01-14 22:36:02 +08:00 committed by Steven Liu
parent bb0cc2e7bd
commit 74b143d81f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/dashdec.c
View File

@ -1826,19 +1826,22 @@ static int dash_close(AVFormatContext *s)
return 0; return 0;
} }
static int dash_seek(AVFormatContext *s, struct representation *pls, int64_t seek_pos_msec, int flags) static int dash_seek(AVFormatContext *s, struct representation *pls, int64_t seek_pos_msec, int flags, int dry_run)
{ {
int ret = 0; int ret = 0;
int i = 0; int i = 0;
int j = 0; int j = 0;
int64_t duration = 0; int64_t duration = 0;
av_log(pls->parent, AV_LOG_VERBOSE, "DASH seek pos[%"PRId64"ms], playlist %d\n", seek_pos_msec, pls->rep_idx); av_log(pls->parent, AV_LOG_VERBOSE, "DASH seek pos[%"PRId64"ms], playlist %d%s\n",
seek_pos_msec, pls->rep_idx, dry_run ? " (dry)" : "");
// single fragment mode // single fragment mode
if (pls->n_fragments == 1) { if (pls->n_fragments == 1) {
pls->cur_timestamp = 0; pls->cur_timestamp = 0;
pls->cur_seg_offset = 0; pls->cur_seg_offset = 0;
if (dry_run)
return 0;
ff_read_frame_flush(pls->ctx); ff_read_frame_flush(pls->ctx);
return av_seek_frame(pls->ctx, -1, seek_pos_msec * 1000, flags); return av_seek_frame(pls->ctx, -1, seek_pos_msec * 1000, flags);
} }
@ -1883,14 +1886,14 @@ set_seq_num:
pls->cur_timestamp = 0; pls->cur_timestamp = 0;
pls->cur_seg_offset = 0; pls->cur_seg_offset = 0;
pls->init_sec_buf_read_offset = 0; pls->init_sec_buf_read_offset = 0;
ret = reopen_demux_for_component(s, pls); ret = dry_run ? 0 : reopen_demux_for_component(s, pls);
return ret; return ret;
} }
static int dash_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) static int dash_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{ {
int ret, i; int ret = 0, i;
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
int64_t seek_pos_msec = av_rescale_rnd(timestamp, 1000, int64_t seek_pos_msec = av_rescale_rnd(timestamp, 1000,
s->streams[stream_index]->time_base.den, s->streams[stream_index]->time_base.den,
@ -1899,16 +1902,14 @@ static int dash_read_seek(AVFormatContext *s, int stream_index, int64_t timestam
if ((flags & AVSEEK_FLAG_BYTE) || c->is_live) if ((flags & AVSEEK_FLAG_BYTE) || c->is_live)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
ret = AVERROR_EOF; /* Seek in discarded streams with dry_run=1 to avoid reopening them */
for (i = 0; i < c->n_videos; i++) { for (i = 0; i < c->n_videos; i++) {
if (c->videos[i]->stream_index == stream_index) { if (!ret)
ret = dash_seek(s, c->videos[i], seek_pos_msec, flags); ret = dash_seek(s, c->videos[i], seek_pos_msec, flags, !c->videos[i]->ctx);
}
} }
for (i = 0; i < c->n_audios; i++) { for (i = 0; i < c->n_audios; i++) {
if (c->audios[i]->stream_index == stream_index) { if (!ret)
ret = dash_seek(s, c->audios[i], seek_pos_msec, flags); ret = dash_seek(s, c->audios[i], seek_pos_msec, flags, !c->audios[i]->ctx);
}
} }
return ret; return ret;