Commit a46a0073 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 2430-simplify-ivas_core_enc_fx

parents f763e2f0 a599c3b5

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 
#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */

#define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */

#define FIX_BASOP_2516_REND_CUSTOM_LAYOUT_PORT_BUG      /* Nokia: BASOP issue 2516: Fix porting bug in setting planar state for custom layout in renderer */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_masa_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -2258,8 +2258,13 @@ void ivas_spar_param_to_masa_param_mapping_fx( 
                    move64();

                    move64();

                }

#ifdef FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG

                transportSignalCrossCorrelation_64[bin] = W_add( transportSignalCrossCorrelation_64[bin], W_mult0_32_32( L_shr_sat( inRe_fx[0][slot][bin], sub( q_cldfb[0][slot], common_q ) ), L_shr_sat( inRe_fx[1][slot][bin], sub( q_cldfb[1][slot], common_q ) ) ) ); // Q(2 * common_q)

                transportSignalCrossCorrelation_64[bin] = W_add( transportSignalCrossCorrelation_64[bin], W_mult0_32_32( L_shr_sat( inIm_fx[0][slot][bin], sub( q_cldfb[0][slot], common_q ) ), L_shr_sat( inIm_fx[1][slot][bin], sub( q_cldfb[1][slot], common_q ) ) ) ); // Q(2 * common_q)

#else

                transportSignalCrossCorrelation_64[bin] = W_add( transportSignalCrossCorrelation_64[bin], W_mult0_32_32( L_shr_sat( inRe_fx[0][slot][bin], sub( q_cldfb[0][slot], common_q ) ), L_shr_sat( inRe_fx[1][slot][bin], sub( q_cldfb[0][slot], common_q ) ) ) ); // Q(2 * common_q)

                transportSignalCrossCorrelation_64[bin] = W_add( transportSignalCrossCorrelation_64[bin], W_mult0_32_32( L_shr_sat( inIm_fx[0][slot][bin], sub( q_cldfb[0][slot], common_q ) ), L_shr_sat( inIm_fx[1][slot][bin], sub( q_cldfb[0][slot], common_q ) ) ) ); // Q(2 * common_q)

#endif

                move64();

                move64();

            }

lib_rend/lib_rend_fx.c

+20 −0
Original line number Diff line number Diff line
@@ -4799,13 +4799,29 @@ ivas_error IVAS_REND_AddInput_fx( 
    setMaxGlobalDelayNs( hIvasRend );



    /* select default reverb size after adding an input */

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

    test();

    IF( EQ_32( hIvasRend->outputConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && EQ_32( hIvasRend->selectedRoomReverbSize, DEFAULT_REVERB_UNSET ) )

#else

    IF( EQ_32( hIvasRend->selectedRoomReverbSize, DEFAULT_REVERB_UNSET ) )

#endif

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        IF( NE_32( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,

                                                                                         hIvasRend->inputsMasa,

                                                                                         hIvasRend->inputsMc,

                                                                                         hIvasRend->inputsSba ) ),

                   IVAS_ERR_OK ) )

        {

            return error;

        }

#else

        IVAS_REND_SetReverbRoomSize( hIvasRend,

                                     getDefaultReverbSize( hIvasRend->inputsIsm,

                                                           hIvasRend->inputsMasa,

                                                           hIvasRend->inputsMc,

                                                           hIvasRend->inputsSba ) );

#endif

    }



    return IVAS_ERR_OK;
@@ -6084,7 +6100,11 @@ ivas_error IVAS_REND_SetReverbRoomSize( 


    IF( hIvasRend->hRendererConfig != NULL )

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        IF( NE_32( error = ivas_render_config_change_defaults( hIvasRend->hRendererConfig, hIvasRend->selectedRoomReverbSize ), IVAS_ERR_OK ) )

#else

        IF( EQ_32( error = ivas_render_config_change_defaults( hIvasRend->hRendererConfig, hIvasRend->selectedRoomReverbSize ), IVAS_ERR_OK ) )

#endif

        {

            return error;

        }