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

hls: Store first_timestamp in units of AV_TIME_BASE 

When first_timestamp was stored as-is, its actual time base
wasn't known later in the seek function.

Additionally, the logic (from 795d9594cf) for scaling it
based on stream_index is flawed - stream_index in the seek
function only specifies which stream the seek timestamp refers
to, but obviously doesn't say anything about which stream
first_timestamp belongs to.

In the cases where stream_index was >= 0 and all streams had the
same time base, this didn't matter in practice.

Seeking taking first_timestamp into account is problematic
when one variant is mpegts (with real timestamps) and one variant
is raw ADTS (with timestamps only being accumulated packet
duration), where the variants start at totally different timestamps.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-07-29 10:09:02 +03:00
parent 55c4cba2a7
commit e1d5b24476
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/hls.c
View File

@ -627,8 +627,11 @@ start:
reset_packet(&var->pkt); reset_packet(&var->pkt);
break; break;
} else { } else {
if (c->first_timestamp == AV_NOPTS_VALUE) if (c->first_timestamp == AV_NOPTS_VALUE &&
c->first_timestamp = var->pkt.dts; var->pkt.dts != AV_NOPTS_VALUE)
c->first_timestamp = av_rescale_q(var->pkt.dts,
var->ctx->streams[var->pkt.stream_index]->time_base,
AV_TIME_BASE_Q);
} }
if (c->seek_timestamp == AV_NOPTS_VALUE) if (c->seek_timestamp == AV_NOPTS_VALUE)
@ -728,8 +731,7 @@ static int hls_read_seek(AVFormatContext *s, int stream_index,
/* Reset reading */ /* Reset reading */
struct variant *var = c->variants[i]; struct variant *var = c->variants[i];
int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ? 0 : int64_t pos = c->first_timestamp == AV_NOPTS_VALUE ? 0 :
av_rescale_rnd(c->first_timestamp, 1, av_rescale_rnd(c->first_timestamp, 1, AV_TIME_BASE,
stream_index >= 0 ? s->streams[stream_index]->time_base.den : AV_TIME_BASE,
flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP); flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
if (var->input) { if (var->input) {
ffurl_close(var->input); ffurl_close(var->input);