Commit 46e593d6 authored by vaclav's avatar vaclav
Browse files

issue 1222: Reduction of the number of channel buffers in OMASA decoder;... 

issue 1222: Reduction of the number of channel buffers in OMASA decoder; FIX_1222_OMASA_DEC_CHANNEL_BUFFERS
parent 53031fc5

lib_com/options.h

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




#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

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





/* #################### End BE switches ################################## */

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1483,7 +1483,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -321,7 +321,11 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -344,7 +344,11 @@ int16_t ivas_get_nchan_buffers_dec( 
        }

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

        {

#ifdef FIX_1222_OMASA_DEC_CHANNEL_BUFFERS

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

#else

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

#endif

        }

        else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

        {