aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/rvlcbit.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-11 13:59:07 -0800
committerXin Li <delphij@google.com>2018-12-11 13:59:07 -0800
commit20c336953febeabbf6deeb38f479ec7642b5a69b (patch)
tree558cec2d4bf125448aeac1ccf5c5cec12cde5b75 /libAACdec/src/rvlcbit.cpp
parentd2be744af28a784177d1de8d7190377c8932e03d (diff)
parent33acbd97b67a3c740f7b54fae2ce127803b70c20 (diff)
downloadfdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.tar.gz
fdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.tar.bz2
fdk-aac-20c336953febeabbf6deeb38f479ec7642b5a69b.zip
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534 Change-Id: Ie44ac2dc553c40a8a9bd9b42b00a0b01cfa9799a
Diffstat (limited to 'libAACdec/src/rvlcbit.cpp')
-rw-r--r--libAACdec/src/rvlcbit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libAACdec/src/rvlcbit.cpp b/libAACdec/src/rvlcbit.cpp
index c06cf96..b0c4596 100644
--- a/libAACdec/src/rvlcbit.cpp
+++ b/libAACdec/src/rvlcbit.cpp
@@ -123,10 +123,10 @@ read direction. It is called very often, therefore it makes sense to inline it
--------------------------------------------------------------------------------------------
*/
-UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, INT *pPosition,
- UCHAR readDirection) {
+UCHAR rvlcReadBitFromBitstream(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
+ INT *pPosition, UCHAR readDirection) {
UINT bit;
- INT readBitOffset = *pPosition - FDKgetBitCnt(bs);
+ INT readBitOffset = (INT)FDKgetValidBits(bs) - bsAnchor + *pPosition;
if (readBitOffset) {
FDKpushBiDirectional(bs, readBitOffset);