Commit 829cbe21 authored by malenov's avatar malenov
Browse files

cleanup NONBE_1319_M2R_PRECISION_ALIGN

parent 32d5a4d7

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1143,9 +1143,7 @@ enum 
#define MASA2TOTAL_PREC_INV_THRESHOLD           1e7

#define BITS_MASA2TOTTAL_DCT0                   6

#define STEP_M2T                                0.1f

#ifdef NONBE_1319_M2R_PRECISION_ALIGN 

#define STEP_M2T_FX                             214748365 // Q31

#endif

#define MASA_HEADER_BITS                        2

#define MASA_SUBFRAME_BITS                      1

#define MASA_LOWBITRATE_MODE_BITS               1

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ int16_t get_igf_startline( 
float rand_triangular_signed(

    int16_t *seed );



#ifdef NONBE_1319_M2R_PRECISION_ALIGN

Word16 matrix_product_fx(

    const Word32 *X_fx,   /* i  : left hand matrix                                                                       Qx*/

    const Word16 rowsX,   /* i  : number of rows of the left hand matrix                                                 Q0*/
@@ -781,7 +780,6 @@ Word16 matrix_product_q30_fx( 
    const Word16 transpY, /* i  : flag indicating the transposition of the right hand matrix prior to the multiplication Q0*/

    Word32 *Z_fx          /* o  : resulting matrix after the matrix multiplication                                       Q30*/

);

#endif



void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,

lib_com/ivas_rom_com.c

+1 −2
Original line number Diff line number Diff line
@@ -2781,7 +2781,6 @@ const int32_t sep_object_brate[][MAX_NUM_OBJECTS] = 
};















/* column wise DCT matrices for 4 5, and 8 dim */













#ifdef NONBE_1319_M2R_PRECISION_ALIGN  















const Word32 dct4_fx[4 * 4] = { // Q31















    1073741824, 1402951040, 1073741824, 581109056,















    1073741824, 581109056, -1073741824, -1402951040,










@@ -2822,7 +2821,7 @@ const Word32 dct12_fx[12 * 12] = { // Q31













    619978560, -335436960, 0, 335436960, -619978560, 810030848, -876602816, 810030848, -619978560, 335436960, 619978560, -869301376, 846752832,















    -810030848, 759350208, -695569984, 619978560, -533649696, 438301408, -335436960, 226989024, -114460880















};













#endif



























const float dct4[4*4] = 















{















    0.5000f,  0.6533f,  0.5000f,  0.2706f,

































lib_com/ivas_rom_com.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -327,12 +327,10 @@ extern const float dct4[];













extern const float dct5[];















extern const float dct8[];















extern const float dct12[];













#ifdef NONBE_1319_M2R_PRECISION_ALIGN















extern const Word32 dct4_fx[];















extern const Word32 dct5_fx[];















extern const Word32 dct8_fx[];















extern const Word32 dct12_fx[];













#endif































/*----------------------------------------------------------------------------------*















 * ISM ROM tables

































lib_com/ivas_tools.c



+1
−4




























Original line number
Diff line number
Diff line








@@ -41,9 +41,8 @@













#include "ivas_prot.h"















#include "wmc_auto.h"















#include "ivas_rom_com.h"













#ifdef NONBE_1319_M2R_PRECISION_ALIGN















#include "basop_settings.h"













#endif





























/*---------------------------------------------------------------















 * sumAbs()















 *










@@ -1255,7 +1254,6 @@ float rand_triangular_signed(













    }















}





























#ifdef NONBE_1319_M2R_PRECISION_ALIGN















Word16 matrix_product_fx(















    const Word32 *X_fx,   /* i  : left hand matrix                                                                       Qx*/















    const Word16 rowsX,   /* i  : number of rows of the left hand matrix                                                 Q0*/










@@ -1493,4 +1491,3 @@ Word16 matrix_product_q30_fx(





























    return EXIT_SUCCESS;















}












#endif