Commit da53bce0 authored by vaclav's avatar vaclav
Browse files

Merge branch '1870-basop-PortFlpMr1860' into 'main' 

Port MR1860 from float to BASOP

Closes #1870 and #1849

See merge request !2002
parents 8528dc65 96cd8550

lib_com/options.h

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

#define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */

#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_fx.c

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

+4 −0
Original line number Diff line number Diff line
@@ -406,8 +406,12 @@ 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

+10 −0
Original line number Diff line number Diff line
@@ -403,10 +403,20 @@ 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 ) );