Commit eab2ede5 authored by norvell's avatar norvell
Browse files

Merge with main

parents 72fb1c92 56e1de23

apps/encoder.c

+6 −1
Original line number Diff line number Diff line
@@ -758,7 +758,12 @@ int main( 
        }



        /* *** Encode one frame *** */

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

            goto cleanup;

lib_com/bitstream.c

+2016 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+0 −1
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ enum 
    IND_SHB_RES_GS2,

    IND_SHB_RES_GS3,

    IND_SHB_RES_GS4,

    IND_SHB_RES_GS5,

    IND_SHB_VF,

#else

    IND_SHB_VF = IND_SHB_RES_GS + 5,

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


/*#define DEBUGGING*/                             /* Allows debugging message to be printed out during runtime */

#ifdef DEBUGGING

/*#define DBG_BITSTREAM_ANALYSIS*/            /* Write bitstream with annotations to a text file */

#define DEBUG_MODE_INFO                       /* Define to output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO_TWEAK                 /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */

#define DEBUG_FORCE_MDCT_STEREO_MODE          /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */
@@ -99,4 +100,6 @@ 


#define TEST_HR

#define FIX_1528_USAN_BASOP32                    /* Eri: (Issue #1528): The operators L_add_o, L_add_co, shl_o and L_sub_o assume additions/subtractions treated as unsigned numbers where wrap-around may happen.   */

#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */



#endif

lib_com/prot_fx.h

+27 −2
Original line number Diff line number Diff line
@@ -10644,13 +10644,32 @@ ivas_error config_acelp1_fx( 
    const Word16 GSC_IVAS_mode             /* i  : GSC IVAS mode                   */

);













#ifdef DBG_BITSTREAM_ANALYSIS













#define push_next_indice( ... ) push_next_indice_( __func__, __VA_ARGS__ )













#define push_next_bits( ... )   push_next_bits_( __func__, __VA_ARGS__ );













#endif

























#ifdef DBG_BITSTREAM_ANALYSIS













ivas_error push_next_indice_(













#else















ivas_error push_next_indice(













#endif













#ifdef DBG_BITSTREAM_ANALYSIS













    const char *caller,













#endif















    BSTR_ENC_HANDLE hBstr,















    UWord16 value, /* i  : value of the quantized indice          */















    Word16 nb_bits /* i  : number of bits used to quantize the indice */















);



























#ifdef DBG_BITSTREAM_ANALYSIS













ivas_error push_next_bits_(













#else















ivas_error push_next_bits(













#endif













#ifdef DBG_BITSTREAM_ANALYSIS













    const char *caller,













#endif















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















    const UWord16 bits[],  /* i  : bit buffer to pack, sequence of single bits */















    const Word16 nb_bits   /* i  : number of bits to pack                 */










@@ -10972,13 +10991,19 @@ ivas_error push_indice(













    Word16 nb_bits         /* i  : number of bits used to quantize the indice  */















);



























ivas_error push_next_indice(













ivas_error push_next_indice_(













#ifdef DBG_BITSTREAM_ANALYSIS













    const char *caller,













#endif















    BSTR_ENC_HANDLE hBstr,















    UWord16 value, /* i  : value of the quantized indice          */















    Word16 nb_bits /* i  : number of bits used to quantize the indice */















);



























ivas_error push_next_bits(













ivas_error push_next_bits_(













#ifdef DBG_BITSTREAM_ANALYSIS













    const char *caller,













#endif















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















    const UWord16 bits[],  /* i  : bit buffer to pack, sequence of single bits */















    const Word16 nb_bits   /* i  : number of bits to pack                 */