Author: alexc Date: Thu Nov 26 22:52:52 2009 New Revision: 5458 Log: If SBR's reset procedure fails switch back to pure upsampling mode. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:50 2009 (r5457) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:52 2009 (r5458) @@ -778,9 +778,15 @@ static unsigned int sbr_data(AACContext static void sbr_reset(AACContext *ac, SpectralBandReplication *sbr) { - sbr_make_f_master(ac, sbr, sbr->spectrum_params); - sbr_make_f_derived(ac, sbr); + int err; + err = sbr_make_f_master(ac, sbr, sbr->spectrum_params); + if (err >= 0) + err = sbr_make_f_derived(ac, sbr); sbr->reset = 0; + if (err < 0) { + av_log(ac->avccontext, AV_LOG_ERROR, "SBR reset failed. Switching SBR to pure upsampling mode.\n"); + sbr->start = 0; + } } /**