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

Really strange workaround to read some strange files...

Browse Source 
Either the files are broken, or the GetFrameLength() function


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5630 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2003-12-08 21:17:35 +00:00
parent abc8999720
commit 37c555c2ca
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp
+33 -2
View File
@@ -187,6 +187,8 @@ mp3Reader::GetFileFormatInfo(media_file_format *mff)
int layer_index = (header[1] >> 1) & 0x03; int layer_index = (header[1] >> 1) & 0x03;
strcpy(mff->short_name, name_table[mpeg_version_index][layer_index]); strcpy(mff->short_name, name_table[mpeg_version_index][layer_index]);
strcpy(mff->pretty_name, name_table[mpeg_version_index][layer_index]); strcpy(mff->pretty_name, name_table[mpeg_version_index][layer_index]);
printf("mp3Reader: %s\n", name_table[mpeg_version_index][layer_index]);
} }
@@ -354,6 +356,22 @@ mp3Reader::GetNextChunk(void *cookie,
mediaHeader->start_time = (data->framePosition * 1000000) / data->frameRate; mediaHeader->start_time = (data->framePosition * 1000000) / data->frameRate;
mediaHeader->file_pos = data->position; mediaHeader->file_pos = data->position;
#if 0
// XXXX TEST
int 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: retry:
if (4 != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer, 4)) { if (4 != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer, 4)) {
TRACE("mp3Reader::GetNextChunk: unexpected read error\n"); TRACE("mp3Reader::GetNextChunk: unexpected read error\n");
@@ -380,11 +398,21 @@ retry:
size = maxbytes; size = maxbytes;
if (size == 0) if (size == 0)
return B_LAST_BUFFER_ERROR; return B_LAST_BUFFER_ERROR;
if (size != Source()->ReadAt(fDataStart + data->position, data->chunkBuffer + 4, size)) { // XXX reads one byte more than needed to allow doing the check below
if (size > Source()->ReadAt(fDataStart + data->position, data->chunkBuffer + 4, size + 1)) {
TRACE("mp3Reader::GetNextChunk: unexpected read error\n"); TRACE("mp3Reader::GetNextChunk: unexpected read error\n");
return B_ERROR; return B_ERROR;
} }
// XXX I found two files that need this, either they are broken,
// XXX or the GetFrameLength() function is bad
uint8 *d = (uint8 *)data->chunkBuffer;
if (d[4 + size - 1] == 0xff && d[4 + size] != 0xff && ((d[4 + size] & 0xe0) == 0xe0)) {
TRACE("mp3Reader::GetNextChunk: frame at %Ld: reported length %d, real length %d\n", data->position, size + 4, size + 3);
size--;
}
data->position += size; data->position += size;
data->framePosition += data->framesPerFrame; data->framePosition += data->framesPerFrame;
@@ -398,6 +426,7 @@ retry:
} }
return B_OK; return B_OK;
#endif
} }
bool bool
@@ -407,6 +436,8 @@ mp3Reader::ResynchronizeStream(mp3data *data)
// XXX this is a hack and needs to be improved // XXX this is a hack and needs to be improved
data->position -= 16;
const int readmax = 16384; const int readmax = 16384;
uint8 buffer[readmax]; uint8 buffer[readmax];