diff options
author | wm4 <wm4@nowhere> | 2016-08-19 14:19:46 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-08-19 14:59:30 +0200 |
commit | 05e4df3f0c7679e8ac3b32a1a414be751b6b6b37 (patch) | |
tree | 82341aaaf7d4e82800d0555b3e39dfd2ddb6a77f /demux/demux_raw.c | |
parent | 4aaa83339ca9515113e936af79bc3d860d67cb4b (diff) | |
download | mpv-05e4df3f0c7679e8ac3b32a1a414be751b6b6b37.tar.bz2 mpv-05e4df3f0c7679e8ac3b32a1a414be751b6b6b37.tar.xz |
video/audio: always provide "proper" timestamps to libavcodec
Instead of passing through double float timestamps opaquely, pass real
timestamps. Do so by always setting a valid timebase on the
AVCodecContext for audio and video decoding.
Specifically try not to round timestamps to a too coarse timebase, which
could round off small adjustments to timestamps (such as for start time
rebasing or demux_timeline). If the timebase is considered too coarse,
make it finer.
This gets rid of the need to do this specifically for some hardware
decoding wrapper. The old method of passing through double timestamps
was also a bit questionable. While libavcodec is not supposed to
interpret timestamps at all if no timebase is provided, it was
needlessly tricky. Also, it actually does compare them with
AV_NOPTS_VALUE. This change will probably also reduce confusion in the
future.
Diffstat (limited to 'demux/demux_raw.c')
-rw-r--r-- | demux/demux_raw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/demux/demux_raw.c b/demux/demux_raw.c index bd8e11306d..51378e7031 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -145,6 +145,9 @@ static int demux_rawaudio_open(demuxer_t *demuxer, enum demux_check check) c->force_channels = true; c->samplerate = opts->samplerate; + c->native_tb_num = 1; + c->native_tb_den = c->samplerate; + int f = opts->aformat; // See PCM(): sign float bits endian mp_set_pcm_codec(sh->codec, f & 1, f & 2, f >> 3, f & 4); @@ -233,6 +236,7 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check) c->codec = decoder; c->codec_tag = imgfmt; c->fps = opts->fps; + c->reliable_fps = true; c->disp_w = width; c->disp_h = height; demux_add_sh_stream(demuxer, sh); |