Commit c3f8c23a authored by Michael Sturm's avatar Michael Sturm
Browse files

Unifies IGF_WriteFlatteningTrigger_fx function.

parent 64b7928e

lib_enc/igf_enc_fx.c

+38 −4
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ static void IGF_WriteWhiteningLevels_fx( 
    return;

}





#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

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

write flattening trigger

**************************************************************************/
@@ -1443,14 +1443,44 @@ static void IGF_WriteFlatteningTrigger_fx( 
{

    Word16 flatteningTrigger;





    flatteningTrigger = hInstance->flatteningTrigger;

    move16();



    IGF_write_bits( hBstr, pBitOffset, flatteningTrigger, 1 );

}

#else

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

 * IGF_WriteFlatteningTrigger_fx()

 *

 * write flattening trigger

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



    return;

/*! r: number of bits written */

static Word16 IGF_WriteFlatteningTrigger_fx(

    const IGF_ENC_INSTANCE_HANDLE hInstance, /**< in:     | instance handle of IGF Encoder */

    BSTR_ENC_HANDLE hBstr,                   /**< inout:  | encoder bitstream handle       */

    Word16 *pBitOffset                       /**< in:     | ptr to bitOffset counter       */

)

{

    Word16 flatteningTrigger;



    Word16 totBitCount;

    Word16 startBitCount;

    totBitCount = 0;

    startBitCount = *pBitOffset;

    flatteningTrigger = hInstance->flatteningTrigger;

    move16();

    move16();

    move16();



    IGF_write_bits( hBstr, pBitOffset, flatteningTrigger, 1 );

    totBitCount = sub( *pBitOffset, startBitCount );



    return totBitCount;

}



#endif

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

updates the start/stop frequency of IGF according to igfGridIdx

**************************************************************************/
@@ -3961,7 +3991,7 @@ static Word16 IGF_WriteWhiteningLevels_ivas_fx( 
    return totBitCount;

}





#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS

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

 * IGF_WriteFlatteningTrigger_fx()

 *
@@ -3990,7 +4020,7 @@ static Word16 IGF_WriteFlatteningTrigger_ivas_fx( 


    return totBitCount;

}



#endif



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

 * IGFEncWriteBitstream()
@@ -4030,7 +4060,11 @@ Word16 IGFEncWriteBitstream_ivas_fx( 


    IGF_WriteWhiteningLevels_ivas_fx( hIGFEnc, hBstr, pBitOffset, igfGridIdx, isIndepFlag );



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS

    IGF_WriteFlatteningTrigger_fx( hIGFEnc, hBstr, pBitOffset );

#else

    IGF_WriteFlatteningTrigger_ivas_fx( hIGFEnc, hBstr, pBitOffset );

#endif



    hIGFEnc->infoTotalBitsPerFrameWritten = sub( *pBitOffset, startBitCount );

    hIGFEnc->infoTotalBitsWritten = add( hIGFEnc->infoTotalBitsWritten, hIGFEnc->infoTotalBitsPerFrameWritten );