Commit a8629482 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Move OMASA upscaling to MASA_ISM path instead of ISM path.

parent f48039bf

lib_dec/ivas_jbm_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -194,11 +194,6 @@ ivas_error ivas_jbm_dec_tc( 
            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }



#ifdef NONBE_FIX_1165_STATIC_SCAL_OMASA

        /* Revert scaling done to the downmix in the encoder */

        ivas_omasa_gain_umx( st_ivas, p_output, output_frame );



#endif

        if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

        {

            ivas_mono_downmix_render_passive( st_ivas, p_output, output_frame );
@@ -399,6 +394,11 @@ ivas_error ivas_jbm_dec_tc( 
            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }



#ifdef NONBE_FIX_1165_STATIC_SCAL_OMASA

        /* Revert scaling done to the downmix in the encoder */

        ivas_omasa_gain_umx( st_ivas, p_output, output_frame );



#endif

        if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

        {

            ivas_mono_downmix_render_passive( st_ivas, p_output, output_frame );