Commit f6bbc34d authored by bayers's avatar bayers
Browse files

Merge branch '829-jbm-match-loudness-for-stereo-and-mono-in-paramupmix-mode' into 'main' 

[Non-BE] Resolve "JBM: Match loudness for stereo and mono in ParamUpmix mode"

See merge request !1116
parents 7e4203e7 c8ae7086

lib_dec/ivas_jbm_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -587,6 +587,13 @@ 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 );