Commit 0ad0bbc7 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1845-decoder-crashing-with-rateswitch-and-omasa-ext' into 'main' 

Resolve "Decoder crashing with rateswitch and OMASA EXT"

Closes #1845

See merge request !1964
parents 97a22a9d e3ea83fa

lib_rend/ivas_output_init_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -386,6 +386,13 @@ Word16 ivas_get_nchan_buffers_dec_fx( 
            nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );

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

        }

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

        test();

        IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) )

        {

            nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS );

        }

#endif

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

    {