fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." 

am: fb65c0c24b

Change-Id: I0fcbaf9d5b03272b1a8c4872e6ac02f7c6dc2c3a
This commit is contained in:
Jean-Michel Trivi 2018-10-12 11:57:26 -07:00 committed by android-build-merger
parent efe7d49245 fb65c0c24b
commit 40676e7cba
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libAACdec/src/aacdecoder_lib.cpp
View File

@ -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(