diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-27 22:18:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-27 22:18:54 +0000 |
| commit | ecc96969d7db139242dbba9930857ed5ce955b29 (patch) | |
| tree | e78e88638c742d3dcd5f704d6ad50758d256a945 /libAACenc/src | |
| parent | f828d3e16adfb4cb428b4f3a2c155f89853cebbe (diff) | |
| parent | 0cebd077b61cc0946ea4062bf816defdffaef72b (diff) | |
| download | fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.tar.gz fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.tar.bz2 fdk-aac-ecc96969d7db139242dbba9930857ed5ce955b29.zip | |
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
* changes:
Apply sbrDecoder_Parse() function for all explict SBR elements
Call QMF transposer initialization only with successful SBR processing
Add error path to generateFixFixOnly()
Add missing break in order to avoid a fallthrough in setConcealMethod()
Add FDK_FALLTHROUGH macro to prevent implicit-fallthrough compiler warnings
Diffstat (limited to 'libAACenc/src')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 3 | ||||
| -rw-r--r-- | libAACenc/src/bitenc.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index f92cff4..9e0630c 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -907,6 +907,7 @@ static AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder, case AOT_MP2_AAC_LC: case AOT_MP2_SBR: hAacConfig->usePns = 0; + FDK_FALLTHROUGH; case AOT_AAC_LC: case AOT_SBR: case AOT_PS: @@ -2091,12 +2092,14 @@ AACENC_ERROR aacEncoder_SetParam(const HANDLE_AACENCODER hAacEncoder, err = AACENC_INVALID_CONFIG; goto bail; } + FDK_FALLTHROUGH; case AOT_SBR: case AOT_MP2_SBR: if (!(hAacEncoder->encoder_modis & (ENC_MODE_FLAG_SBR))) { err = AACENC_INVALID_CONFIG; goto bail; } + FDK_FALLTHROUGH; case AOT_AAC_LC: case AOT_MP2_AAC_LC: case AOT_ER_AAC_LD: diff --git a/libAACenc/src/bitenc.cpp b/libAACenc/src/bitenc.cpp index 652d1fd..957e821 100644 --- a/libAACenc/src/bitenc.cpp +++ b/libAACenc/src/bitenc.cpp @@ -643,6 +643,7 @@ static INT FDKaacEnc_writeExtensionPayload(HANDLE_FDK_BITSTREAM hBitStream, FDKwriteBits(hBitStream, *extPayloadData++, 4); /* nibble */ } extBitsUsed += 4; + FDK_FALLTHROUGH; case EXT_DYNAMIC_RANGE: case EXT_SBR_DATA: case EXT_SBR_DATA_CRC: @@ -690,6 +691,7 @@ static INT FDKaacEnc_writeExtensionPayload(HANDLE_FDK_BITSTREAM hBitStream, case EXT_FILL_DATA: fillByte = 0xA5; + FDK_FALLTHROUGH; case EXT_FIL: default: if (hBitStream != NULL) { |