Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Activate some test code to use large constant chunk sizes instead of small mp3 frame sizes. Improves I/O

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34665 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
David McPaul 2009-12-15 12:08:36 +00:00
parent 4673f145a3
commit 5868901fda
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp
View File

@ -447,31 +447,35 @@ mp3Reader::GetNextChunk(void *cookie,
mp3data *data = reinterpret_cast<mp3data *>(cookie);
int64 maxbytes = fDataSize - data->position;
mediaHeader->file_pos = data->position;
#if 1
// TEST CODE to return a chunk of MAX_CHUNK_SIZE - 16 instead of frame size
if (maxbytes <= 0) {
return B_LAST_BUFFER_ERROR;
}
size_t size = min_c(MAX_CHUNK_SIZE - 16, maxbytes);
if (size != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer, size)) {
printf("mp3Reader::GetNextChunk: unexpected read error\n");
return B_ERROR;
}
data->position += size;
*chunkBuffer = data->chunkBuffer;
*chunkSize = size;
return B_OK;
#else
if (maxbytes < 4)
return B_LAST_BUFFER_ERROR;
mediaHeader->start_time = (data->framePosition * 1000000) / data->frameRate;
mediaHeader->file_pos = data->position;
#if 0
// XXXX TEST
size_t size = min_c(MAX_CHUNK_SIZE - 16, maxbytes);
if (size != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer,size)) {
TRACE("mp3Reader::GetNextChunk: unexpected read error\n");
return B_ERROR;
}
data->position += size;
data->framePosition += data->framesPerFrame;
*chunkBuffer = data->chunkBuffer;
*chunkSize = size;
return B_OK;
// XXXX TEST
#else
retry:
if (4 != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer, 4)) {
TRACE("mp3Reader::GetNextChunk: unexpected read error\n");
printf("mp3Reader::GetNextChunk: unexpected read error\n");
return B_ERROR;
}