Commit ab99f847 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Merge branch '2181-optimize-matrixtransp1mul_fx' into... 

Merge branch '2181-optimize-matrixtransp1mul_fx' into 2182-move-scaling-operations-outside-matrix-mul-operations
parents 009b4924 b916c938

lib_basop/enh64.c

+0 −43
Original line number Diff line number Diff line
@@ -128,49 +128,6 @@ Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 ) 
}





/*__________________________________________________________________________________

 |                                                                                 |

 |   Function Name : W_negate                                                      |

 |                                                                                 |

 |   Purpose :                                                                     |

 |                                                                                 |

 |   Negate the 64 bit variable L64_var1 with saturation; saturate in the case     |

 |   where input is 0x8000 0000 0000 0000.                                         |

 |                                                                                 |

 |   Complexity weight : 1                                                         |

 |                                                                                 |

 |   Inputs :                                                                      |

 |                                                                                 |

 |    L64_var1 64 bit long signed integer (Word64) whose value falls in the range: |

 |             0x8000 0000 0000 0000 <= L64_var1 <= 0x7fff ffff ffff ffff.         |

 |                                                                                 |

 |   Outputs :                                                                     |

 |                                                                                 |

 |    none                                                                         |

 |                                                                                 |

 |   Return Value :                                                                |

 |                                                                                 |

 |    L64_var_out                                                                  |

 |             64 bit long signed integer (Word64) whose value falls in the range: |

 |             0x8000 0000 0000 0000 <= L_var_out <= 0x7fff ffff ffff ffff.        |

 |_________________________________________________________________________________|

*/

Word64 W_negate( Word64 L64_var1 )

{

    Word64 L64_var_out;



    L64_var_out = ( L64_var1 == MIN_64 ) ? MAX_64 : -L64_var1;



#ifdef WMOPS

    multiCounter[currCounter].W_negate++;

#endif



    BASOP_CHECK();



    return ( L64_var_out );

}





/*___________________________________________________________________________

|                                                                           |

|   Function Name : W_shl                                                   |

lib_basop/enh64.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#ifdef ENH_64_BIT_OPERATOR

Word64 W_add_nosat( Word64 L64_var1, Word64 L64_var2 );

Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 );

Word64 W_negate( Word64 L64_var1 );

Word64 W_shl( Word64 L64_var1, Word16 var2 );

Word64 W_shr( Word64 L64_var1, Word16 var2 );

Word64 W_shl_nosat( Word64 L64_var1, Word16 var2 );

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/

#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV               /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_debug/wmc_auto.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static BASIC_OP op_weight = { 
#ifdef ENH_64_BIT_OPERATOR

    /* Weights of new 64 bit basops */

    ,

    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1

    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1

#endif /* #ifdef ENH_64_BIT_OPERATOR */



#ifdef ENH_32_BIT_OPERATOR

lib_debug/wmc_auto.h

+0 −1
Original line number Diff line number Diff line
@@ -879,7 +879,6 @@ typedef struct 
    unsigned int move64;        /* Complexity Weight of 1 */

    unsigned int W_add_nosat;   /* Complexity Weight of 1 */

    unsigned int W_sub_nosat;   /* Complexity Weight of 1 */

    unsigned int W_negate;      /* Complexity Weight of 1 */

    unsigned int W_shl;         /* Complexity Weight of 1 */

    unsigned int W_shr;         /* Complexity Weight of 1 */

    unsigned int W_shl_nosat;   /* Complexity Weight of 1 */