Commit 121a35aa authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

parent 90a211c8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

lib_dec/ivas_masa_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1960,11 +1960,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        {

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

            {

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

                tc_nchan_to_allocate = add( BINAURAL_CHANNELS, st_ivas->nchan_ism );

#else

                tc_nchan_to_allocate = add( shl( BINAURAL_CHANNELS, 1 ), 2 );

#endif

            }

            ELSE

            {

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -412,12 +412,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx( 
        move16();

        if ( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )

        {

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

            nchan_to_allocate = add( BINAURAL_CHANNELS, st_ivas->nchan_ism );

#else

            nchan_to_allocate = 2 * BINAURAL_CHANNELS + 2;

            move16();

#endif

        }



        n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

lib_rend/ivas_output_init_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -401,20 +401,16 @@ Word16 ivas_get_nchan_buffers_dec_fx( 
    {

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



#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

        test();

        test();

#endif

        IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )

        {

            nchan_out_buff = s_max( nchan_out_buff, add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe ) );

        }

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

        ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )

        {

            nchan_out_buff = s_max( nchan_out_buff, add( BINAURAL_CHANNELS, st_ivas->nchan_ism ) );

        }

#endif

        ELSE IF( NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {

            nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );