Commit 8d653774 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

parent 195afa1f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

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

#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[] */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

lib_dec/ivas_masa_dec.c

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

            if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

            {

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

                tc_nchan_to_allocate = BINAURAL_CHANNELS + st_ivas->nchan_ism;

#else

                tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS + 2;

#endif

            }

            else

            {

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −4
Original line number Diff line number Diff line
@@ -336,11 +336,7 @@ ivas_error ivas_dirac_dec_init_binaural_data( 
        nchan_to_allocate = 2 * BINAURAL_CHANNELS;

        if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

        {

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

            nchan_to_allocate = BINAURAL_CHANNELS + st_ivas->nchan_ism;

#else

            nchan_to_allocate = 2 * BINAURAL_CHANNELS + 2;

#endif

        }



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

lib_rend/ivas_output_init.c

+0 −8
Original line number Diff line number Diff line
@@ -289,12 +289,6 @@ int16_t ivas_get_nchan_buffers_dec( 
        {

            nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe );

        }

#ifndef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

        else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            nchan_out_buff = max( nchan_out_buff, 2 * BINAURAL_CHANNELS + 2 );

        }

#endif

        else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            nchan_out_buff = max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );
@@ -352,12 +346,10 @@ int16_t ivas_get_nchan_buffers_dec( 
        {

            nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe );

        }

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

        else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

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

        }

#endif

        else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

        {

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