diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-10-12 11:57:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-12 11:57:26 -0700 |
| commit | 40676e7cba898f4be1621ad6b7a50929de629cdf (patch) | |
| tree | abda81487d95eb6c733c3aec81b8a7c4b3322d3f /libAACdec/src | |
| parent | efe7d492457bb62875ab3dba2688ca8428f78b2c (diff) | |
| parent | fb65c0c24b1d131e2507e8afa757deb801b8eae4 (diff) | |
| download | fdk-aac-40676e7cba898f4be1621ad6b7a50929de629cdf.tar.gz fdk-aac-40676e7cba898f4be1621ad6b7a50929de629cdf.tar.bz2 fdk-aac-40676e7cba898f4be1621ad6b7a50929de629cdf.zip | |
Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type."
am: fb65c0c24b
Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
Diffstat (limited to 'libAACdec/src')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index d98cf5a..ea52bb5 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -368,6 +368,23 @@ static INT aacDecoder_CtrlCFGChangeCallback( return errTp; } +static INT aacDecoder_SbrCallback( + void *handle, HANDLE_FDK_BITSTREAM hBs, const INT sampleRateIn, + const INT sampleRateOut, const INT samplesPerFrame, + const AUDIO_OBJECT_TYPE coreCodec, const MP4_ELEMENT_ID elementID, + const INT elementIndex, const UCHAR harmonicSBR, + const UCHAR stereoConfigIndex, const UCHAR configMode, UCHAR *configChanged, + const INT downscaleFactor) { + HANDLE_SBRDECODER self = (HANDLE_SBRDECODER)handle; + + INT errTp = sbrDecoder_Header(self, hBs, sampleRateIn, sampleRateOut, + samplesPerFrame, coreCodec, elementID, + elementIndex, harmonicSBR, stereoConfigIndex, + configMode, configChanged, downscaleFactor); + + return errTp; +} + static INT aacDecoder_SscCallback(void *handle, HANDLE_FDK_BITSTREAM hBs, const AUDIO_OBJECT_TYPE coreCodec, const INT samplingRate, @@ -959,7 +976,7 @@ LINKSPEC_CPP HANDLE_AACDECODER aacDecoder_Open(TRANSPORT_TYPE transportFmt, goto bail; } aacDec->qmfModeUser = NOT_DEFINED; - transportDec_RegisterSbrCallback(aacDec->hInput, (cbSbr_t)sbrDecoder_Header, + transportDec_RegisterSbrCallback(aacDec->hInput, aacDecoder_SbrCallback, (void *)aacDec->hSbrDecoder); if (mpegSurroundDecoder_Open( |