aboutsummaryrefslogtreecommitdiffstats
path: root/libSACenc/src/sacenc_nlc_enc.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
commit2fd44f2027f15c5e141f05245819bf424a44cfa1 (patch)
tree8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libSACenc/src/sacenc_nlc_enc.cpp
parentfa5ad13b3761cc0d4cfe3780944eed80fb52d842 (diff)
parent9ab67882eca7454dc001e158bc1e6e2219d6650b (diff)
downloadfdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.gz
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.bz2
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.zip
Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-release
Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
Diffstat (limited to 'libSACenc/src/sacenc_nlc_enc.cpp')
-rw-r--r--libSACenc/src/sacenc_nlc_enc.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/libSACenc/src/sacenc_nlc_enc.cpp b/libSACenc/src/sacenc_nlc_enc.cpp
index ecb89b7..0ba6cc9 100644
--- a/libSACenc/src/sacenc_nlc_enc.cpp
+++ b/libSACenc/src/sacenc_nlc_enc.cpp
@@ -379,16 +379,22 @@ static UINT huff_enc_1D(HANDLE_FDK_BITSTREAM strm, const DATA_TYPE data_type,
switch (data_type) {
case t_CLD:
- part0 = fdk_sacenc_huffPart0Tab.cld[in_data[0]];
pHuffTab = fdk_sacenc_huffCLDTab.h1D[dim1];
break;
case t_ICC:
- part0 = fdk_sacenc_huffPart0Tab.icc[in_data[0]];
pHuffTab = fdk_sacenc_huffICCTab.h1D[dim1];
break;
}
if (p0_flag) {
+ switch (data_type) {
+ case t_CLD:
+ part0 = fdk_sacenc_huffPart0Tab.cld[in_data[0]];
+ break;
+ case t_ICC:
+ part0 = fdk_sacenc_huffPart0Tab.icc[in_data[0]];
+ break;
+ }
huffBits += FDKwriteBits(strm, HUFF_VALUE(part0), HUFF_LENGTH(part0));
offset = 1;
}