Commit 1fb6b0c5 authored by Michael Sturm's avatar Michael Sturm
Browse files

Unifies IGFEncWriteConcatenatedBitstream_fx function.

parent a2b2772a

lib_enc/enc_prm_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1097,7 +1097,11 @@ void writeTCXparam_fx( 
        test();

        IF( LT_16( st->element_mode, IVAS_CPE_MDCT ) && k == 0 && st->igf && EQ_16( core, TCX_10_CORE ) )

        {

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

            nbits_igf = IGFEncWriteConcatenatedBitstream_fx( st->hIGFEnc, hBstr ); /* Q0 */

#else

            nbits_igf = IGFEncWriteConcatenatedBitstream_ivas_fx( st->hIGFEnc, hBstr ); /* Q0 */

#endif

        }



        flag_ctx_hm = 0;

lib_enc/igf_enc_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -1823,7 +1823,7 @@ Word16 IGFEncWriteConcatenatedBitstream_fx( 
    return hInstance->infoTotalBitsWritten;

}





#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

/**< out: Q0 | total number of bits written   */

Word16 IGFEncWriteConcatenatedBitstream_ivas_fx(

    const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */
@@ -1853,6 +1853,7 @@ Word16 IGFEncWriteConcatenatedBitstream_ivas_fx( 


    return hInstance->infoTotalBitsWritten;

}

#endif



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

apply the IGF encoder, main encoder interface

lib_enc/ivas_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1100,7 +1100,11 @@ void enc_prm_igf_mdct( 
    }

    ELSE

    {

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

        IGFEncWriteConcatenatedBitstream_fx( st->hIGFEnc, hBstr );

#else

        IGFEncWriteConcatenatedBitstream_ivas_fx( st->hIGFEnc, hBstr );

#endif

    }



    total_nbbits = sub( hBstr->nb_bits_tot, nbits_start );

lib_enc/prot_fx_enc.h

+2 −1
Original line number Diff line number Diff line
@@ -2574,12 +2574,13 @@ Word16 IGFEncWriteConcatenatedBitstream_fx( 
    BSTR_ENC_HANDLE hBstr                    /* i/o: encoder bitstream handle       */

);



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

/**< out: Q0 | total number of bits written   */

Word16 IGFEncWriteConcatenatedBitstream_ivas_fx(

    const IGF_ENC_INSTANCE_HANDLE hInstance, /* i  : instance handle of IGF Encoder */

    BSTR_ENC_HANDLE hBstr                    /* i/o: encoder bitstream handle       */

);



#endif

void signaling_enc_rf_fx(

    Encoder_State *st /* i  : encoder state structure   */

);