From e3c20bf3505679641f247471603ad298d04036bd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 24 May 2014 14:03:07 +0200 Subject: stream: kill start_pos, remove --sb option stream.start_pos was needed for optical media only, and (apparently) not for very good reasons. Just get rid of it. For stream_dvd, we don't need to do anything. Byte seeking was already removed from it earlier. For stream_cdda and stream_vcd, emulate the start_pos by offsetting the stream pos as seen by the rest of mpv. The bits in discnav.c and loadfile.c were for dealing with the code seeking back to the start in demux.c. Handle this differently by assuming the demuxer is always initialized with the stream at start position, and instead seek back if initializing the demuxer fails. Remove the --sb option, which worked by modifying stream.start_pos. If someone really wants this option, it could be added back by creating a "slice" stream (actually ffmpeg already has such a thing). --- DOCS/man/en/input.rst | 5 +---- DOCS/man/en/options.rst | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'DOCS') diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index e32f1ea657..84491164f0 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -583,7 +583,7 @@ Property list ``file-size`` Length in bytes of the source file/stream. (This is the same as - ``${stream-end} - ${stream-start}``. For ordered chapters and such, the + ``${stream-end}``. For ordered chapters and such, the size of the currently played segment is returned.) ``path`` @@ -610,9 +610,6 @@ Property list ``stream-pos`` (RW) Raw byte position in source stream. -``stream-start`` - Raw start byte offset in source stream (rarely different from 0). - ``stream-end`` Raw end position in bytes in source stream. diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 2aa148a70a..9a24d3f01f 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1832,10 +1832,6 @@ OPTIONS This behavior is disabled by default, but is always available when quitting the player with Shift+Q. -``--sb=`` - Seek to byte position. Useful for playback from CD-ROM images or VOB files - with junk at the beginning. See also ``--start``. - ``--screen=`` In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the -- cgit v1.2.3