summaryrefslogtreecommitdiffstats
path: root/stream/stream_cdda.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-24 14:03:07 +0200
committerwm4 <wm4@nowhere>2014-05-24 16:17:50 +0200
commite3c20bf3505679641f247471603ad298d04036bd (patch)
tree72926a284ecd34a3d1be9de8db8d5af0ed45eba8 /stream/stream_cdda.c
parent3316cf5f9b213dc047aa0515fbc51f12fb27cc58 (diff)
downloadmpv-e3c20bf3505679641f247471603ad298d04036bd.tar.bz2
mpv-e3c20bf3505679641f247471603ad298d04036bd.tar.xz
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).
Diffstat (limited to 'stream/stream_cdda.c')
-rw-r--r--stream/stream_cdda.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 1b81bfc6fb..6f1c747483 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -202,6 +202,8 @@ static int seek(stream_t *s, int64_t newpos)
int seek_to_track = 0;
int i;
+ newpos += priv->start_sector * CDIO_CD_FRAMESIZE_RAW;
+
sec = newpos / CDIO_CD_FRAMESIZE_RAW;
if (newpos < 0 || sec > p->end_sector) {
p->sector = p->end_sector + 1;
@@ -388,8 +390,8 @@ static int open_cdda(stream_t *st, int m)
priv->sector = priv->start_sector;
st->priv = priv;
- st->start_pos = priv->start_sector * CDIO_CD_FRAMESIZE_RAW;
- st->end_pos = (priv->end_sector + 1) * CDIO_CD_FRAMESIZE_RAW;
+ st->end_pos =
+ (priv->end_sector + 1 - priv->start_sector) * CDIO_CD_FRAMESIZE_RAW;
st->sector_size = CDIO_CD_FRAMESIZE_RAW;
st->fill_buffer = fill_buffer;