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

Remove outdated apply_normalization parameter from legacy DRC module. 

Bug: 149514474
Test: atest DecoderTestXheAac DecoderTestAacDrc
Change-Id: I9b894007fc9d80da6aaee09d84c2b356f2c06ff7
This commit is contained in:
Fraunhofer IIS FDK 2019-12-19 17:28:33 +01:00 committed by Jean-Michel Trivi
parent e016635f0d
commit 261fadc3a2
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libAACdec/src/aacdec_drc.cpp
View File

@ -190,7 +190,6 @@ void aacDecoder_drcInit(HANDLE_AAC_DRC self) {
pParams->usrBoost = FL2FXCONST_DBL(0.0f); pParams->usrBoost = FL2FXCONST_DBL(0.0f);
pParams->targetRefLevel = 96; pParams->targetRefLevel = 96;
pParams->expiryFrame = AACDEC_DRC_DFLT_EXPIRY_FRAMES; pParams->expiryFrame = AACDEC_DRC_DFLT_EXPIRY_FRAMES;
pParams->applyDigitalNorm = ON;
pParams->applyHeavyCompression = OFF; pParams->applyHeavyCompression = OFF;
pParams->usrApplyHeavyCompression = OFF; pParams->usrApplyHeavyCompression = OFF;
@ -274,11 +273,8 @@ AAC_DECODER_ERROR aacDecoder_drcSetParam(HANDLE_AAC_DRC self,
return AAC_DEC_INVALID_HANDLE; return AAC_DEC_INVALID_HANDLE;
} }
if (value < 0) { if (value < 0) {
self->params.applyDigitalNorm = OFF;
self->params.targetRefLevel = -1; self->params.targetRefLevel = -1;
} else { } else {
/* ref_level must be between 0 and MAX_REFERENCE_LEVEL, inclusive */
self->params.applyDigitalNorm = ON;
if (self->params.targetRefLevel != (SCHAR)value) { if (self->params.targetRefLevel != (SCHAR)value) {
self->params.targetRefLevel = (SCHAR)value; self->params.targetRefLevel = (SCHAR)value;
self->progRefLevel = (SCHAR)value; /* Always set the program reference self->progRefLevel = (SCHAR)value; /* Always set the program reference
@ -289,16 +285,6 @@ AAC_DECODER_ERROR aacDecoder_drcSetParam(HANDLE_AAC_DRC self,
self->update = 1; self->update = 1;
} }
break; break;
case APPLY_NORMALIZATION:
if ((value != OFF) && (value != ON)) {
return AAC_DEC_SET_PARAM_FAIL;
}
if (self == NULL) {
return AAC_DEC_INVALID_HANDLE;
}
/* Store new parameter value */
self->params.applyDigitalNorm = (UCHAR)value;
break;
case APPLY_HEAVY_COMPRESSION: case APPLY_HEAVY_COMPRESSION:
if ((value != OFF) && (value != ON)) { if ((value != OFF) && (value != ON)) {
return AAC_DEC_SET_PARAM_FAIL; return AAC_DEC_SET_PARAM_FAIL;
@ -926,11 +912,9 @@ void aacDecoder_drcApply(HANDLE_AAC_DRC self, void *pSbrDec,
FDK_ASSERT(0); FDK_ASSERT(0);
} }
} }
if (self->params.applyDigitalNorm == OFF) {
/* Reset normalization gain since this module must not apply it */ /* Reset normalization gain since this module must not apply it */
norm_mantissa = FL2FXCONST_DBL(0.5f); norm_mantissa = FL2FXCONST_DBL(0.5f);
norm_exponent = 1; norm_exponent = 1;
}
/* calc scale factors */ /* calc scale factors */
for (band = 0; band < numBands; band++) { for (band = 0; band < numBands; band++) {

1
libAACdec/src/aacdec_drc.h
View File

@ -130,7 +130,6 @@ typedef enum {
TARGET_REF_LEVEL, TARGET_REF_LEVEL,
DRC_BS_DELAY, DRC_BS_DELAY,
DRC_DATA_EXPIRY_FRAME, DRC_DATA_EXPIRY_FRAME,
APPLY_NORMALIZATION,
APPLY_HEAVY_COMPRESSION, APPLY_HEAVY_COMPRESSION,
DEFAULT_PRESENTATION_MODE, DEFAULT_PRESENTATION_MODE,
ENCODER_TARGET_LEVEL, ENCODER_TARGET_LEVEL,

1
libAACdec/src/aacdec_drc_types.h
View File

@ -168,7 +168,6 @@ typedef struct {
UINT expiryFrame; UINT expiryFrame;
UCHAR bsDelayEnable; UCHAR bsDelayEnable;
UCHAR applyDigitalNorm;
AACDEC_DRC_PARAMETER_HANDLING defaultPresentationMode; AACDEC_DRC_PARAMETER_HANDLING defaultPresentationMode;
UCHAR encoderTargetLevel; UCHAR encoderTargetLevel;

3
libAACdec/src/aacdecoder.cpp
View File

@ -3177,9 +3177,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
FDKmemcpy(drcChMap, self->chMapping, (8) * sizeof(UCHAR)); FDKmemcpy(drcChMap, self->chMapping, (8) * sizeof(UCHAR));
} }
/* Turn off DRC modules level normalization in digital domain. */
aacDecoder_drcSetParam(self->hDrcInfo, APPLY_NORMALIZATION, 0);
/* deactivate legacy DRC in case uniDrc is active, i.e. uniDrc payload is /* deactivate legacy DRC in case uniDrc is active, i.e. uniDrc payload is
* present and one of DRC or Loudness Normalization is switched on */ * present and one of DRC or Loudness Normalization is switched on */
aacDecoder_drcSetParam( aacDecoder_drcSetParam(