diff options
| author | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
| commit | c7a3808a2fd18bb4dad24d281cbb862b241806a9 (patch) | |
| tree | 2cea66fef9961cd71efc817fed7e857ef27099b0 /libDRCdec/src/FDK_drcDecLib.cpp | |
| parent | d23a21ab427da642c8f32bb0659ae63a86f98e96 (diff) | |
| parent | f4adff7fbb0968a13fd5077ea3df734870aef3cf (diff) | |
| download | fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.gz fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.bz2 fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libDRCdec/src/FDK_drcDecLib.cpp')
| -rw-r--r-- | libDRCdec/src/FDK_drcDecLib.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libDRCdec/src/FDK_drcDecLib.cpp b/libDRCdec/src/FDK_drcDecLib.cpp index 4f8ebc7..26e5b78 100644 --- a/libDRCdec/src/FDK_drcDecLib.cpp +++ b/libDRCdec/src/FDK_drcDecLib.cpp @@ -112,7 +112,7 @@ amm-info@iis.fraunhofer.de #define DRCDEC_LIB_VL1 1 #define DRCDEC_LIB_VL2 0 #define DRCDEC_LIB_TITLE "MPEG-D DRC Decoder Lib" -#ifdef __ANDROID__ +#ifdef SUPPRESS_BUILD_DATE_INFO #define DRCDEC_LIB_BUILD_DATE "" #define DRCDEC_LIB_BUILD_TIME "" #else @@ -145,6 +145,10 @@ struct s_drc_decoder { SEL_PROC_OUTPUT selProcOutput; } DRC_DECODER; +static int _getGainStatus(HANDLE_UNI_DRC_GAIN hUniDrcGain) { + return hUniDrcGain->status; +} + static int isResetNeeded(HANDLE_DRC_DECODER hDrcDec, const SEL_PROC_OUTPUT oldSelProcOutput) { int i, resetNeeded = 0; @@ -515,6 +519,8 @@ LONG FDK_drcDec_GetParam(HANDLE_DRC_DECODER hDrcDec, } case DRC_DEC_TARGET_CHANNEL_COUNT_SELECTED: return (LONG)hDrcDec->selProcOutput.targetChannelCount; + case DRC_DEC_OUTPUT_LOUDNESS: + return (LONG)hDrcDec->selProcOutput.outputLoudness; default: return 0; } @@ -729,7 +735,9 @@ FDK_drcDec_ReadUniDrcGain(HANDLE_DRC_DECODER hDrcDec, &(hDrcDec->uniDrcGain)); if (dErr) return DRC_DEC_NOT_OK; - hDrcDec->status = DRC_DEC_NEW_GAIN_PAYLOAD; + if (_getGainStatus(&(hDrcDec->uniDrcGain))) { + hDrcDec->status = DRC_DEC_NEW_GAIN_PAYLOAD; + } return DRC_DEC_OK; } @@ -751,7 +759,9 @@ FDK_drcDec_ReadUniDrc(HANDLE_DRC_DECODER hDrcDec, startSelectionProcess(hDrcDec); if (dErr) return DRC_DEC_NOT_OK; - hDrcDec->status = DRC_DEC_NEW_GAIN_PAYLOAD; + if (_getGainStatus(&(hDrcDec->uniDrcGain))) { + hDrcDec->status = DRC_DEC_NEW_GAIN_PAYLOAD; + } return DRC_DEC_OK; } |