Merge branch 'hr-seek'

* hr-seek:
  input: add default keybindings Shift+[arrow] for small exact seeks
  input: support bindings with modifier keys for X input
  core: audio: make ogg missing audio timing workaround more complex
  core: add support for precise non-keyframe-limited seeks
  core: add struct for queued seek info
  commands: add generic option -> property wrapper
  options: add "choice" option type, use for -pts-association-mode
  core: remove looping in update_video(), modify command handling a bit
  core: seek: use accurate seek mode with audio-only files
  core: avoid using sh_video->pts as "current pts"
  libvo: register X11 connection fd in input event system
  core: timing: add special handling of long frame intervals
  core: move central play loop to a separate function

Conflicts:
	DOCS/tech/slave.txt

2 files changed, 41 insertions, 8 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index be9d8cf3e1..01e48d33d9 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -206,8 +206,12 @@ See the \-input option for ways to customize it.
 .RS
 .IPs "<\- and \->"
 Seek backward/\:forward 10 seconds.
+Shift+arrow does a 1 second exact seek (see \-hr\-seek; currently modifier
+keys like shift only work if used in an X output window).
 .IPs "up and down"
 Seek forward/\:backward 1 minute.
+Shift+arrow does a 5 second exact seek (see \-hr\-seek; currently modifier
+keys like shift only work if used in an X output window).
 .IPs "pgup and pgdown"
 Seek forward/\:backward 10 minutes.
 .IPs "[ and ]"
@@ -909,6 +913,27 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file
 .PD 1
 .
 .TP
+.B \-hr\-seek off|absolute|always
+Select when to use precise seeks that are not limited to keyframes.
+Such seeks require decoding video from the previous keyframe up to the target
+position and so can take some time depending on decoding performance.
+For some video formats precise seeks are disabled. This option selects the
+default choice to use for seeks; it's possible to explicitly override that
+default in the definition of key bindings and in slave mode commands.
+.PD 0
+.RSs
+.IPs off
+Never use precise seeks.
+.IPs absolute
+Use precise seeks if the seek is to an absolute position in the file,
+such as a chapter seek, but not for relative seeks like the default
+behavior of arrow keys (default).
+.IPs always
+Use precise seeks whenever possible.
+.RE
+.PD 1
+.
+.TP
 .B \-identify
 Shorthand for \-msglevel identify=4.
 Show file parameters in an easily parseable format.
@@ -1076,16 +1101,17 @@ MPlayer will not load or search for video segments from other files,
 and will also ignore any chapter order specified for the main file.
 .
 .TP
-.B \-pts\-association\-mode <mode number>
+.B \-pts\-association\-mode auto|decode|sort
 Select the method used to determine which container packet timestamp
 corresponds to a particular output frame from the video decoder.
+Normally you shouldn't need to change this option.
 .PD 0
 .RSs
-.IPs 0
+.IPs auto
 Try to pick a working mode from the ones below automatically (default)
-.IPs 1
+.IPs decoder
 Use decoder reordering functionality.
-.IPs 2
+.IPs sort
 Maintain a buffer of unused pts values and use the lowest value for the frame.
 .RE
 .PD 1
diff --git a/DOCS/tech/slave.txt b/DOCS/tech/slave.txt
index 1dc9e23aa4..d95ef41d84 100644
--- a/DOCS/tech/slave.txt
+++ b/DOCS/tech/slave.txt
@@ -269,11 +269,16 @@ radio_step_channel <-1|1>
 radio_step_freq <value>
     Tune frequency by the <value> (positive - up, negative - down).
 
-seek <value> [type]
+seek <value> [type] [hr-seek]
     Seek to some place in the movie.
-        0 is a relative seek of +/- <value> seconds (default).
-        1 is a seek to <value> % in the movie.
-        2 is a seek to an absolute position of <value> seconds.
+        type = 0 is a relative seek of +/- <value> seconds (default).
+        type = 1 is a seek to <value> % in the movie.
+        type = 2 is a seek to an absolute position of <value> seconds.
+    The hr-seek parameter controls whether to use precise seeks (not limited
+    to keyframe positions in video).
+        hr-seek = 0 means use default set with option -hr-seek (default).
+        hr-seek = 1 means force precise seek if possible.
+        hr-seek = -1 means force non-precise seek.
 
 seek_chapter <value> [type]
     Seek to the start of a chapter.
@@ -515,6 +520,8 @@ name               type      min     max     get set step comment
 osdlevel           int       0       3       X   X   X    as -osdlevel
 speed              float     0.01    100     X   X   X    as -speed
 loop               int       -1              X   X   X    as -loop
+hr_seek            string                    X   X   X    as -hr-seek
+pts_association_mode string                  X   X   X    as -pts-association-mode
 pause              flag      0       1       X            1 if paused
 filename           string                    X            file playing wo path
 path               string                    X            file playing