i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

less whacking on the disk during seek to zero. prettier debug output. :-)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6641 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-02-18 22:56:41 +00:00
parent 1b89aa98ff
commit 65a8a591f1
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ogg/OggSeekable.cpp
+41 -36
View File
@@ -323,46 +323,51 @@ OggSeekable::Seek(uint32 seekTo, int64 *frame, bigtime_t *time)
// how to handle this? // how to handle this?
} }
// binary search to find our place
int64 left_granulepos = 0; int64 left_granulepos = 0;
off_t right = GetLastPagePosition();
int64 right_granulepos = 0; int64 right_granulepos = 0;
while (true) { // if not the first, perform a binary search
TRACE(" Seek: [%llu,%llu]: ", left, right); if (granulepos != fFirstGranulepos) {
ogg_sync_reset(&fSync); // binary search to find our place
ogg_stream_reset(&fStreamState); off_t right = GetLastPagePosition();
if (right - left > B_PAGE_SIZE) { uint width = (uint)log10(max_c(1, fFirstGranulepos + right)) + 2;
fPosition = (right + left) / 2; while (true) {
} else { ogg_sync_reset(&fSync);
fPosition = left; ogg_stream_reset(&fStreamState);
break; if (right - left > B_PAGE_SIZE) {
} TRACE(" Seek: [%*lld,%*lld]: ", width, left, width, right);
do { fPosition = (right + left) / 2;
status = ReadPage(&page, B_PAGE_SIZE); } else {
if (status != B_OK) { TRACE(" Seek: [%*lld,...]\n", width, left);
TRACE("OggSeekable::Seek: ReadPage = %s\n", strerror(status)); fPosition = left;
return status; break;
} }
if (ogg_stream_pagein(&fStreamState, &page) != 0) { do {
TRACE("OggSeekable::Seek: ogg_stream_pagein: failed??\n"); status = ReadPage(&page, B_PAGE_SIZE);
return B_ERROR; if (status != B_OK) {
TRACE("OggSeekable::Seek: ReadPage = %s\n", strerror(status));
return status;
}
if (ogg_stream_pagein(&fStreamState, &page) != 0) {
TRACE("OggSeekable::Seek: ogg_stream_pagein: failed??\n");
return B_ERROR;
}
} while (ogg_page_granulepos(&page) == -1);
TRACE("granulepos = %*lld, ", width, ogg_page_granulepos(&page));
TRACE("fPosition = %*llu\n", width, fPosition);
// check the granulepos of the page against the requested frame
if (ogg_page_granulepos(&page) < granulepos) {
// The packet that the frame is in is someplace after
// the last complete packet in this page. (It may yet
// be in this page, but in a packet completed on the
// next page.)
left = (right + left) / 2;
left_granulepos = ogg_page_granulepos(&page);
continue;
} else {
right = (right + left) / 2;
right_granulepos = ogg_page_granulepos(&page);
continue;
} }
} while (ogg_page_granulepos(&page) == -1);
TRACE("granulepos = %lld, ", ogg_page_granulepos(&page));
TRACE("fPosition = %llu\n", fPosition);
// check the granulepos of the page against the requested frame
if (ogg_page_granulepos(&page) < granulepos) {
// The packet that the frame is in is someplace after
// the last complete packet in this page. (It may yet
// be in this page, but in a packet completed on the
// next page.)
left = (right + left) / 2;
left_granulepos = ogg_page_granulepos(&page);
continue;
} else {
right = (right + left) / 2;
right_granulepos = ogg_page_granulepos(&page);
continue;
} }
} }