Commit 9591d921 authored by vaillancour's avatar vaillancour Committed by Sandesh Venkatesh
Browse files

replace other EVS bitstream related stuff

parent 7b1d6dbd

lib_com/bitstream_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -314,11 +314,10 @@ void push_next_indice_fx( 


    return;

}

#endif





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

 * push_next_bits_fx()

 * push_next_bits()

 * Push a bit buffer into the buffer at the next position

 *-------------------------------------------------------------------*/
@@ -368,6 +367,7 @@ void push_next_bits_fx( 
    hBstr->nb_bits_tot = add( hBstr->nb_bits_tot, nb_bits );

    move16();

}

#endif



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

 * get_next_indice_fx( )
@@ -565,6 +565,7 @@ void reset_indices_dec_fx( 
 *

 * Write the buffer of indices to a file

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

#if 0



void write_indices_fx(

    Encoder_State *st_fx,  /* i/o: encoder state structure */
@@ -663,12 +664,13 @@ void write_indices_fx( 


    return;

}

#endif 

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

 * write_indices_buf_fx()

 *

 * Write the buffer of indices to a file

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



#if 0

void write_indices_buf_fx(

    Encoder_State *st_fx,  /* i/o: encoder state structure */

    BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
@@ -772,6 +774,7 @@ void write_indices_buf_fx( 


    return;

}

#endif

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

 * indices_to_serial()

 *

lib_enc/ACcontextMapping_enc_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx( 
    push_next_indice( hBstr, value, nbbits_ntuples );



    /* Push arithmetic coded bits */

    push_next_bits_fx( hBstr, &ptr[nbbits_ntuples], sub( bp, nbbits_ntuples ) );

    push_next_bits( hBstr, (UWord16 *) &ptr[nbbits_ntuples], sub( bp, nbbits_ntuples ) );



    /* Push sign bits */

    push_next_bits_fx( hBstr, signs, nbbits_signs );

    push_next_bits( hBstr, (UWord16 *) signs, nbbits_signs );

    bp = add( bp, nbbits_signs ); /* Q0 */



    /*write residual Quantization bits*/
@@ -372,7 +372,7 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx( 
    assert( bp + k <= nbbits );



    /* Push the rest of the buffer */

    push_next_bits_fx( hBstr, &ptr[bp], sub( nbbits, bp ) );

    push_next_bits( hBstr, (UWord16 *) &ptr[bp], sub( nbbits, bp ) );



    return /*(bp+nbbits_lsbs)*/; /*return only for debug plot*/

}

lib_enc/enc_prm_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ void enc_prm_fx( 


        IF( hTcxEnc->tcx_lpc_shaped_ari != 0 )

        {

            push_next_bits_fx( hBstr, &prm[++j], nbits_tcx );

            push_next_bits( hBstr, ( UWord16 * ) &prm[++j], nbits_tcx );

            j = add( j, nbits_tcx ); /* Q0 */

        }

        ELSE

lib_enc/igf_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -2429,7 +2429,7 @@ void IGFEncSetMode_ivas_fx( 
 *

 * IGF bitstream concatenation for TCX10 modes

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



#if 0 /* Float code */

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   */
@@ -2487,7 +2487,7 @@ move16(); 


return;

}



#endif



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

 * IGFEncResetTCX10BitCounter_ivas_fx()

lib_enc/igf_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, nb_bits_written ); 


return;

}



#if 0 /* old bitstream */

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

    IGF bitsream concatenation for TCX10 modes

    **************************************************************************/
@@ -1475,7 +1475,7 @@ void IGFEncConcatenateBitstream_fx( const IGF_ENC_INSTANCE_HANDLE hInstance, /** 
    move16();

    return;

}



#endif

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

   IGF reset bitsream bit counter for TCX10 modes

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