fenix/fdk-aac
1
0
Fork 0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-03-13 14:20:04 +01:00
Code Issues Projects Releases Wiki Activity

Try to properly handle the case when the bitstream reader runs out of bits to read

Browse Source
This commit is contained in:
Martin Storsjo 2017-04-26 23:37:11 +03:00
parent 6b0d8201b1
commit 50922e3dbd
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libFDK/include/FDK_bitstream.h
View File

@ -223,8 +223,16 @@ FDK_INLINE UINT FDKreadBits(HANDLE_FDK_BITSTREAM hBitStream,
else else
{ {
hBitStream->CacheWord = FDK_get (&hBitStream->hBitBuf,validBits) ; hBitStream->CacheWord = FDK_get (&hBitStream->hBitBuf,validBits) ;
if (validBits >= missingBits)
{
hBitStream->BitsInCache = validBits - missingBits; hBitStream->BitsInCache = validBits - missingBits;
} }
else
{
hBitStream->BitsInCache = 0;
hBitStream->CacheWord <<= missingBits - validBits;
}
}
return ( bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) & BitMask[numberOfBits]; return ( bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) & BitMask[numberOfBits];
} }
@ -243,6 +251,12 @@ FDK_INLINE UINT FDKreadBits(HANDLE_FDK_BITSTREAM hBitStream,
hBitStream->CacheWord = (hBitStream->CacheWord << bitsToRead) | FDK_get (&hBitStream->hBitBuf,bitsToRead) ; hBitStream->CacheWord = (hBitStream->CacheWord << bitsToRead) | FDK_get (&hBitStream->hBitBuf,bitsToRead) ;
hBitStream->BitsInCache += bitsToRead ; hBitStream->BitsInCache += bitsToRead ;
if (hBitStream->BitsInCache < numberOfBits)
{
hBitStream->CacheWord <<= numberOfBits - hBitStream->BitsInCache;
hBitStream->BitsInCache = 0;
return (hBitStream->CacheWord >> hBitStream->BitsInCache) & validMask ;
}
} }
hBitStream->BitsInCache -= numberOfBits ; hBitStream->BitsInCache -= numberOfBits ;