Commit b7196ab5 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent d0cbad6f

lib_com/frame_ener.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ void fer_energy_fx( 
}

#endif // IVAS_FLOAT_FIXED



#ifndef IVAS_FLOAT_FIXED

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

 * frame_energy()

 *
@@ -183,6 +184,7 @@ float frame_energy( 


    return enern;

}

#endif





#if 0

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#define _180_OVER_PI                            ( 180.0f / EVS_PI )

#ifdef IVAS_FLOAT_FIXED

#define _180_OVER_PI_Q25                         1922521886

#define PI_OVER_180_Q25                         ( 585635 )

#define _180_IN_Q22 (754974720)

#define _360_IN_Q22 (1509949440)

#define _180_OVER_PI_FX                          (Word32) (( 180.0f / EVS_PI ) *ONE_IN_Q10)

lib_com/ivas_mc_param_com.c

+24 −0
Original line number Diff line number Diff line
@@ -942,6 +942,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->icc_coding.sym_freq_delta = &ivas_param_mc_sym_freq_icc_delta_cicp6_48_16bits[0];

            hMetadataPMC->icc_coding.quantizer = &ivas_param_mc_quant_icc[0];

            hMetadataPMC->icc_coding.quantizer_size = PARAM_MC_SZ_ICC_QUANTIZER;

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->icc_coding.quantizer_fx = &ivas_param_mc_quant_icc_fx[0];

#endif

            hMetadataPMC->icc_coding.uni_bits = PARAM_MC_NUM_BITS_ICC_SCALAR_QUANT;

            /* ILD */

            hMetadataPMC->ild_coding.cum_freq = &ivas_param_mc_cum_freq_ild_cicp6_48_16bits[0];
@@ -949,6 +952,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->ild_coding.cum_freq_delta = &ivas_param_mc_cum_freq_ild_delta_cicp6_48_16bits[0];

            hMetadataPMC->ild_coding.sym_freq_delta = &ivas_param_mc_sym_freq_ild_delta_cicp6_48_16bits[0];

            hMetadataPMC->ild_coding.quantizer = &ivas_param_mc_quant_ild_5d1_48[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->ild_coding.quantizer_fx = &ivas_param_mc_quant_ild_5d1_48_fx[0];

#endif

            hMetadataPMC->ild_coding.quantizer_size = PARAM_MC_SZ_ILD_QUANTIZER_4BITS;

            hMetadataPMC->ild_coding.uni_bits = PARAM_MC_NUM_BITS_ILD_SCALAR_QUANT;

            break;
@@ -959,6 +965,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->icc_coding.cum_freq_delta = &ivas_param_mc_cum_freq_icc_delta_cicp12_48_16bits[0];

            hMetadataPMC->icc_coding.sym_freq_delta = &ivas_param_mc_sym_freq_icc_delta_cicp12_48_16bits[0];

            hMetadataPMC->icc_coding.quantizer = &ivas_param_mc_quant_icc[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->icc_coding.quantizer_fx = &ivas_param_mc_quant_icc_fx[0];

#endif

            hMetadataPMC->icc_coding.quantizer_size = PARAM_MC_SZ_ICC_QUANTIZER;

            hMetadataPMC->icc_coding.uni_bits = PARAM_MC_NUM_BITS_ICC_SCALAR_QUANT;

            /* ILD */
@@ -967,6 +976,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->ild_coding.cum_freq_delta = &ivas_param_mc_cum_freq_ild_delta_cicp12_48_16bits[0];

            hMetadataPMC->ild_coding.sym_freq_delta = &ivas_param_mc_sym_freq_ild_delta_cicp12_48_16bits[0];

            hMetadataPMC->ild_coding.quantizer = &ivas_param_mc_quant_ild_5d1_48[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->ild_coding.quantizer_fx = &ivas_param_mc_quant_ild_5d1_48_fx[0];

#endif

            hMetadataPMC->ild_coding.quantizer_size = PARAM_MC_SZ_ILD_QUANTIZER_4BITS;

            hMetadataPMC->ild_coding.uni_bits = PARAM_MC_NUM_BITS_ILD_SCALAR_QUANT;

            break;
@@ -977,6 +989,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->icc_coding.cum_freq_delta = &ivas_param_mc_cum_freq_icc_delta_cicp14_48_16bits[0];

            hMetadataPMC->icc_coding.sym_freq_delta = &ivas_param_mc_sym_freq_icc_delta_cicp14_48_16bits[0];

            hMetadataPMC->icc_coding.quantizer = &ivas_param_mc_quant_icc[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->icc_coding.quantizer_fx = &ivas_param_mc_quant_icc_fx[0];

#endif

            hMetadataPMC->icc_coding.quantizer_size = PARAM_MC_SZ_ICC_QUANTIZER;

            hMetadataPMC->icc_coding.uni_bits = PARAM_MC_NUM_BITS_ICC_SCALAR_QUANT;

            /* ILD */
@@ -985,6 +1000,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->ild_coding.cum_freq_delta = &ivas_param_mc_cum_freq_ild_delta_cicp14_48_16bits[0];

            hMetadataPMC->ild_coding.sym_freq_delta = &ivas_param_mc_sym_freq_ild_delta_cicp14_48_16bits[0];

            hMetadataPMC->ild_coding.quantizer = &ivas_param_mc_quant_ild_5d1_48[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->ild_coding.quantizer_fx = &ivas_param_mc_quant_ild_5d1_48_fx[0];

#endif

            hMetadataPMC->ild_coding.quantizer_size = PARAM_MC_SZ_ILD_QUANTIZER_4BITS;

            hMetadataPMC->ild_coding.uni_bits = PARAM_MC_NUM_BITS_ILD_SCALAR_QUANT;

            break;
@@ -996,6 +1014,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->icc_coding.cum_freq_delta = &ivas_param_mc_cum_freq_icc_delta_combined_48_16bits[0];

            hMetadataPMC->icc_coding.sym_freq_delta = &ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[0];

            hMetadataPMC->icc_coding.quantizer = &ivas_param_mc_quant_icc[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->icc_coding.quantizer_fx = &ivas_param_mc_quant_icc_fx[0];

#endif

            hMetadataPMC->icc_coding.quantizer_size = PARAM_MC_SZ_ICC_QUANTIZER;

            hMetadataPMC->icc_coding.uni_bits = PARAM_MC_NUM_BITS_ICC_SCALAR_QUANT;

            /* ILD */
@@ -1004,6 +1025,9 @@ static void ivas_param_mc_set_coding_scheme( 
            hMetadataPMC->ild_coding.cum_freq_delta = &ivas_param_mc_cum_freq_ild_delta_combined_48_16bits[0];

            hMetadataPMC->ild_coding.sym_freq_delta = &ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[0];

            hMetadataPMC->ild_coding.quantizer = &ivas_param_mc_quant_ild_5d1_48[0];

#ifdef IVAS_FLOAT_FIXED

            hMetadataPMC->ild_coding.quantizer_fx = &ivas_param_mc_quant_ild_5d1_48_fx[0];

#endif

            hMetadataPMC->ild_coding.quantizer_size = PARAM_MC_SZ_ILD_QUANTIZER_4BITS;

            hMetadataPMC->ild_coding.uni_bits = PARAM_MC_NUM_BITS_ILD_SCALAR_QUANT;

            break;

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -7134,9 +7134,15 @@ void ivas_merge_masa_metadata( 
    OMASA_SPATIAL_META_HANDLE hOMasaMeta                        /* i  : ISM-object metadata to be merged with the MASA metadata                      */

);



#ifdef IVAS_FLOAT_FIXED

void ivas_masa_combine_directions_fx(

    MASA_ENCODER_HANDLE hMasa                                   /* i/o: MASA encoder handle                             */

);

#else

void ivas_masa_combine_directions(

    MASA_ENCODER_HANDLE hMasa                                   /* i/o: MASA encoder handle                             */

);

#endif



/*!r : number of bits for ISM ratio index */

int16_t bits_index_ism_ratio(

lib_com/ivas_prot_fx.h

+14 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,20 @@ void xtalk_classifier_td_fx( 
void unclr_classifier_td_fx(

    CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure                           */

);



void quantize_direction_frame2D_fx(

    IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure   */

    Word32 azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], //Q22

    Word32 elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] //Q22

);



Word16 quantize_direction2D_fx(

    Word32 phi,                  /* i  : input azimuth value            Q22 */

    const Word16 no_cw,        /* i  : number of bits                  */

    Word32 *phi_q,               /* o  : quantized azimuth value        Q22 */

    UWord16 *index_phi,        /* o  : quantized azimuth index         */

    const MC_LS_SETUP mc_format /* i  : channel format if in MC-mode    */

);

#endif



#ifdef IVAS_FLOAT_FIXED