Commit 98aad590 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

add piece of code responsible for determining OMASA output channel count missed in !1937

parent 86dffae6

lib_rend/ivas_output_init_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -384,6 +384,12 @@ Word16 ivas_get_nchan_buffers_dec( 
            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

        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 ) )

    {
@@ -543,6 +549,12 @@ Word16 ivas_get_nchan_buffers_dec_ivas_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

        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_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

    {