Commit 917d2824 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_441_SBA_PARAMBIN_GAINS

parent 9e5cadb0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ 
#define FIX_439_OTR_PARAMS                              /* Philips: Issue 439: orientation tracking parameter aspects. */





#define FIX_441_SBA_PARAMBIN_GAINS                      /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */



#define MC_PARAMUPMIX_MODE                              /* Dlb: Contribution 39: Multichannel Parametric Upmix */

#define FIX_469_BRSWITCH_PUPMIX                         /* Dlb: Fix issue 469 for Param Upmix bitrate switching */

lib_dec/ivas_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ ivas_error ivas_dec( 
        }

        else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {

#ifdef FIX_441_SBA_PARAMBIN_GAINS

            float gain;



            if ( nchan_remapped == 1 )
@@ -478,9 +477,6 @@ ivas_error ivas_dec( 
            {

                gain = 1.3657f;

            }

#else

            float gain = 0.8414f; /* Todo: Temporary gain for roughly matching the loudness. To be tuned later together with other outputs. */

#endif



            for ( n = 0; n < nchan_remapped; n++ )

            {