Commit 58977a20 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISSUE_1744_IVAS_DIRAC_GET_MONO_FLAG

parent 405a9899

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 






#define FIX_ISSUE_1744_IVAS_DIRAC_GET_MONO_FLAG /* FhG: NON-BE!!! Simplify threshold - comparison, change (wrong) Equal-comparion to (correct) Greater-Than-comparison */

#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */



#define FIX_1762_COMPILER_ISSUE                 /* FhG: fix compiler issues with W_mac_32_32() + ONE_IN_Q30 */

lib_enc/ivas_dirac_enc_fx.c

+0 −13
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static Word16 ivas_dirac_get_mono_flag_fx( 
                    move32();

                    move16();

                }

#ifdef FIX_ISSUE_1744_IVAS_DIRAC_GET_MONO_FLAG

                IF( BASOP_Util_Cmp_Mant32Exp( W_band_power, W_band_power_e, Mpy_32_32( other_ch_band_power, threshold ), other_ch_band_power_e + threshold_e ) == 1 )

                {

                    any_mono_band = 1;
@@ -671,18 +670,6 @@ static Word16 ivas_dirac_get_mono_flag_fx( 
                    any_mc_band = 1;

                    move16();

                }

#else

                IF( BASOP_Util_Cmp_Mant32Exp( divide3232( W_band_power, other_ch_band_power ), 31, threshold, threshold_e ) == 0 )

                {

                    any_mono_band = 1;

                    move16();

                }

                ELSE

                {

                    any_mc_band = 1;

                    move16();

                }

#endif

            }

        }

    }