Commit 6021a710 authored by Michael Sturm's avatar Michael Sturm
Browse files

Unifies IGFCommonFuncsIGFConfiguration function.

parent e2fc848f

lib_com/igf_base_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,7 @@ Word16 IGFCommonFuncsIGFConfiguration( 


    return retValue;

}

#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

Word16 IGFCommonFuncsIGFConfiguration_ivas_fx(

    const Word32 total_brate,  /* i  : bitrate in bs e.g. 9600 for 9.6kbs  */

    const Word16 bwidth,       /* i  : audio bandwidth                     */
@@ -1432,6 +1433,7 @@ Word16 IGFCommonFuncsIGFConfiguration_ivas_fx( 


    return retValue; /*Q0*/

}

#endif



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

selects cumulative frequency tables and offsets for the IGF SCF arithmetic coder

lib_com/prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -5360,6 +5360,7 @@ Word16 IGFCommonFuncsIGFConfiguration( 
    const Word16 rf_mode       /* i  : flag to signal the RF mode          */

);



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

Word16 IGFCommonFuncsIGFConfiguration_ivas_fx(

    const Word32 total_brate,  /* i  : bitrate in bs e.g. 9600 for 9.6kbs  */

    const Word16 bwidth,       /* i  : audio bandwidth                     */
@@ -5367,7 +5368,7 @@ Word16 IGFCommonFuncsIGFConfiguration_ivas_fx( 
    H_IGF_INFO hIGFInfo,       /* o  : IGF info handle                     */

    const Word16 rf_mode       /* i  : flag to signal the RF mode          */

);



#endif

Word16 IGFCommonFuncsIGFGetCFTables_fx(

    const Word32 total_brate,   /* i  : bitrate in bs e.g. 9600 for 9.6kbs  */

    const Word16 bwidth,        /* i  : audio bandwidth                     */

lib_dec/igf_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4044,7 +4044,11 @@ void IGFDecSetMode_ivas_fx( 
    hIGFDec->isIGFActive = 0;

    move16();



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

    IF( IGFCommonFuncsIGFConfiguration( total_brate, bwidth, element_mode, &hPrivateData->igfInfo, rf_mode ) )

#else

    IF( IGFCommonFuncsIGFConfiguration_ivas_fx( total_brate, bwidth, element_mode, &hPrivateData->igfInfo, rf_mode ) )

#endif

    {

        IGFSCFDecoderOpen( &hPrivateData->hArithSCFdec, &hPrivateData->igfInfo, total_brate, bwidth, element_mode, rf_mode );

lib_enc/igf_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4007,7 +4007,11 @@ void IGFEncSetMode_ivas_fx( 
    set16_fx( hPrivateData->SFM_sb_fx, 0, IGF_MAX_SFB );

    set16_fx( hPrivateData->SFM_tb_fx, 0, IGF_MAX_SFB );



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

    IF( IGFCommonFuncsIGFConfiguration( total_brate, bwidth, element_mode, &hPrivateData->igfInfo, rf_mode ) != 0 )

#else

    IF( IGFCommonFuncsIGFConfiguration_ivas_fx( total_brate, bwidth, element_mode, &hPrivateData->igfInfo, rf_mode ) != 0 )

#endif

    {

        IGFSCFEncoderOpen_fx( &hPrivateData->hIGFSCFArithEnc, &hPrivateData->igfInfo, total_brate, bwidth, element_mode, rf_mode );