oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/xiph/OggSyncState: keep track of the Reader offset

Browse Source
This commit is contained in:
Max Kellermann 2020-01-27 20:43:29 +01:00
parent 6fe4068c8e
commit 7e3eaa5921
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/xiph/OggSyncState.cxx
View File

@ -40,8 +40,13 @@ OggSyncState::ExpectPage(ogg_page &page)
{ {
while (true) { while (true) {
int r = ogg_sync_pageout(&oy, &page); int r = ogg_sync_pageout(&oy, &page);
if (r != 0) if (r != 0) {
if (r > 0) {
start_offset = offset;
offset += r;
}
return r > 0; return r > 0;
}
if (!Feed(1024)) if (!Feed(1024))
return false; return false;
@ -66,12 +71,16 @@ OggSyncState::ExpectPageSeek(ogg_page &page)
while (true) { while (true) {
int r = ogg_sync_pageseek(&oy, &page); int r = ogg_sync_pageseek(&oy, &page);
if (r > 0) if (r > 0) {
start_offset = offset;
offset += r;
return true; return true;
}
if (r < 0) { if (r < 0) {
/* skipped -r bytes */ /* skipped -r bytes */
size_t nbytes = -r; size_t nbytes = -r;
offset += nbytes;
if (nbytes > remaining_skipped) if (nbytes > remaining_skipped)
/* still no ogg page - we lost our /* still no ogg page - we lost our
patience, abort */ patience, abort */

20
src/lib/xiph/OggSyncState.hxx
View File

@ -23,6 +23,7 @@
#include <ogg/ogg.h> #include <ogg/ogg.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
class Reader; class Reader;
@ -34,6 +35,17 @@ class OggSyncState {
Reader &reader; Reader &reader;
/**
* Keeps track of the end offset of the most recently returned
* page.
*/
uint64_t offset = 0;
/**
* The start offset of the most recently returned page.
*/
uint64_t start_offset = 0;
public: public:
explicit OggSyncState(Reader &_reader) explicit OggSyncState(Reader &_reader)
:reader(_reader) { :reader(_reader) {
@ -51,6 +63,14 @@ public:
ogg_sync_reset(&oy); ogg_sync_reset(&oy);
} }
void SetOffset(uint64_t _offset) noexcept {
offset = _offset;
}
uint64_t GetStartOffset() const noexcept {
return start_offset;
}
bool Feed(size_t size); bool Feed(size_t size);
bool ExpectPage(ogg_page &page); bool ExpectPage(ogg_page &page);