1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 10:32:15 +00:00
mpv/core
wm4 630a2b195a mplayer: don't show bogus audio PTS during hr-seek
This fixes a problem that happened with syncplay.pl [1] when ad_mpg123
was in use, and get_current_time() returning a bogus time position.
This only happens during seeking; the reported time is correct after the
seek is done.

The audio PTS as returned by playing_audio_pts() is simply bogus during
hr-seek. With ad_ffmpeg, it was actually set to MP_NOPTS_VALUE during
seeking, so get_current_time() did a fallback to the video PTS. However,
ad_mpg123 is different and explicitly decodes some audio when resetting
on seek (reasons why it does this unknown and uninvestigated; apparently
it's to reinit libmpg123). As a result, the audio PTS was set to the
start position of the seek (or something similar), which could be very
different from the seek target time.

This confused syncplay. It got the bogus time because it spams the
player with read commands to the "time-pos" property, so this corner
case was hit.

Fix this by making get_current_time() return the seek target time if
hr-seek is active. This should make behavior the same as before commit
3f949cf "mplayer: prefer audio PTS over video PTS for status line".

[1] http://syncplay.pl
2013-02-05 18:32:26 +01:00
..
input input: free all queued/allocated commands on exit 2013-02-03 21:08:26 +01:00
timeline cache: refactor how cache enabling is done 2012-12-03 21:08:51 +01:00
asxparser.c
asxparser.h
av_log.c demux_lavf: add support for libavdevice 2012-12-03 21:08:51 +01:00
av_log.h
av_opts.c
av_opts.h
bstr.c Replace strsep() uses 2013-01-13 17:32:39 +01:00
bstr.h Replace strsep() uses 2013-01-13 17:32:39 +01:00
cfg-mplayer.h x11: cleanup, refactor 2013-01-27 13:30:53 +01:00
codec-cfg.c video: simplify decoder pixel format handling 2013-01-13 17:39:31 +01:00
codec-cfg.h video: simplify decoder pixel format handling 2013-01-13 17:39:31 +01:00
command.c mplayer: make advancing the playlist respect looping 2013-02-03 16:52:48 +01:00
command.h
cpudetect.c
cpudetect.h
defaultopts.c x11: cleanup, refactor 2013-01-27 13:30:53 +01:00
defaultopts.h
encode_lavc.c sdl, encode_lavc: fix copyright headers 2012-12-28 11:41:30 +01:00
encode_lavc.h sdl, encode_lavc: fix copyright headers 2012-12-28 11:41:30 +01:00
encode.h
m_config.c
m_config.h
m_option.c video: add --autofit and --autofit-larger options 2013-01-23 10:56:36 +01:00
m_option.h video: add --autofit and --autofit-larger options 2013-01-23 10:56:36 +01:00
m_property.c
m_property.h
m_struct.c
m_struct.h
mp_common.c mp_common: improve OSD/status time formatting 2013-02-03 15:41:18 +01:00
mp_common.h mp_common: add some rectangle utility functions 2013-01-13 20:04:14 +01:00
mp_core.h mplayer: make advancing the playlist respect looping 2013-02-03 16:52:48 +01:00
mp_fifo.c input: do not generate double clicks for mouse wheel 2012-12-03 21:08:52 +01:00
mp_fifo.h
mp_msg.c mp_msg, getch2: unix tty background support 2013-01-23 18:05:34 +01:00
mp_msg.h
mp_osd.h core: minor cleanups 2012-11-20 18:00:16 +01:00
mp_talloc.h video/filter: change filter API, use refcounting, remove filter DR 2013-01-13 20:04:10 +01:00
mpc_info.h
mplayer.c mplayer: don't show bogus audio PTS during hr-seek 2013-02-05 18:32:26 +01:00
mplayer.h sub: remove vobsub reader in favor of ffmpeg vobsub demuxer 2012-12-11 00:37:54 +01:00
options.h x11: cleanup, refactor 2013-01-27 13:30:53 +01:00
parser-cfg.c Fix potential bugs and issues, general cleanups 2012-11-20 18:00:14 +01:00
parser-cfg.h
parser-mpcmd.c options: handle -v during pre-parsing command line 2012-12-12 23:02:03 +01:00
parser-mpcmd.h
path.c path: add mp_find_config_file and reorganize some of the code 2012-12-15 17:38:00 +01:00
path.h path: add mp_find_config_file and reorganize some of the code 2012-12-15 17:38:00 +01:00
playlist_parser.c options: rename -ss and -endpos, allow relative times 2012-11-16 21:21:15 +01:00
playlist_parser.h
playlist.c
playlist.h
quvi.c Fix lots of bugs in mp_http URL handling 2013-01-10 14:11:26 +01:00
screenshot.c screenshot: minor simplification, prefer VF over VO 2013-01-30 23:41:22 +01:00
screenshot.h
subopt-helper.c
subopt-helper.h
version.c build: identify the build time of the binary in the versioning output 2012-12-03 21:08:51 +01:00