Skip to content

M
mpd
Commit dc328e0c authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/opus: move code to OggSeekPageAtOffset()

parent 92c85bd2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
src/decoder/OggFind.cxx
View file @ dc328e0c
...@@ -38,6 +38,16 @@ OggFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet) ...@@ -38,6 +38,16 @@ OggFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet)
} }
} }
static bool
OggSeekPageAtOffset(OggSyncState &oy, ogg_stream_state &os, InputStream &is,
InputStream::offset_type offset, int whence)
{
oy.Reset();
return is.LockSeek(offset, whence, IgnoreError()) &&
oy.ExpectPageSeekIn(os);
}
bool bool
OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet, OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
InputStream &is) InputStream &is)
...@@ -48,9 +58,6 @@ OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet, ...@@ -48,9 +58,6 @@ OggSeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
if (!is.CheapSeeking()) if (!is.CheapSeeking())
return false; return false;
oy.Reset(); return OggSeekPageAtOffset(oy, os, is, -65536, SEEK_END) &&
return is.LockSeek(-65536, SEEK_END, IgnoreError()) &&
oy.ExpectPageSeekIn(os) &&
OggFindEOS(oy, os, packet); OggFindEOS(oy, os, packet);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment