Commit 9fcc1eac authored by Michael Sturm's avatar Michael Sturm
Browse files

Unifies IGF_prep function.

parent b71ebe3a

lib_dec/igf_dec_fx.c

+36 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ static void IGF_convert_exponent_per_idx_to_per_tile( H_IGF_GRID hGrid, 
    }

}



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

/**********************************************************************/ /*

prepare IGF spectrum

**************************************************************************/
@@ -677,6 +678,23 @@ static void IGF_prep( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in 
    }

}



#endif



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

/**********************************************************************/ /*

prepare IGF spectrum

**************************************************************************/

static void IGF_prep( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData,     /**< in:     | IGF private data handle                              */

                      const Word16 igfGridIdx,                      /**< in: Q0  | in case of CELP->TCX switching, use 1.25 framelength */

                      const Word16 *TCXNoise,                       /**< in: Q0  | TCX noise vector                                     */

                      Word32 *igf_spec,                             /**< in/out: | prepared IGF spectrum                                */

                      Word16 *igf_spec_e,                           /**< in/out: | array exponents of igf_spec, one exponent per tile   */

                      Word32 *src_spec,                             /**< in/out: | source spectrum                                      */

                      const Word16 src_spec_e,                      /**< in:     | exponent of src_spec, whitening off                  */

                      const Word16 specMed_e,                       /**< in:     | exponent of medium flattening level                  */

                      const Word16 element_mode                     /**< in:     | element mode                                         */

)

#else

/**********************************************************************/ /*

prepare IGF spectrum (for IVAS)

**************************************************************************/
@@ -690,6 +708,7 @@ static void IGF_prep_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in 
                           const Word16 specMed_e,                       /**< in:     | exponent of medium flattening level                  */

                           const Word16 element_mode                     /**< in:     | element mode                                         */

)

#endif

{

    H_IGF_GRID hGrid;

    H_IGF_INFO hInfo;
@@ -3385,7 +3404,12 @@ void IGFDecApplyMono( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in 
                  igf_spec_e,

                  hPrivateData->pSpecFlat,

                  hPrivateData->pSpecFlat_exp,

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

                  specMed_e,

                  EVS_MONO );

#else

                  specMed_e );

#endif

        IGF_calc( hPrivateData,

                  igfGridIdx,

                  spectrum,
@@ -3559,6 +3583,17 @@ void IGFDecApplyMono_ivas( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in 
            }

        }



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

        IGF_prep( hPrivateData,

                  igfGridIdx,

                  hInstance->infoTCXNoise_ptr,

                  igf_spec,

                  igf_spec_e,

                  hPrivateData->pSpecFlat,

                  hPrivateData->pSpecFlat_exp,

                  specMed_e,

                  element_mode );

#else

        IGF_prep_ivas( hPrivateData,

                       igfGridIdx,

                       hInstance->infoTCXNoise_ptr,
@@ -3568,6 +3603,7 @@ void IGFDecApplyMono_ivas( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in 
                       hPrivateData->pSpecFlat_exp,

                       specMed_e,

                       element_mode );

#endif

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

        IGF_calc( hPrivateData,

                  igfGridIdx,