diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:52:53 +0000 |
| commit | 1b5221d9fee482e03342eb1593f580754fa7ab3f (patch) | |
| tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libAACdec/src/aacdec_hcrs.cpp | |
| parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
| parent | a950cd990528f07b93cc5af48145e7cb6bfeb3ca (diff) | |
| download | fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.gz fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.tar.bz2 fdk-aac-1b5221d9fee482e03342eb1593f580754fa7ab3f.zip | |
Merge Android 12
Bug: 202323961
Merged-In: Ia7a8fba7d5108dd4281a47b1aa15966bb6eee947
Change-Id: Iebff00b0ddec06e5d43a6f0109325613701dc05d
Diffstat (limited to 'libAACdec/src/aacdec_hcrs.cpp')
| -rw-r--r-- | libAACdec/src/aacdec_hcrs.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libAACdec/src/aacdec_hcrs.cpp b/libAACdec/src/aacdec_hcrs.cpp index 44b32a5..5e3f9ac 100644 --- a/libAACdec/src/aacdec_hcrs.cpp +++ b/libAACdec/src/aacdec_hcrs.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -173,7 +173,9 @@ void DecodeNonPCWs(HANDLE_FDK_BITSTREAM bs, H_HCR_INFO pHcr) { pHcr->segmentInfo.readDirection = FROM_RIGHT_TO_LEFT; /* Process sets subsequently */ + numSet = fMin(numSet, (UCHAR)MAX_HCR_SETS); for (currentSet = 1; currentSet < numSet; currentSet++) { + /* step 1 */ numCodeword -= *pNumSegment; /* number of remaining non PCWs [for all sets] */ |