Commit 4290523b authored by vaclav's avatar vaclav
Browse files

merge igf_enc.c and igf_enc_fx.h + clang-format

parent dd7707f2

Workspace_msvc/lib_enc.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c" />

    <ClCompile Include="..\lib_enc\cod4t64_fast_fx.c" />

    <ClCompile Include="..\lib_enc\igf_enc.c" />

    <ClCompile Include="..\lib_enc\igf_scf_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ 
    <ClCompile Include="..\lib_enc\hvq_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\igf_enc.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\igf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

lib_com/igf_base_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -1230,26 +1230,6 @@ void IGFCommonFuncsMDCTSquareSpec_ivas( const Word16 sqrtBgn, /**< in 
}





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

write bits to stream

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

void IGFCommonFuncsWriteSerialBit(

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

    Word16 *pBitOffset,    /**< out: Q0 | bit offset                       */

    Word16 bit             /**< in: Q0  | value of bit                     */

)

{



    IF( hBstr )

    {

        push_next_indice( hBstr, bit, 1 );

    }

    *pBitOffset = add( *pBitOffset, 1 );

    move16();



    return;

}



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

changes the IGF configuration

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

lib_com/prot_fx.h

+0 −10
Original line number Diff line number Diff line
@@ -5701,12 +5701,6 @@ void IGFCommonFuncsMDCTSquareSpec_ivas( 
    Word16 indexOffset        /**< in: Q0  | index offset                   */

);













void IGFCommonFuncsWriteSerialBit(













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













    Word16 *pBitOffset,    /**< out: Q0 | bit offset                       */













    Word16 bit             /**< in: Q0  | value of bit                     */













);



























Word16 IGFCommonFuncsIGFConfiguration(















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















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










@@ -11352,10 +11346,6 @@ Word16 is_EVS_bitrate(













    Word16 *Opt_AMR_WB             /* i  : AMR-WB IO flag     */















);



























void IGFEncResetTCX10BitCounter_ivas_fx(













    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */













);



























ivas_error IGF_Reconfig(















    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */















    const Word16 igf,                 /* i  : IGF on/off                      */

























lib_enc/igf_enc.c
deleted100644 → 0



+0
−2688


























File deleted.
Preview size limit exceeded, changes collapsed.