diff options
author | wm4 <wm4@nowhere> | 2019-11-06 21:36:02 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-11-06 21:36:02 +0100 |
commit | f37f4de8496556afaa024e39e2efb433eb1680d4 (patch) | |
tree | 1ade8205598a3142d1fcbe5f32f461266ce81b76 /demux/demux_edl.c | |
parent | abb089431d0467c3609207d0b27359ef08a6c16d (diff) | |
download | mpv-f37f4de8496556afaa024e39e2efb433eb1680d4.tar.bz2 mpv-f37f4de8496556afaa024e39e2efb433eb1680d4.tar.xz |
stream: turn into a ring buffer, make size configurable
In some corner cases (see #6802), it can be beneficial to use a larger
stream buffer size. Use this as argument to rewrite everything for no
reason.
Turn stream.c itself into a ring buffer, with configurable size. The
latter would have been easily achievable with minimal changes, and the
ring buffer is the hard part. There is no reason to have a ring buffer
at all, except possibly if ffmpeg don't fix their awful mp4 demuxer, and
some subtle issues with demux_mkv.c wanting to seek back by small
offsets (the latter was handled with small stream_peek() calls, which
are unneeded now).
In addition, this turns small forward seeks into reads (where data is
simply skipped). Before this commit, only stream_skip() did this (which
also mean that stream_skip() simply calls stream_seek() now).
Replace all stream_peek() calls with something else (usually
stream_read_peek()). The function was a problem, because it returned a
pointer to the internal buffer, which is now a ring buffer with
wrapping. The new function just copies the data into a buffer, and in
some cases requires callers to dynamically allocate memory. (The most
common case, demux_lavf.c, required a separate buffer allocation anyway
due to FFmpeg "idiosyncrasies".) This is the bulk of the demuxer_*
changes.
I'm not happy with this. There still isn't a good reason why there
should be a ring buffer, that is complex, and most of the time just
wastes half of the available memory. Maybe another rewrite soon.
It also contains bugs; you're an alpha tester now.
Diffstat (limited to 'demux/demux_edl.c')
-rw-r--r-- | demux/demux_edl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 62e6c50070..aa650a383f 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -459,7 +459,9 @@ static int try_open_file(struct demuxer *demuxer, enum demux_check check) return 0; } if (check >= DEMUX_CHECK_UNSAFE) { - if (!bstr_equals0(stream_peek(s, strlen(HEADER)), HEADER)) + char header[sizeof(HEADER) - 1]; + int len = stream_read_peek(s, header, sizeof(header)); + if (len != strlen(HEADER) || memcmp(header, HEADER, len) != 0) return -1; } p->data = stream_read_complete(s, demuxer, 1000000); |