mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
Bug fixes in AAC decoder, AAC encoder, FDK library
Latest code drop from Fraunhofer: * AAC-Decoder - Expanded AAC-LD/ELD decoder TNS max band tables to avoid wrong data access for sampling rates <22kHz and >48kHz. Modified file(s): libAACdec\src\aacdec_tns.cpp libAACdec\src\aac_rom.h libAACdec\src\aac_rom.cpp - Fixed ELD synthesis QMF filterbank scaling for downsampled SBR. Modified file(s): libFDK\src\qmf.cpp * AAC-Encoder - Fixed bit rate limiting for lower limit as introduced in the Delivery 2012-05-11. Modified file(s): libAACenc\include\aacenc_lib.h libAACenc\src\aacenc.h libAACenc\src\aacenc.cpp libSBRenc\src\sbr_rom.h libSBRenc\src\sbr_rom.cpp - Allow negative prediction gain as meaning that there is no coding gain. Make use of scaleValueSaturate in gauss window calculation. Modified file(s): libAACenc\src\aacenc_tns.cpp - Added energy saturation to prevent overflow in short blocks. Modified file(s): libAACenc\src\grp_data.cpp - Perform scalefactor adaption in case quantized lines are out of valid range. Modified file(s): libAACenc\src\quantize.cpp - Interrupt quantization loop when no spectral data is available. Adjustments in bitreservoir adaption. Modified file(s): libAACenc\src\qc_main.cpp - Indroduced dynamic scaling in none missing harmonic energy lowering compensation. Modified file(s): libSBRenc\src\env_est.cpp * FDK-Library - Fixed saturation for negative values in scaleValueSaturate. Modified file(s): libFDK\include\scale.h Change-Id: If830ea65caef6b5554281e4b7a77a8b2e08825ce
This commit is contained in:
@@ -148,12 +148,20 @@ FIXP_DBL scaleValueSaturate(
|
||||
{
|
||||
if(scalefactor > 0) {
|
||||
if (fNorm(value) < scalefactor && value != (FIXP_DBL)0) {
|
||||
return (FIXP_DBL)MAXVAL_DBL;
|
||||
if (value > (FIXP_DBL)0) {
|
||||
return (FIXP_DBL)MAXVAL_DBL;
|
||||
} else {
|
||||
return (FIXP_DBL)MINVAL_DBL;
|
||||
}
|
||||
} else {
|
||||
return (value<<scalefactor);
|
||||
}
|
||||
} else {
|
||||
if (-(DFRACT_BITS-1) > scalefactor) {
|
||||
return (FIXP_DBL)0;
|
||||
} else {
|
||||
return (value>>(-scalefactor));
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user