mirror of https://github.com/mstorsjo/fdk-aac.git
e499f9485e
Operating the FDK encoder in A2DP with variable bitrate mode configuration resulted in unexpected encoder return value AACENC_ENCODE_ERROR. Due to peak bitrate restriction the encoder quite often runs into requantization. In case the bitrate constraint is not fulfilled, the so-called crash recovery is used as final emergency step. The crash recovery reduces the overall bit consumption considering the given number of bits to be saved. The bit difference is extracted from audio element structures. In VBR mode the element wise bit consumption state was not updated since there is typically no bitrate limitation required. The patch solves the choppy audio problems and increases audio quality for AAC VBR encoding. The changes in FDKaacEnc_QCMain() ensure that audio element bit info is always updated. This is achieved by always calling FDKaacEnc_BitResRedistribution() and FDKaacEnc_prepareBitDistribution() with maxBitsPerFrame variable as total bits parameter. Furthermore, VBR assumes a certain target bitrate which is used for internal configuration and limitations. In case the peak bitrate parameter is less than the VBR mode target bitrate the maximum of both bitrate configurations was used. The function FDKaacEnc_AdjustVBRBitrateMode() is added to adjust the encoder internal VBR mode to a desired target bitrate less than given peak bitrate. It is possible that the peak bitrate is very close to the desired target bitrate. The virtual available bitreservoir is quite low and the encoder would run quite often into requantization with needless audio quality reduction. In such a configuration, it is a better choice to use the CBR targeted threshold adaption to avoid audio quality reduction. In FDKaacEnc_Initialize(), there was already a bitResMode selection depending on available bitreservoir for CBR. This selection will now also be used for VBR. In case the bitResMode is AACENC_BR_MODE_FULL and VBR mode is selected, the VBR threshold adaption is used. Otherwise, CBR threshold adaption strategy is used and therefore, no unnecessary fill bits are written. Bug: 161400526 Test: see bug Change-Id: I1865f817180150da6add2623a64f1a102622784a |
||
|---|---|---|
| .. | ||
| aacEnc_ram.cpp | ||
| aacEnc_ram.h | ||
| aacEnc_rom.cpp | ||
| aacEnc_rom.h | ||
| aacenc.cpp | ||
| aacenc.h | ||
| aacenc_lib.cpp | ||
| aacenc_pns.cpp | ||
| aacenc_pns.h | ||
| aacenc_tns.cpp | ||
| aacenc_tns.h | ||
| adj_thr.cpp | ||
| adj_thr.h | ||
| adj_thr_data.h | ||
| band_nrg.cpp | ||
| band_nrg.h | ||
| bandwidth.cpp | ||
| bandwidth.h | ||
| bit_cnt.cpp | ||
| bit_cnt.h | ||
| bitenc.cpp | ||
| bitenc.h | ||
| block_switch.cpp | ||
| block_switch.h | ||
| channel_map.cpp | ||
| channel_map.h | ||
| chaosmeasure.cpp | ||
| chaosmeasure.h | ||
| dyn_bits.cpp | ||
| dyn_bits.h | ||
| grp_data.cpp | ||
| grp_data.h | ||
| intensity.cpp | ||
| intensity.h | ||
| interface.h | ||
| line_pe.cpp | ||
| line_pe.h | ||
| metadata_compressor.cpp | ||
| metadata_compressor.h | ||
| metadata_main.cpp | ||
| metadata_main.h | ||
| mps_main.cpp | ||
| mps_main.h | ||
| ms_stereo.cpp | ||
| ms_stereo.h | ||
| noisedet.cpp | ||
| noisedet.h | ||
| pns_func.h | ||
| pnsparam.cpp | ||
| pnsparam.h | ||
| pre_echo_control.cpp | ||
| pre_echo_control.h | ||
| psy_configuration.cpp | ||
| psy_configuration.h | ||
| psy_const.h | ||
| psy_data.h | ||
| psy_main.cpp | ||
| psy_main.h | ||
| qc_data.h | ||
| qc_main.cpp | ||
| qc_main.h | ||
| quantize.cpp | ||
| quantize.h | ||
| sf_estim.cpp | ||
| sf_estim.h | ||
| spreading.cpp | ||
| spreading.h | ||
| tns_func.h | ||
| tonality.cpp | ||
| tonality.h | ||
| transform.cpp | ||
| transform.h | ||