diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-27 14:39:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-27 14:39:49 -0800 |
| commit | d6459f539c03df17c6aa75915d31a9d8c8adcca2 (patch) | |
| tree | 34600137fef4e3746093c76605c3c9369a1fda7c /libPCMutils/src | |
| parent | cce1e2106d431a65c02e056839b6b0a6aff50085 (diff) | |
| parent | f5512132f3850ab06a13b9e541cac51f6f389bf2 (diff) | |
| download | fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.tar.gz fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.tar.bz2 fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.zip | |
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7
am: f5512132f3
Change-Id: Ie01b6d6c881c4c9a52af921eee9f7ced6fd6880e
Diffstat (limited to 'libPCMutils/src')
| -rw-r--r-- | libPCMutils/src/pcmdmx_lib.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libPCMutils/src/pcmdmx_lib.cpp b/libPCMutils/src/pcmdmx_lib.cpp index b09a848..2070dbc 100644 --- a/libPCMutils/src/pcmdmx_lib.cpp +++ b/libPCMutils/src/pcmdmx_lib.cpp @@ -1043,6 +1043,7 @@ static PCMDMX_ERROR getMixFactors(const UCHAR inModeIsCfg, case CH_MODE_3_2_1_0: isValidCfg = FALSE; err = PCMDMX_INVALID_MODE; + FDK_FALLTHROUGH; case CH_MODE_3_0_3_1: /* chCfg 11 */ /* 6.1ch: C' = C; L' = L; R' = R; LFE' = LFE; Ls' = Ls*dmix_a_idx + Cs*dmix_b_idx; @@ -1080,9 +1081,11 @@ static PCMDMX_ERROR getMixFactors(const UCHAR inModeIsCfg, LEFT_REAR_CHANNEL, FL2FXCONST_DMX(0.5f), 1); dmxSetChannel(mixFactors, mixScales, LEFT_REAR_CHANNEL, LEFT_REAR_CHANNEL, FL2FXCONST_DMX(0.5f), 1); + FDK_FALLTHROUGH; case CH_MODE_5_2_1_0: isValidCfg = FALSE; err = PCMDMX_INVALID_MODE; + FDK_FALLTHROUGH; case CH_MODE_5_0_2_1: /* chCfg 7 || 14 */ if (inChCfg == 14) { /* 7.1ch Front Height: C' = C; Ls' = Ls; Rs' = Rs; LFE' = LFE; |