Commit f1dad68e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

allocate enough buffer channels to store all decorrlator channels in SPAR

parent 32aa5004

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 
#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */



#define NONBE_FIX_798_OSBA_MC_DEC_CRASH



/* ##################### End NON-BE switches ########################### */

lib_rend/ivas_output_init.c

+8 −0
Original line number Diff line number Diff line
@@ -355,9 +355,17 @@ int16_t ivas_get_nchan_buffers_dec( 
            nchan_out_buff = max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );

            nchan_out_buff = max( nchan_out_buff, audioCfg2channels( output_config ) );





            if ( st_ivas->renderer_type == RENDERER_OSBA_AMBI || st_ivas->renderer_type == RENDERER_OSBA_LS )

            {

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                int16_t nchan_internal;

                nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#endif

                nchan_out_buff = max( nchan_out_buff + st_ivas->nchan_ism, audioCfg2channels( output_config ) ); /* needed for ivas_sba_upmixer_renderer() */

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                nchan_out_buff = max( nchan_out_buff, nchan_internal + st_ivas->nchan_ism );

#endif

            }

            else

            {