Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-08 16:37:44 +02:00
Code Issues Releases Wiki Activity

change flushing case for OD ffmpeg

Browse Source
This commit is contained in:
mchinen 2012-06-01 06:11:36 +00:00
parent e5520d0b7d
commit 77917b3268
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ondemand/ODDecodeFFmpegTask.cpp
View File

@ -387,7 +387,7 @@ int ODFFmpegDecoder::Decode(samplePtr & data, sampleFormat & format, sampleCount
} }
// Flush the decoders if we're done. // Flush the decoders if we're done.
if(!sc && len>0) if((!sc || sc == (streamContext*) 1)&& len>0)
{ {
for (int i = 0; i < mNumStreams; i++) for (int i = 0; i < mNumStreams; i++)
{ {
@ -405,10 +405,13 @@ int ODFFmpegDecoder::Decode(samplePtr & data, sampleFormat & format, sampleCount
//this next call takes data, start and len as reference variables and updates them to reflect the new area that is needed. //this next call takes data, start and len as reference variables and updates them to reflect the new area that is needed.
FillDataFromCache(bufStart, format, start, len, channel); FillDataFromCache(bufStart, format, start, len, channel);
// CHECK: not sure if we need this. In any case it has to be updated for the new float case (not just int16)
//if for some reason we couldn't get the samples, fill them with silence //if for some reason we couldn't get the samples, fill them with silence
/*
int16_t* outBuf = (int16_t*) bufStart; int16_t* outBuf = (int16_t*) bufStart;
for(int i=0;i<len;i++) for(int i=0;i<len;i++)
outBuf[i]=0; outBuf[i]=0;
*/
return 1; return 1;
} }