Commit 16decae4 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Encoder ASAN and MSAN fixes testing

parent 9636c06d

lib_com/ivas_rom_com_fx.c

+68 −38
Original line number Diff line number Diff line
@@ -1634,46 +1634,76 @@ const Word32 shoebox_sin_cos_tbl_fx[11][2] = { { 0, 1073741824 }, // 0 
                                               { 759250112, -759250112 },

                                               { -759250112, -759250112 } }; // 135, -135   //Q.30



const Word32 delta_phi_val[90] = {

    0, 1509949440, 754974720, 503316480, 377487360, 301989888,

    251658240, 215707056, 188743680, 167772160, 150994944,

    137268128, 125829120, 116149960, 107853528, 100663296,

    94371840, 88820552, 83886080, 79471024, 75497472,

    71902352, 68634064, 65649976, 62914560, 60397976,

    58074980, 55924052, 53926764, 52067224, 50331648,

    48708048, 47185920, 45756044, 44410276, 43141412,

    41943040, 40809444, 39735512, 38716652, 37748736,

    36828036, 35951176, 35115104, 34317032, 33554432,

    32824988, 32126584, 31457280, 30815294, 30198988,

    29606852, 29037490, 28489612, 27962026, 27453626,

    26963382, 26490342, 26033612, 25592364, 25165824,

    24753270, 24354024, 23967452, 23592960, 23229992,

    22878022, 22536558, 22205138, 21883326, 21570706,

    21266894, 20971520, 20684238, 20404722, 20132660,

    19867756, 19609732, 19358326, 19113284, 18874368,

    18641352, 18414018, 18192162, 17975588, 17764112,

    17557552, 17355740, 17158516, 16965724

const Word32 delta_phi_val[257] = {

    0,

    1509949440, 754974720, 503316480, 377487360, 301989888, 251658240, 215707056, 188743680,

    167772160, 150994944, 137268128, 125829120, 116149960, 107853528, 100663296, 94371840,

    88820552, 83886080, 79471024, 75497472, 71902352, 68634064, 65649976, 62914560,

    60397976, 58074980, 55924052, 53926764, 52067224, 50331648, 48708048, 47185920,

    45756044, 44410276, 43141412, 41943040, 40809444, 39735512, 38716652, 37748736,

    36828036, 35951176, 35115104, 34317032, 33554432, 32824988, 32126584, 31457280,

    30815294, 30198988, 29606852, 29037490, 28489612, 27962026, 27453626, 26963382,

    26490342, 26033612, 25592364, 25165824, 24753270, 24354024, 23967452, 23592960,

    23229992, 22878022, 22536558, 22205138, 21883326, 21570706, 21266894, 20971520,

    20684238, 20404722, 20132660, 19867756, 19609732, 19358326, 19113284, 18874368,

    18641352, 18414018, 18192162, 17975588, 17764112, 17557552, 17355740, 17158516,

    16965724, 16777216, 16592851, 16412494, 16236015, 16063292, 15894205, 15728640,

    15566489, 15407647, 15252015, 15099494, 14949994, 14803426, 14659703, 14518745,

    14380471, 14244806, 14111677, 13981013, 13852747, 13726813, 13603148, 13481691,

    13362384, 13245171, 13129995, 13016806, 12905551, 12796182, 12688651, 12582912,

    12478921, 12376635, 12276012, 12177012, 12079596, 11983726, 11889366, 11796480,

    11705034, 11614996, 11526332, 11439011, 11353003, 11268279, 11184811, 11102569,

    11021529, 10941663, 10862946, 10785353, 10708861, 10633447, 10559087, 10485760,

    10413444, 10342119, 10271765, 10202361, 10133889, 10066330, 9999665, 9933878,

    9868951, 9804866, 9741609, 9679163, 9617512, 9556642, 9496537, 9437184,

    9378568, 9320676, 9263493, 9207009, 9151209, 9096081, 9041613, 8987794,

    8934612, 8882056, 8830114, 8778776, 8728031, 8677870, 8628283, 8579258,

    8530788, 8482862, 8435472, 8388608, 8342262, 8296425, 8251090, 8206247,

    8161889, 8118007, 8074596, 8031646, 7989150, 7947102, 7905494, 7864320,

    7823572, 7783244, 7743330, 7703823, 7664718, 7626007, 7587685, 7549747,

    7512186, 7474997, 7438174, 7401713, 7365607, 7329851, 7294441, 7259372,

    7224638, 7190235, 7156158, 7122403, 7088964, 7055838, 7023020, 6990506,

    6958292, 6926373, 6894746, 6863406, 6832350, 6801574, 6771073, 6740845,

    6710886, 6681192, 6651759, 6622585, 6593665, 6564997, 6536577, 6508403,

    6480469, 6452775, 6425317, 6398091, 6371094, 6344325, 6317780, 6291456,

    6265350, 6239460, 6213783, 6188317, 6163059, 6138006, 6113155, 6088506,

    6064054, 6039798, 6015735, 5991863, 5968179, 5944683, 5921370, 5898240

};



const Word32 inv_delta_phi_val[90] = {

    0, 5965232, 11930464, 17895697, 23860929, 29826161,

    35791394, 41756626, 47721858, 53687091, 59652323,

    65617555, 71582788, 77548020, 83513252, 89478485,

    95443717, 101408950, 107374182, 113339414, 119304647,

    125269879, 131235111, 137200344, 143165576, 149130808,

    155096041, 161061273, 167026505, 172991738, 178956970,

    184922203, 190887435, 196852667, 202817900, 208783132,

    214748364, 220713597, 226678829, 232644061, 238609294,

    244574526, 250539758, 256504991, 262470223, 268435456,

    274400688, 280365920, 286331153, 292296385, 298261617,

    304226850, 310192082, 316157314, 322122547, 328087779,

    334053011, 340018244, 345983476, 351948708, 357913941,

    363879173, 369844406, 375809638, 381774870, 387740103,

    393705335, 399670567, 405635800, 411601032, 417566264,

    423531497, 429496729, 435461961, 441427194, 447392426,

    453357659, 459322891, 465288123, 471253356, 477218588,

    483183820, 489149053, 495114285, 501079517, 507044750,

    513009982, 518975214, 524940447, 530905679

const Word32 inv_delta_phi_val[257] = {

    0,

    5965232, 11930465, 17895698, 23860930, 29826162, 35791396, 41756628, 47721860,

    53687092, 59652324, 65617556, 71582792, 77548024, 83513256, 89478488, 95443720,

    101408952, 107374184, 113339416, 119304648, 125269880, 131235112, 137200352, 143165584,

    149130816, 155096048, 161061280, 167026512, 172991744, 178956976, 184922208, 190887440,

    196852672, 202817904, 208783136, 214748368, 220713600, 226678832, 232644064, 238609296,

    244574528, 250539760, 256504992, 262470224, 268435456, 274400704, 280365920, 286331168,

    292296384, 298261632, 304226848, 310192096, 316157312, 322122560, 328087776, 334053024,

    340018240, 345983488, 351948704, 357913952, 363879168, 369844416, 375809632, 381774880,

    387740096, 393705344, 399670560, 405635808, 411601024, 417566272, 423531488, 429496736,

    435461952, 441427200, 447392416, 453357664, 459322880, 465288128, 471253344, 477218592,

    483183808, 489149056, 495114272, 501079520, 507044736, 513009984, 518975200, 524940448,

    530905664, 536870912, 542836160, 548801408, 554766592, 560731840, 566697088, 572662336,

    578627520, 584592768, 590558016, 596523264, 602488448, 608453696, 614418944, 620384192,

    626349376, 632314624, 638279872, 644245120, 650210304, 656175552, 662140800, 668106048,

    674071232, 680036480, 686001728, 691966976, 697932160, 703897408, 709862656, 715827904,

    721793088, 727758336, 733723584, 739688832, 745654016, 751619264, 757584512, 763549760,

    769514944, 775480192, 781445440, 787410688, 793375872, 799341120, 805306368, 811271616,

    817236864, 823202048, 829167296, 835132544, 841097792, 847062976, 853028224, 858993472,

    864958720, 870923904, 876889152, 882854400, 888819648, 894784832, 900750080, 906715328,

    912680576, 918645760, 924611008, 930576256, 936541504, 942506688, 948471936, 954437184,

    960402432, 966367616, 972332864, 978298112, 984263360, 990228544, 996193792, 1002159040,

    1008124288, 1014089472, 1020054720, 1026019968, 1031985216, 1037950400, 1043915648, 1049880896,

    1055846144, 1061811328, 1067776576, 1073741824, 1079707008, 1085672320, 1091637504, 1097602816,

    1103568000, 1109533184, 1115498496, 1121463680, 1127428864, 1133394176, 1139359360, 1145324672,

    1151289856, 1157255040, 1163220352, 1169185536, 1175150720, 1181116032, 1187081216, 1193046528,

    1199011712, 1204976896, 1210942208, 1216907392, 1222872576, 1228837888, 1234803072, 1240768384,

    1246733568, 1252698752, 1258664064, 1264629248, 1270594432, 1276559744, 1282524928, 1288490240,

    1294455424, 1300420608, 1306385920, 1312351104, 1318316288, 1324281600, 1330246784, 1336212096,

    1342177280, 1348142464, 1354107776, 1360072960, 1366038272, 1372003456, 1377968640, 1383933952,

    1389899136, 1395864320, 1401829632, 1407794816, 1413760128, 1419725312, 1425690496, 1431655808,

    1437620992, 1443586176, 1449551488, 1455516672, 1461481984, 1467447168, 1473412352, 1479377664,

    1485342848, 1491308032, 1497273344, 1503238528, 1509203840, 1515169024, 1521134208, 1527099520

};



const Word32 dd_val[90] = {

lib_com/ivas_rom_com_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ extern const Word16 ls_elevation_CICP19_idx[11]; 


extern const Word32 shoebox_sin_cos_tbl_fx[11][2];



extern const Word32 delta_phi_val[90];

extern const Word32 inv_delta_phi_val[90];

extern const Word32 delta_phi_val[257];

extern const Word32 inv_delta_phi_val[257];

extern const Word32 dd_val[90];

extern const Word32 cb_azi_chan_fx[];   // Q22

extern const Word16 cb_azi_chan_16fx[]; // Q0

lib_dec/tonalMDCTconcealment_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1283,7 +1283,7 @@ void TonalMDCTConceal_Detect_ivas_fx( 
                nSamples = hTonalMDCTConc->nNonZeroSamples;

                move16();



                s = getScaleFactor32( secondLastMDST, nSamples );

                s = sub( getScaleFactor32( secondLastMDST, nSamples ), 1 );



                FOR( i = 0; i < nSamples; i++ )

                {
@@ -1292,7 +1292,7 @@ void TonalMDCTConceal_Detect_ivas_fx( 
                }

                secondLastMDST_exp = sub( secondLastMDST_exp, s );

                move16();

                s = getScaleFactor32( secondLastMDCT, nSamples );

                s = sub( getScaleFactor32( secondLastMDCT, nSamples ), 1 );



                FOR( i = 0; i < nSamples; i++ )

                {

lib_enc/cod_ace_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -98,7 +98,12 @@ Word16 coder_acelp_fx( /* o : SEGSNR for CL decision * 




    /* Configure ACELP */



#ifndef MSAN_FIX

    hLPDmem->nbits = BITS_ALLOC_config_acelp( target_bits, st->coder_type, acelp_cfg, st->narrowBand, st->nb_subfr );

#else

    BITS_ALLOC_config_acelp( target_bits, st->coder_type, acelp_cfg, st->narrowBand, st->nb_subfr );

#endif



    /* Init Framing parameters */

    move16();

lib_enc/cod_tcx_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4394,7 +4394,9 @@ void coder_tcx_fx( 
    Word16 winMDST[N_MAX + L_MDCT_OVLP_MAX];

    Word16 *pWinMDST;

    Word16 left_overlap_mode, right_overlap_mode;

#ifndef MSAN_FIX

    LPD_state_HANDLE hLPDmem = st->hLPDmem;

#endif

    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;



    left_overlap = right_overlap = -1;
@@ -4560,7 +4562,9 @@ void coder_tcx_fx( 
                         st,

                         hm_cfg );



#ifndef MSAN_FIX

    hLPDmem->nbits = add( hLPDmem->nbits, add( tnsBits, ltpBits ) );

#endif

}