Commit 9e2b26b2 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO

parent 76a16c45

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ 
#endif



//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */



#define NONBE_FIX_978_MC_TDREND_REVERB                  /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

lib_dec/ivas_jbm_dec_fx.c

+0 −19
Original line number Diff line number Diff line
@@ -175,25 +175,6 @@ ivas_error ivas_jbm_dec_tc_fx( 
        {

            hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );

        }

#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO



        test();

        IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )

        {

            s = Q16 - Q11;

            move16();

            s = sub( s, find_guarded_bits_fx( st_ivas->nchan_transport ) );

            FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )

            {

                Scale_sig32( p_output_fx[i], output_frame, s ); // Q(11+s)

            }

            ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );

            FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )

            {

                Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11

            }

        }

#endif

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {