Commit 562d2fca authored by Michael Sturm's avatar Michael Sturm
Browse files

Removes redundand IGFEncConcatenateBitstream function declarations and renames... 

Removes redundand IGFEncConcatenateBitstream function declarations and renames the function consistently.
parent 00b8af57

lib_enc/igf_enc_fx.c

+13 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,18 @@ static void pack_bit_fx( 
    return;

}



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

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

 * IGFEncConcatenateBitstream()

 *

 * IGF bitstream concatenation for TCX10 modes

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



void IGFEncConcatenateBitstream( const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i  : instance handle of IGF Encoder                  */

                                 const Word16 bsBits,                   /* i  : number of IGF bits written to list of indices   */

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

)

#else

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

 * IGFEncConcatenateBitstream_fx()

 *
@@ -1568,6 +1580,7 @@ void IGFEncConcatenateBitstream_ivas_fx( 
    const Word16 bsBits,                   /* i  : number of IGF bits written to list of indices   */

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

)

#endif

{

    Word16 i;

    IGF_ENC_PRIVATE_DATA_HANDLE hPrivateData;

lib_enc/prot_fx_enc.h

+2 −0
Original line number Diff line number Diff line
@@ -2743,6 +2743,7 @@ void IGFEncApplyMono_ivas_fx( 
    const Word16 vad_hover_flag    /* i  : VAD hangover flag                                      */

);



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

void IGFEncConcatenateBitstream_ivas_fx(

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

    const Word16 bsBits,                   /* i  : number of IGF bits written to list of indices   */
@@ -2756,6 +2757,7 @@ void IGFEncConcatenateBitstream_fx( 
    Word16 *nb_bits,                         /* i/o: total number of bits already written           */

    Indice *ind_list_fx                      /* i  : pointer to list of indices                     */

);

#endif



void msvq_enc_fx(

    const Word16 *const *cb, /* i  : Codebook (indexed cb[*stages][levels][p])         (0Q15)     */

lib_enc/tcx_utils_enc_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -3862,7 +3862,11 @@ void ProcessIGF_fx( 
        IGFEncWriteBitstream_ivas_fx( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );



        bsBits = sub( hBstr->nb_ind_tot, pBsStart );

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

        IGFEncConcatenateBitstream( hIGFEnc, bsBits, hBstr );

#else

        IGFEncConcatenateBitstream_ivas_fx( hIGFEnc, bsBits, hBstr );

#endif

    }



    return;
@@ -3990,7 +3994,11 @@ void ProcessIGF_ivas_fx( 
        IGFEncWriteBitstream_ivas_fx( hIGFEnc, hBstr, &hIGFEnc->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );



        bsBits = sub( hBstr->nb_ind_tot, pBsStart );

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

        IGFEncConcatenateBitstream( hIGFEnc, bsBits, hBstr );

#else

        IGFEncConcatenateBitstream_ivas_fx( hIGFEnc, bsBits, hBstr );

#endif

    }



    return;
@@ -4097,7 +4105,11 @@ void ProcessStereoIGF_fx( 
            IGFEncWriteBitstream_ivas_fx( hIGFEnc[ch], hBstr, &hIGFEnc[ch]->infoTotalBitsPerFrameWritten, igfGridIdx, isIndepFlag );



            bsBits = sub( hBstr->nb_ind_tot, pBsStart );

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

            IGFEncConcatenateBitstream( hIGFEnc[ch], bsBits, hBstr );

#else

            IGFEncConcatenateBitstream_ivas_fx( hIGFEnc[ch], bsBits, hBstr );

#endif

        }

    }