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

Fix some logic comparison BASOPs.

parent 3a87e22a

lib_rend/ivas_dirac_rend_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -2266,7 +2266,8 @@ void protoSignalComputation2_fx( 
                IF( ( EQ_16( stereo_type_detect->type_change_direction, MASA_STEREO_SPACED_MICS ) && EQ_16( stereo_type_detect->current_stereo_type, MASA_STEREO_DOWNMIX ) ) ||

                    ( EQ_16( stereo_type_detect->type_change_direction, MASA_STEREO_DOWNMIX ) && EQ_16( stereo_type_detect->current_stereo_type, MASA_STEREO_SPACED_MICS ) ) )

                {

                    IF( L_or( LT_16( l, sub( dipole_freq_range[1], 1 ) ), GE_16( l, MASA_SUM_PROTO_START_BIN ) ) )

                    test();

                    IF( LT_16( l, sub( dipole_freq_range[1], 1 ) ) || GE_16( l, MASA_SUM_PROTO_START_BIN ) )

                    {

                        Real_aux_fx = Madd_32_16( Mpy_32_16_1( Real_aux_fx, shr( interpolatorSpaced_fx, 1 ) ), Real_aux_fx, interpolatorDmx_fx ); // q_cldfb+min_q_shift

                        Imag_aux_fx = Madd_32_16( Mpy_32_16_1( Imag_aux_fx, shr( interpolatorSpaced_fx, 1 ) ), Imag_aux_fx, interpolatorDmx_fx ); // q_cldfb+min_q_shift
@@ -2314,7 +2315,8 @@ void protoSignalComputation2_fx( 
                ELSE IF( ( EQ_16( stereo_type_detect->type_change_direction, MASA_STEREO_SPACED_MICS ) && EQ_16( stereo_type_detect->current_stereo_type, MASA_DUAL_MONO ) ) ||

                         ( EQ_16( stereo_type_detect->type_change_direction, MASA_DUAL_MONO ) && EQ_16( stereo_type_detect->current_stereo_type, MASA_STEREO_SPACED_MICS ) ) )

                {

                    IF( L_or( LT_16( l, sub( dipole_freq_range[1], 1 ) ), GE_16( l, MASA_SUM_PROTO_START_BIN ) ) )

                    test();

                    IF( LT_16( l, sub( dipole_freq_range[1], 1 ) ) || GE_16( l, MASA_SUM_PROTO_START_BIN ) )

                    {

                        Real_aux_fx = L_shr( Real_aux_fx, 1 );                                                // q_cldfb+min_q_shift

                        Imag_aux_fx = L_shr( Imag_aux_fx, 1 );                                                // q_cldfb+min_q_shift
@@ -2389,7 +2391,8 @@ void protoSignalComputation2_fx( 
            }

            ELSE IF( EQ_16( stereo_type_detect->masa_stereo_type, MASA_STEREO_SPACED_MICS ) )

            {

                IF( L_or( LT_16( l, sub( dipole_freq_range[1], 1 ) ), GE_16( l, MASA_SUM_PROTO_START_BIN ) ) )

                test();

                IF( LT_16( l, sub( dipole_freq_range[1], 1 ) ) || GE_16( l, MASA_SUM_PROTO_START_BIN ) )

                {

                    Real_aux_fx = L_shr( Real_aux_fx, 1 );                                                // q_cldfb+min_q_shift

                    Imag_aux_fx = L_shr( Imag_aux_fx, 1 );                                                // q_cldfb+min_q_shift