diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-24 20:33:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-24 20:33:12 +0200 |
| commit | 92c85bd20dc4f55b53cc18887d4a6b9b165447ca (patch) | |
| tree | d70a404b6c3caa335659f43d7ba9f7a1178f7f6a /src/decoder/OpusDecoderPlugin.cxx | |
| parent | f629eb8cb21377612c5c4453f495e5102b8c4803 (diff) | |
| download | mpd-92c85bd20dc4f55b53cc18887d4a6b9b165447ca.tar.gz mpd-92c85bd20dc4f55b53cc18887d4a6b9b165447ca.tar.xz mpd-92c85bd20dc4f55b53cc18887d4a6b9b165447ca.zip | |
decoder/opus: move SeekFindEOS() to OggFind.cxx
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/OpusDecoderPlugin.cxx | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 10a3d0b83..c90e31232 100644 --- a/src/decoder/OpusDecoderPlugin.cxx +++ b/src/decoder/OpusDecoderPlugin.cxx @@ -292,24 +292,6 @@ mpd_opus_stream_decode(Decoder &decoder, } static bool -SeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet, - InputStream &is) -{ - if (is.size > 0 && is.size - is.offset < 65536) - return OggFindEOS(oy, os, packet); - - if (!is.CheapSeeking()) - return false; - - oy.Reset(); - - Error error; - return is.LockSeek(-65536, SEEK_END, error) && - oy.ExpectPageSeekIn(os) && - OggFindEOS(oy, os, packet); -} - -static bool mpd_opus_scan_stream(InputStream &is, const struct tag_handler *handler, void *handler_ctx) { @@ -367,7 +349,7 @@ mpd_opus_scan_stream(InputStream &is, } } - if (packet.e_o_s || SeekFindEOS(oy, os, packet, is)) + if (packet.e_o_s || OggSeekFindEOS(oy, os, packet, is)) tag_handler_invoke_duration(handler, handler_ctx, packet.granulepos / opus_sample_rate); |