Commit 32e4b355 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2495-osba-magnitude-mismatch-4x-gain-in-binaural-room-reverb-with-trajectory' into 'main'

[rend-non-BE] Resolve: "OSBA Magnitude Mismatch (4x Gain) in Binaural Room Reverb with Trajectory"

See merge request !2913
parents 456733ef a0909f81

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */

#define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */



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

lib_rend/lib_rend_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -8672,6 +8672,9 @@ static ivas_error renderSbaToBinaural( 


        IF( hCrend->hReverb != NULL )

        {

#ifdef FIX_2495_Q_ALIGN_OSBA_RENDERER

            scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), -Q2 ); // Align Q of outAudio.data_fx with Q of output_buffer_fx: *pCrend->p_io_qfactor = *outAudio.pq_fact - Q2

#endif

            *outAudio.pq_fact = sub( *outAudio.pq_fact, Q2 );

            move16();

        }