diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2020-04-09 17:58:17 +0200 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2021-02-14 12:21:04 -0800 |
| commit | 87e01ef1e77105adda58a2a89e2179d43327266c (patch) | |
| tree | f36762fd7dbf8d59f9d6772da6474ecbd2f63b4c /libMpegTPEnc/src/tpenc_asc.cpp | |
| parent | e916be37f24a118eb0663b53794389dc83af8e8d (diff) | |
| download | fdk-aac-87e01ef1e77105adda58a2a89e2179d43327266c.tar.gz fdk-aac-87e01ef1e77105adda58a2a89e2179d43327266c.tar.bz2 fdk-aac-87e01ef1e77105adda58a2a89e2179d43327266c.zip | |
Check number of core channels and SAC decoder input channels to avoid a channel mismatch.
Bug: 176246647
Test: atest android.media.cts.DecoderTestAacFormat android.media.cts.DecoderTestXheAac android.media.cts.DecoderTestAacDrc
Change-Id: Ib8b6973e9c29e13b8ef33d7736be2b977928face
Diffstat (limited to 'libMpegTPEnc/src/tpenc_asc.cpp')
| -rw-r--r-- | libMpegTPEnc/src/tpenc_asc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libMpegTPEnc/src/tpenc_asc.cpp b/libMpegTPEnc/src/tpenc_asc.cpp index 0b484a0..9591ba8 100644 --- a/libMpegTPEnc/src/tpenc_asc.cpp +++ b/libMpegTPEnc/src/tpenc_asc.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 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 @@ -795,7 +795,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, const INT eldExtLen = (cb->cbSsc(cb->cbSscData, NULL, config->aot, config->extSamplingRate, 0, - 0, 0, 0, 0, NULL) + + 0, 0, 0, 0, 0, NULL) + 7) >> 3; INT cnt = eldExtLen; @@ -818,7 +818,7 @@ static int transportEnc_writeELDSpecificConfig(HANDLE_FDK_BITSTREAM hBs, } cb->cbSsc(cb->cbSscData, hBs, config->aot, config->extSamplingRate, 0, 0, 0, - 0, 0, NULL); + 0, 0, 0, NULL); } if (config->downscaleSamplingRate != 0 && |