Commit 32c9b48e authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2513-extra-return-error-in-ivas_rend_open' into 'main' 

Resolve "Extra "return error" in IVAS_REND_Open"

Closes #2513

See merge request !2928
parents 799afc0d 513496fd

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ 
#define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */

#define FIX_BASOP_2511_PROTO_REF_POWER_FIX              /* FhG: BASOP 2511; Fix reference power computation in protoSignalComputation_shd_fx() */

#define FIX_BASOP_2512_WRONG_SHIFT_IN_DIRAC_CONFIG      /* Nokia: BASOP 2512: Fix wrong division by shift */

#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */



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

lib_rend/lib_rend_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -4028,9 +4028,11 @@ ivas_error IVAS_REND_Open( 
                return error;

            }

        }

#ifndef FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN

        {

            return error;

        }

#endif

    }



    return IVAS_ERR_OK;