fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-03-12 09:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix frame flushing

Browse Source
This commit is contained in:
Christian R. Helmrich 2021-03-23 11:00:00 +01:00
parent ea8fed7f7e
commit ad8881519d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/exhaleApp.cpp
View File

@ -764,7 +764,7 @@ int main (const int argc, char* argv[])
if (!readStdin) // reserve space for MP4 file header. TODO: nasty, avoid this if (!readStdin) // reserve space for MP4 file header. TODO: nasty, avoid this
{ {
if ((headerRes = (uint32_t) mp4Writer.initHeader (uint32_t (__min (UINT_MAX - startLength, expectLength)), sbrEncDelay >> 1)) < 666) if ((headerRes = (uint32_t) mp4Writer.initHeader (uint32_t (__min (UINT_MAX - startLength, expectLength)), sbrEncDelay >> 2)) < 666)
{ {
fprintf_s (stderr, "\n ERROR while trying to write MPEG-4 bit-stream header: stopped after %d bytes!\n\n", headerRes); fprintf_s (stderr, "\n ERROR while trying to write MPEG-4 bit-stream header: stopped after %d bytes!\n\n", headerRes);
i = 3; // return value i = 3; // return value
@ -905,19 +905,21 @@ int main (const int argc, char* argv[])
const int64_t actualLength = (wavReader.getDataBytesRead () << resampShift) / int64_t ((numChannels * inSampDepth * resampRatio) >> 3); const int64_t actualLength = (wavReader.getDataBytesRead () << resampShift) / int64_t ((numChannels * inSampDepth * resampRatio) >> 3);
const int64_t inFileLength = wavReader.getDataBytesRead () / int64_t ((numChannels * inSampDepth) >> 3); const int64_t inFileLength = wavReader.getDataBytesRead () / int64_t ((numChannels * inSampDepth) >> 3);
const unsigned inFrmLength = (frameLength * resampRatio) >> resampShift; const unsigned inFrmLength = (frameLength * resampRatio) >> resampShift;
const unsigned resampDelay = (enableUpsampler ? 32 : (enableResampler ? 64 : 0));
# ifdef FULL_FRM_LOOKAHEAD # ifdef FULL_FRM_LOOKAHEAD
const unsigned flushLength = (inFileLength - (enableUpsampler ? 32 : 0) + inPadLength) % inFrmLength; const unsigned flushLength = (inFileLength - resampDelay + inPadLength) % inFrmLength;
# else # else
const unsigned flushLength = (inFileLength - (enableUpsampler ? 32 : 0)) % inFrmLength; const unsigned flushLength = (inFileLength - resampDelay) % inFrmLength;
# endif # endif
if ((flushLength + ((startLength * resampRatio) >> resampShift) - inFrmLength + (enableUpsampler ? 32 : 0) + wavReader.getSampleRate () / 200 > inFrmLength if ((flushLength + ((startLength * resampRatio) >> resampShift) - inFrmLength + resampDelay
- (resampDelay >> 6)/*rnd*/+ wavReader.getSampleRate () / 200 > inFrmLength
#else #else
const int64_t actualLength = wavReader.getDataBytesRead () / int64_t ((numChannels * inSampDepth) >> 3); const int64_t actualLength = wavReader.getDataBytesRead () / int64_t ((numChannels * inSampDepth) >> 3);
const unsigned flushLength = actualLength % frameLength; const unsigned flushLength = actualLength % frameLength;
if ((flushLength + startLength - frameLength + sampleRate / 200 > frameLength if ((flushLength + startLength - frameLength + sampleRate / 200 > frameLength
#endif #endif
- (sbrEncDelay >> 1)) || (flushLength == 0)) // flush trailing PCM samples - ((2 + sbrEncDelay * 3) >> 2)) || (flushLength == 0)) // flush last frame
{ {
memset (inPcmData, 0, inFrameSize * numChannels); memset (inPcmData, 0, inFrameSize * numChannels);
#if ENABLE_RESAMPLING #if ENABLE_RESAMPLING
@ -952,7 +954,7 @@ int main (const int argc, char* argv[])
{ {
int64_t pos = _SEEK (outFileHandle, 0, 1 /*SEEK_CUR*/); int64_t pos = _SEEK (outFileHandle, 0, 1 /*SEEK_CUR*/);
if ((headerRes = (uint32_t) mp4Writer.initHeader (uint32_t (__min (UINT_MAX - startLength, actualLength)), sbrEncDelay >> 1)) < 666) if ((headerRes = (uint32_t) mp4Writer.initHeader (uint32_t (__min (UINT_MAX - startLength, actualLength)), sbrEncDelay >> 2)) < 666)
{ {
fprintf_s (stderr, "\n ERROR while trying to write MPEG-4 bit-stream header: stopped after %d bytes!\n\n", headerRes); fprintf_s (stderr, "\n ERROR while trying to write MPEG-4 bit-stream header: stopped after %d bytes!\n\n", headerRes);
i = 3; // return value i = 3; // return value