Commit 06b546e0 authored by norvell's avatar norvell
Browse files

Merge branch '1377-renderer-configuration-error-in-ivas_dec-and-ivas_rend' into 'main'

Add missing error code handling from IVAS_REND_SetObjectIDs

See merge request !2243
parents 32c65a1d 32ed6759
Loading
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1229,7 +1229,15 @@ int main(
        masaIds[i] = 0u;
    }

#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

    for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
    {
+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

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

/* #################### End BE switches ################################## */