Commit 4331f844 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent 9d9ed4dc

lib_com/ivas_cnst.h

+8 −1
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ enum 
#endif

#define BITS_MASA2TOTTAL_DCT0                   6

#define STEP_M2T                                0.1f

#define STEP_M2T_FX                             214748364

#define STEP_M2T_FX                             214748365

#define MASA_HEADER_BITS                        2

#define MASA_SUBFRAME_BITS                      1

#define MASA_LOWBITRATE_MODE_BITS               1
@@ -1648,6 +1648,13 @@ typedef enum 
#define LFE_PLC_LENANA                          LFE_PLC_BUFLEN

#define LFE_PLC_FDEL                            300



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

 * HO Dirac Constants

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

#define HODIRAC_BETA                            (214748368)                 /* 0.2f in Q30 */

#define HODIRAC_FAC1                            (951579008)                 /* 1.772454f in Q29 */

#define HODIRAC_FAC2                            (549393984)                 /* 1.023326f in Q29 */

#define HODIRAC_FAC3                            (317192992)                 /* 0.590818f in Q29 */



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

 * Amplitude Panning (EFAP, VBAP) constants

lib_com/ivas_dirac_com.c

+371 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot.h

+26 −6
Original line number Diff line number Diff line
@@ -2538,8 +2538,8 @@ void stereo_tca_dec( 


void stereo_tca_dec_fx(

  CPE_DEC_HANDLE hCPE,                                        /* i/o: CPE decoder structure					 */

  Word32 *synth[CPE_CHANNELS],                                 /* i/o: output synth                    */

  const Word16 output_frame                                  /* i  : length of a frame per channel   */

  Word32 *synth[CPE_CHANNELS],                                 /* i/o: output synth                    qsynth*/

  const Word16 output_frame                                  /* i  : length of a frame per channel		   Q0*/

);



void stereo_tca_scale_R_channel(
@@ -2550,8 +2550,8 @@ void stereo_tca_scale_R_channel( 


void stereo_tca_scale_R_channel_fx(

    CPE_DEC_HANDLE hCPE,      /* i/o: CPE decoder structure				 */

  Word32 *output_fx,         /* i/o: output synthesis, R channel */

  const Word16 output_frame /* i  : frame length                */

    Word32 *output_fx,        /* i/o: output synthesis, R channel	q_out*/

    const Word16 output_frame /* i  : frame length					   Q0*/

);



void adjustTargetSignal(
@@ -5141,6 +5141,26 @@ void ivas_dirac_dec_get_response_fx( 
    Word16 Q_out);

#endif





#ifdef IVAS_FLOAT_FIXED

void calculate_hodirac_sector_parameters_fx(

  DIRAC_ENC_HANDLE hDirAC,                                          /* i  : DirAC handle                                  */

  Word32 RealBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : signal vector (L+1)^2 x N_bins, real part     */

  Word32 ImagBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : signal vector, imaginary part                 */

  Word16 Qfac,                                                      /* i  : Q-factor of signal vector                     */

  const Word32 beta_fx,                                             /* i  : forgetting factor for average filtering, Q30  */

  const Word16 *band_grouping,                                      /* i  : indices of band groups                        */

  const Word16 N_bands,                                             /* i  : number of bands (groups)                      */

  const Word16 enc_param_start_band,                                /* i  : first band to process                         */

  Word32 *azi_fx,                                                   /* o  : array of sector azimuth angles, flat     Q23  */

  Word32 *ele_fx,                                                   /* o  : array of sector elevation angles, flat   Q23  */

  Word32 *diff_fx,                                                  /* o  : array of sector diffuseness values, flat      */

  Word16 *diff_exp,                                                 /* o  : array of sector diffuseness exponents, flat   */

  Word32 *ene_fx,                                                   /* o  : array of sector energy values, flat           */

  Word16 *ene_exp                                                   /* o  : array of sector energy exponents, flat        */

);

#endif



void calculate_hodirac_sector_parameters(

    DIRAC_ENC_HANDLE hDirAC,

    float RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX],/* i : signal vector (L+1)^2 x N_bins, real part       */

lib_com/ivas_prot_fx.h

+6 −0
Original line number Diff line number Diff line
@@ -3461,4 +3461,10 @@ void stereo_dmx_evs_close_encoder_fx( 
    STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle   */

);



void ivas_omasa_encode_masa_to_total_fx(

    Word32 masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* Q30 */

    BSTR_ENC_HANDLE hMetaData,

    const Word16 low_bitrate_mode,

    const Word16 nbands,

    const Word16 nblocks );

#endif

lib_com/ivas_rom_com.c

+3 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,9 @@ const int16_t DirAC_block_grouping_5ms_MDFT[MAX_PARAM_SPATIAL_SUBFRAMES + 1] = 
    0,    1,    2,    3,    4

};













#ifdef IVAS_FLOAT_FIXED













const Word32 c_weights_fx[DIRAC_NO_FB_BANDS_MAX] /* Q30 */ = { 106970960, 1033798336, 1065867776, 1071704704, 1073381888, 1073741824, 1073494016, 1072883072, 1072012032, 1070930560, 1069665600, 1068232640, 1066641792, 1064899968, 1063012224, 1060982464, 1058814144, 1056510016, 1054072832, 1051505280, 1048809664, 1045988480, 1043044160, 1039979072, 1036795776, 1033496576, 1030084096, 1026560960, 1022929600, 1019192512, 1015352576, 1011412416, 1007374720, 1003242112, 999017472, 994703488, 990302976, 985818688, 981253568, 976610304, 971891712, 967100672, 962240064, 957312576, 952321088, 947268224, 942156992, 936990080, 931770048, 926499840, 921182016, 915819200, 910414208, 904969344, 899487488, 893970944, 888422272, 882843840, 877238144, 871607552, 865954432, 860280896, 854589184, 848881728, 843160384, 837427328, 831684672, 825934208, 820178240, 814418240, 808656320, 802894208, 797133568, 791376192, 785623744, 779877568, 774139520, 768410880, 762693184, 756987904, 751296064, 745619328, 739958784, 734315584, 728691008, 723086208, 717502016, 711939712, 706400064, 700884096, 695392768, 689926912, 684487232, 679074688, 673689856, 668333504, 663006464, 657709056, 652442176, 647206144, 642001600, 636828992, 631688896, 626581696, 621507776, 616467520, 611461184, 606489344, 601552064, 596649792, 591782528, 586950784, 582154560, 577394112, 572669696, 567981312, 563329088, 558713152, 554133568, 549590464, 545083840, 540613760, 536180160, 531783104, 527422528, 523098464, 518810784, 514559520, 510344672, 506165856, 502023360, 497916832, 493846304, 489811488, 485812448, 481848832, 477920672, 474027808, 470169952, 466347008, 462558848, 458805152, 455085920, 451400736, 447749600, 444132160, 440548320, 436997792, 433480416, 429995904, 426544032, 423124608, 419737376, 416382144, 413058720, 409766720, 406505984, 403276288, 400077280, 396908768, 393770656, 390662496, 387584064, 384535200, 381515616, 378525024, 375563200, 372629952, 369724864, 366847872, 363998592, 361176672, 358382176, 355614592, 352873760, 350159456, 347471328, 344809216, 342172864, 339562048, 336976384, 334415808, 331879840, 329368576, 326881472, 324418432, 321979104, 319563392, 317170976, 314801664, 312455232, 310131328, 307829856, 305550528, 303293088, 301057440, 298843168, 296650176, 294478304, 292327168, 290196672, 288086432, 285996512, 283926432, 281876224, 279845472, 277834016, 275841792, 273868480, 271913856, 269977792, 268059968, 266160304, 264278672, 262414768, 260568368, 258739360, 256927520, 255132768, 253354752, 251593392, 249848448, 248119936, 246407424, 244710816, 243030080, 241364928, 239715120, 238080672, 236461248, 234856752, 233267088, 231692016, 230131440, 228585136, 227053024, 225534848, 224030544, 222539872, 221062832 };













#endif















const float c_weights[DIRAC_NO_FB_BANDS_MAX] = { 9.962447e-02f, 9.627997e-01f, 9.926667e-01f, 9.981028e-01f, 9.996648e-01f, 1.000000e+00f, 9.997692e-01f, 9.992002e-01f, 9.983890e-01f, 9.973818e-01f, 9.962037e-01f, 9.948692e-01f, 9.933876e-01f, 9.917654e-01f, 9.900073e-01f, 9.881169e-01f, 9.860975e-01f, 9.839516e-01f, 9.816818e-01f, 9.792906e-01f, 9.767801e-01f, 9.741527e-01f, 9.714106e-01f, 9.685560e-01f, 9.655913e-01f, 9.625187e-01f, 9.593406e-01f, 9.560594e-01f, 9.526774e-01f, 9.491970e-01f, 9.456208e-01f, 9.419512e-01f, 9.381908e-01f, 9.343420e-01f, 9.304075e-01f, 9.263898e-01f, 9.222915e-01f, 9.181152e-01f, 9.138636e-01f, 9.095392e-01f, 9.051447e-01f, 9.006827e-01f, 8.961559e-01f, 8.915668e-01f, 8.869181e-01f, 8.822123e-01f, 8.774521e-01f, 8.726400e-01f, 8.677785e-01f, 8.628702e-01f, 8.579176e-01f, 8.529231e-01f, 8.478893e-01f, 8.428184e-01f, 8.377130e-01f, 8.325753e-01f, 8.274077e-01f, 8.222124e-01f, 8.169917e-01f, 8.117478e-01f, 8.064829e-01f, 8.011990e-01f, 7.958982e-01f, 7.905827e-01f, 7.852543e-01f, 7.799150e-01f, 7.745667e-01f, 7.692112e-01f, 7.638505e-01f, 7.584861e-01f, 7.531199e-01f, 7.477535e-01f, 7.423885e-01f, 7.370265e-01f, 7.316691e-01f, 7.263176e-01f, 7.209736e-01f, 7.156384e-01f, 7.103134e-01f, 7.049999e-01f, 6.996990e-01f, 6.944121e-01f, 6.891403e-01f, 6.838847e-01f, 6.786464e-01f, 6.734265e-01f, 6.682258e-01f, 6.630455e-01f, 6.578863e-01f, 6.527492e-01f, 6.476350e-01f, 6.425445e-01f, 6.374784e-01f, 6.324376e-01f, 6.274226e-01f, 6.224341e-01f, 6.174729e-01f, 6.125393e-01f, 6.076341e-01f, 6.027577e-01f, 5.979106e-01f, 5.930932e-01f, 5.883061e-01f, 5.835497e-01f, 5.788242e-01f, 5.741301e-01f, 5.694676e-01f, 5.648372e-01f, 5.602390e-01f, 5.556734e-01f, 5.511404e-01f, 5.466405e-01f, 5.421737e-01f, 5.377402e-01f, 5.333402e-01f, 5.289738e-01f, 5.246411e-01f, 5.203422e-01f, 5.160771e-01f, 5.118460e-01f, 5.076489e-01f, 5.034858e-01f, 4.993567e-01f, 4.952616e-01f, 4.912005e-01f, 4.871734e-01f, 4.831802e-01f, 4.792209e-01f, 4.752955e-01f, 4.714037e-01f, 4.675457e-01f, 4.637212e-01f, 4.599302e-01f, 4.561725e-01f, 4.524481e-01f, 4.487567e-01f, 4.450983e-01f, 4.414728e-01f, 4.378799e-01f, 4.343195e-01f, 4.307915e-01f, 4.272956e-01f, 4.238318e-01f, 4.203997e-01f, 4.169993e-01f, 4.136303e-01f, 4.102926e-01f, 4.069859e-01f, 4.037101e-01f, 4.004649e-01f, 3.972501e-01f, 3.940655e-01f, 3.909109e-01f, 3.877861e-01f, 3.846909e-01f, 3.816250e-01f, 3.785882e-01f, 3.755803e-01f, 3.726010e-01f, 3.696501e-01f, 3.667275e-01f, 3.638328e-01f, 3.609658e-01f, 3.581263e-01f, 3.553141e-01f, 3.525289e-01f, 3.497705e-01f, 3.470387e-01f, 3.443331e-01f, 3.416537e-01f, 3.390001e-01f, 3.363720e-01f, 3.337694e-01f, 3.311919e-01f, 3.286393e-01f, 3.261114e-01f, 3.236079e-01f, 3.211286e-01f, 3.186733e-01f, 3.162418e-01f, 3.138337e-01f, 3.114490e-01f, 3.090872e-01f, 3.067484e-01f, 3.044321e-01f, 3.021382e-01f, 2.998664e-01f, 2.976166e-01f, 2.953885e-01f, 2.931819e-01f, 2.909966e-01f, 2.888323e-01f, 2.866889e-01f, 2.845661e-01f, 2.824637e-01f, 2.803816e-01f, 2.783194e-01f, 2.762770e-01f, 2.742543e-01f, 2.722509e-01f, 2.702667e-01f, 2.683014e-01f, 2.663550e-01f, 2.644271e-01f, 2.625177e-01f, 2.606264e-01f, 2.587531e-01f, 2.568977e-01f, 2.550599e-01f, 2.532395e-01f, 2.514364e-01f, 2.496503e-01f, 2.478811e-01f, 2.461287e-01f, 2.443928e-01f, 2.426732e-01f, 2.409698e-01f, 2.392824e-01f, 2.376109e-01f, 2.359550e-01f, 2.343146e-01f, 2.326895e-01f, 2.310797e-01f, 2.294848e-01f, 2.279047e-01f, 2.263394e-01f, 2.247886e-01f, 2.232521e-01f, 2.217299e-01f, 2.202217e-01f, 2.187274e-01f, 2.172469e-01f, 2.157800e-01f, 2.143266e-01f, 2.128865e-01f, 2.114596e-01f, 2.100457e-01f, 2.086447e-01f, 2.072564e-01f, 2.058808e-01f };





























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