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

raw_decoder: Pass errors back up the chain.

Browse Source 
This way B_LAST_BUFFER_ERROR will actually be reported properly.
This commit is contained in:
Augustin Cavalier 2024-02-21 16:19:53 -05:00
parent 2a2e7ad562
commit 8f34967728
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp
View File

@ -482,12 +482,13 @@ RawDecoder::Decode(void *buffer, int64 *frameCount,
char *output_buffer = (char *)buffer;
mediaHeader->start_time = fStartTime;
*frameCount = 0;
status_t status = B_OK;
while (*frameCount < fOutputBufferFrameCount) {
if (fChunkSize == 0) {
media_header mh;
status_t err;
err = GetNextChunk(&fChunkBuffer, &fChunkSize, &mh);
if (err != B_OK || fChunkSize < (size_t)fInputFrameSize) {
status = GetNextChunk(&fChunkBuffer, &fChunkSize, &mh);
if (status != B_OK || fChunkSize < (size_t)fInputFrameSize) {
fChunkSize = 0;
break;
}
@ -514,10 +515,10 @@ RawDecoder::Decode(void *buffer, int64 *frameCount,
if (fSwapOutput)
fSwapOutput(buffer, *frameCount * fInputFormat.u.raw_audio.channel_count);
TRACE("framecount %lld, time %lld\n",*frameCount, mediaHeader->start_time);
return *frameCount ? B_OK : B_ERROR;
return *frameCount ? B_OK : (status != B_OK ? status : B_ERROR);
}