Commit 74015f9f authored by vaillancour's avatar vaillancour
Browse files

Merge branch 'main' into 1766-spike-caused-by-basop-encoder-in-omasa-ltv-input

parents a5fbac40 0ad0bbc7
Loading
Loading
Loading
Loading
Loading
+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 ) )
    {