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

FindLastPage fix for reading broken cd files (weird case where you can get 0 bytes read even if you seek in front of the end of the file). also some performance check on FindLastPages performance. print frame count/duration computed in GetStreamInfo.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6574 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-02-13 08:16:22 +00:00
parent 95c8060a66
commit 53d4f7cf34
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ogg/OggReaderPlugin.cpp
+12 -4
View File
@@ -287,7 +287,10 @@ OggReader::GetStreamInfo(void *cookie, int64 *frameCount, bigtime_t *duration,
*infoBuffer = 0; *infoBuffer = 0;
*infoSize = 0; *infoSize = 0;
OggTrack * track = static_cast<OggTrack*>(cookie); OggTrack * track = static_cast<OggTrack*>(cookie);
return track->GetStreamInfo(frameCount, duration, format); status_t status = track->GetStreamInfo(frameCount, duration, format);
TRACE("OggReader::GetStreamInfo: cookie=%x, frame count = %lld, duration = %lld.%lld seconds\n",
*(int*)cookie, *frameCount, (*duration)/1000000, (*duration)%1000000);
return status;
} }
@@ -317,6 +320,8 @@ status_t
OggReader::FindLastPages() OggReader::FindLastPages()
{ {
TRACE("OggReader::FindLastPages\n"); TRACE("OggReader::FindLastPages\n");
bigtime_t start_time = system_time();
status_t result = B_ERROR; status_t result = B_ERROR;
const int read_size = 256*256; const int read_size = 256*256;
@@ -331,10 +336,12 @@ OggReader::FindLastPages()
uint serial_count = 0; uint serial_count = 0;
while (serial_count < fCookies.size()) { while (serial_count < fCookies.size()) {
int offset; int offset;
ssize_t bytes = 0;
while ((offset = ogg_sync_pageseek(&sync, &page)) <= 0) { while ((offset = ogg_sync_pageseek(&sync, &page)) <= 0) {
left += -offset; left += -offset;
if (offset == 0) { if (offset == 0) {
if (fSeekable->Position() >= right) { off_t pos = fSeekable->Position();
if (pos >= right || bytes == 0) {
if (left == 0) { if (left == 0) {
TRACE("OggReader::FindLastPages: couldn't find some stream's page!!!\n"); TRACE("OggReader::FindLastPages: couldn't find some stream's page!!!\n");
goto done; goto done;
@@ -345,10 +352,9 @@ OggReader::FindLastPages()
goto done; goto done;
} }
ogg_sync_reset(&sync); ogg_sync_reset(&sync);
continue;
} }
char * buffer = ogg_sync_buffer(&sync, read_size); char * buffer = ogg_sync_buffer(&sync, read_size);
ssize_t bytes = fSeekable->Read(buffer, read_size); bytes = fSeekable->Read(buffer, read_size);
if (bytes < 0) { if (bytes < 0) {
TRACE("OggReader::FindLastPages: Read: error\n"); TRACE("OggReader::FindLastPages: Read: error\n");
result = bytes; result = bytes;
@@ -381,6 +387,8 @@ OggReader::FindLastPages()
result = B_OK; result = B_OK;
done: done:
ogg_sync_clear(&sync); ogg_sync_clear(&sync);
TRACE("OggReader::FindLastPages took %lld microseconds\n", system_time() - start_time);
return result; return result;
} }