Commit 0182b51d authored by norvell's avatar norvell
Browse files

Merge branch '2101_basop_PortMR2241_Renderer_configuration_bug' into 'main' 

2101 basop portmr2243 missing error code handling

See merge request !2377
parents f0eeab6d bf026ecf

apps/renderer.c

+8 −0
Original line number Diff line number Diff line
@@ -1342,7 +1342,15 @@ int main( 
        masaIds[i] = 0u;

    }

#ifdef NONBE_1377_REND_DIRATT_CONF

#ifdef FIX_1377_HANDLE_ERROR_CODE

    if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

#else

    IVAS_REND_SetObjectIDs( hIvasRend );

#endif

#endif



    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

#endif

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_1053_REVERB_RECONFIGURATION