Commit 89d2a2f7 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_787_PARAM_UPMIX_LEVEL

parent 75afa4fb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */

#define NONBE_FIX_827_JBM_CREND_EARLY_REFLECTIONS             /* FhG: issue #827: Resolve "JBM Crend early reflections are wrong" */

#define NONBE_FIX_833_OSBA_JBM_OBJECT_GAINS                   /* Fhg: issue #833: Resolve "JBM OSBA: the gains for the discrete objects are not computed" */

#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

lib_dec/ivas_jbm_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -590,13 +590,12 @@ ivas_error ivas_jbm_dec_tc( 
            /* Rendering */

            if ( ( st_ivas->renderer_type == RENDERER_MC ) && ( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO ) )

            {

#ifdef NONBE_FIX_787_PARAM_UPMIX_LEVEL

                /* Compensate loudness for not doing full upmix */

                for ( n = 4; n < 8; n++ )

                {

                    v_multc( p_output[n], 2.0f, p_output[n], output_frame );

                }

#endif



                if ( output_config == IVAS_AUDIO_CONFIG_MONO || output_config == IVAS_AUDIO_CONFIG_STEREO )

                {

                    ivas_ls_setup_conversion( st_ivas, audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 ), output_frame, p_output, p_output );

lib_dec/ivas_mc_paramupmix_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -218,13 +218,12 @@ void ivas_mc_paramupmix_dec( 
    if ( ( output_config == IVAS_AUDIO_CONFIG_STEREO ) || ( output_config == IVAS_AUDIO_CONFIG_MONO ) )

    {

        first_empty_channel = 8; /* Don't upmix */

#ifdef NONBE_FIX_787_PARAM_UPMIX_LEVEL



        /* Compensate loudness for not doing full upmix */

        for ( i = 4; i < 8; i++ )

        {

            v_multc( output_f[i], 2.0f, output_f[i], L_FRAME48k );

        }

#endif

    }

    else

    {