diff options
author | wm4 <wm4@nowhere> | 2013-11-16 21:04:28 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-16 21:46:17 +0100 |
commit | a2a24b957ec7dae8b9d312af8292b5e5e82d77be (patch) | |
tree | c4d9ad9cd7196a5f3ea5f8d83b570e55fb27b3a9 /demux/demux_lavf.c | |
parent | 0cdbc6db6ea1ee6cdeedec6c8bd84e692d5f82d3 (diff) | |
download | mpv-a2a24b957ec7dae8b9d312af8292b5e5e82d77be.tar.bz2 mpv-a2a24b957ec7dae8b9d312af8292b5e5e82d77be.tar.xz |
demux: simplify handling of filepos field
demuxer->filepos contains the byte offset of the last read packet. This
is so that the player can estimate the current playback position, if no
proper timestamps are available. Simplify it to use demux_packet->pos in
the generic demuxer code, instead of bothering every demuxer
implementation about it.
(Note that this is still a bit incorrect: it relfects the position of
the last packet read by the demuxer, not that returned to the user. But
that was already broken, and is not that trivial to fix.)
Diffstat (limited to 'demux/demux_lavf.c')
-rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 946c76fb84..33c8d1b667 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -707,8 +707,6 @@ static int read_more_av_packets(demuxer_t *demux) if (priv->num_packets >= MAX_PKT_QUEUE) return -1; - demux->filepos = stream_tell(demux->stream); - AVPacket *pkt = talloc(NULL, AVPacket); if (av_read_frame(priv->avfc, pkt) < 0) { talloc_free(pkt); @@ -795,7 +793,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux) if (pkt->convergence_duration > 0) dp->duration = pkt->convergence_duration * av_q2d(st->time_base); } - dp->pos = demux->filepos; + dp->pos = pkt->pos; dp->keyframe = pkt->flags & AV_PKT_FLAG_KEY; // Use only one stream for stream_pts, otherwise PTS might be jumpy. if (stream->type == STREAM_VIDEO) { |