Commit 8c7cd949 authored by vaclav's avatar vaclav
Browse files

Merge branch '1222-revision-of-the-number-of-channel-buffers-in-omasa' into 'main' 

Resolve "Revision of the number of channel buffers in OMASA"

See merge request !1860
parents f2113d99 b0f6eeec

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1226_FASTCONV_HRTF_LOADING_OPTIM            /* VA: issue 1226: for FastConv binaural renderer in decoder, load only HTRT coefficient set that is needed */

#define FIX_1227_Crend_HRTF_LOADING_OPTIM               /* VA: issue 1227: for Crend binaural renderer in decoder, load only HTRT coefficient set that is needed */

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

        {