Commit de2dc0db authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'float-1569-various-error-checks-wrong-in-ivas_rend-for-render_config-use' into 'main' 

Resolve "Various error checks wrong in IVAS_rend for render_config use"

See merge request !2580
parents 34909606 702f86fa

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,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

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

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



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

lib_rend/lib_rend.c

+14 −0
Original line number Diff line number Diff line
@@ -4093,13 +4093,27 @@ ivas_error IVAS_REND_AddInput( 
    setMaxGlobalDelayNs( hIvasRend );



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

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#else

    if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )

#endif

    {

#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS

        if ( ( 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;