Commit 31d543d1 authored by vaclav's avatar vaclav
Browse files

Merge branch '1870-ref-PortFlpMr1860' into 'ivas-float-update' 

Port MR1860 from float to FLP-ref

See merge request !2003
parents 3b23f93e 1fbb7e93

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ 
#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_masa_dec.c

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

+8 −0
Original line number Diff line number Diff line
@@ -289,10 +289,12 @@ 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 ) );
@@ -348,6 +350,12 @@ 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 ) );