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

handle B_LAST_BUFFER_ERROR from GetNextChunk. properly return a non-full buffer if we got anything decoded. if the buffer has no data, set framecount to zero, and return B_LAST_BUFFER_ERROR.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5777 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2003-12-28 01:34:42 +00:00
parent a6eabaff96
commit b52b0133da
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/vorbis/vorbisCodecPlugin.cpp
+12 -4
View File
@@ -169,9 +169,13 @@ vorbisDecoder::Decode(void *buffer, int64 *frameCount,
void *chunkBuffer; void *chunkBuffer;
int32 chunkSize; int32 chunkSize;
media_header mh; media_header mh;
if (B_OK != GetNextChunk(&chunkBuffer, &chunkSize, &mh)) { status_t status = GetNextChunk(&chunkBuffer, &chunkSize, &mh);
if (status == B_LAST_BUFFER_ERROR) {
goto done;
}
if (status != B_OK) {
TRACE("vorbisDecoder::Decode: GetNextChunk failed\n"); TRACE("vorbisDecoder::Decode: GetNextChunk failed\n");
return B_ERROR; return status;
} }
if (chunkSize != sizeof(ogg_packet)) { if (chunkSize != sizeof(ogg_packet)) {
TRACE("vorbisDecoder::Decode: chunk not ogg_packet-sized\n"); TRACE("vorbisDecoder::Decode: chunk not ogg_packet-sized\n");
@@ -197,10 +201,14 @@ vorbisDecoder::Decode(void *buffer, int64 *frameCount,
fStartTime += (1000000LL * samples) / fInfo.rate; fStartTime += (1000000LL * samples) / fInfo.rate;
//TRACE("vorbisDecoder: fStartTime inc'd to %.6f\n", fStartTime / 1000000.0); //TRACE("vorbisDecoder: fStartTime inc'd to %.6f\n", fStartTime / 1000000.0);
} }
done:
*frameCount = (fOutputBufferSize - out_bytes_needed) / fFrameSize; *frameCount = (fOutputBufferSize - out_bytes_needed) / fFrameSize;
// XXX this doesn't guarantee that we always return B_LAST_BUFFER_ERROR bofore returning B_ERROR if (out_buffer != buffer) {
return (out_bytes_needed == 0) ? B_OK : (out_bytes_needed == fOutputBufferSize) ? B_ERROR : B_LAST_BUFFER_ERROR; return B_OK;
}
return B_LAST_BUFFER_ERROR;
} }
Decoder * Decoder *