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/stheader.h | |
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/stheader.h')
-rw-r--r-- | demux/stheader.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index f9d564c230..78e86a47ee 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -74,6 +74,9 @@ struct mp_codec_params { struct AVCodecContext *lav_headers; struct AVCodecParameters *lav_codecpar; + // Timestamp granularity for converting double<->rational timestamps. + int native_tb_num, native_tb_den; + // STREAM_AUDIO int samplerate; struct mp_chmap channels; @@ -85,6 +88,7 @@ struct mp_codec_params { // STREAM_VIDEO bool avi_dts; // use DTS timing; first frame and DTS is 0 float fps; // frames per second (set only if constant fps) + bool reliable_fps; // the fps field is definitely not broken int par_w, par_h; // pixel aspect ratio (0 if unknown/square) int disp_w, disp_h; // display size int rotate; // intended display rotation, in degrees, [0, 359] |