Commit 006def7e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1745-small-improvements-to-bitstream-debugging' into 'ivas-float-update' 

Resolve "small improvements to bitstream debugging"

See merge request !1768
parents 76cd4a47 afabc246

apps/encoder.c

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



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

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

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

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

        {

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

            goto cleanup;

lib_com/bitstream.c

+21 −39
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include <assert.h>

#include <stdint.h>

#include "options.h"

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "cnst.h"

#include "prot.h"

#include "stat_enc.h"
@@ -50,9 +47,12 @@ 
#include "ivas_cnst.h"

#include "ivas_rom_com.h"

#include "wmc_auto.h"

#ifdef DEBUGGING

#include "debug.h"

#ifdef DBG_BITSTREAM_ANALYSIS

#include <string.h>

#endif

#endif



#ifdef DEBUGGING
@@ -212,7 +212,7 @@ ivas_error ind_list_realloc( 
        {

            new_ind_list[i].id = old_ind_list[i].id;

            new_ind_list[i].value = old_ind_list[i].value;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );

#endif

        }
@@ -223,7 +223,7 @@ ivas_error ind_list_realloc( 
    for ( ; i < max_num_indices; i++ )

    {

        new_ind_list[i].nb_bits = -1;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

        sprintf( new_ind_list[i].function_name, "RESET in ind_list_realloc" );

#endif

    }
@@ -812,7 +812,7 @@ void move_indices( 
            new_ind_list[i].value = old_ind_list[i].value;

            new_ind_list[i].nb_bits = old_ind_list[i].nb_bits;



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );

#endif

            old_ind_list[i].nb_bits = -1;
@@ -825,12 +825,12 @@ void move_indices( 
            new_ind_list[i].id = old_ind_list[i].id;

            new_ind_list[i].value = old_ind_list[i].value;

            new_ind_list[i].nb_bits = old_ind_list[i].nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            strncpy( new_ind_list[i].function_name, old_ind_list[i].function_name, 100 );

#endif



            old_ind_list[i].nb_bits = -1;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            sprintf( old_ind_list[i].function_name, "RESET in move_indices" );

#endif

        }
@@ -909,7 +909,7 @@ ivas_error check_ind_list_limits( 
    return error;

}



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

const char *named_indices_table[] = {

    "IND_IVAS_FORMAT",

    "IND_SMODE_OMASA",
@@ -2837,7 +2837,7 @@ ivas_error push_indice( 
            hBstr->ind_list[j].id = hBstr->ind_list[j - 1].id;

            hBstr->ind_list[j].nb_bits = hBstr->ind_list[j - 1].nb_bits;

            hBstr->ind_list[j].value = hBstr->ind_list[j - 1].value;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            strncpy( hBstr->ind_list[j].function_name, hBstr->ind_list[j - 1].function_name, 100 );

#endif

        }
@@ -2848,7 +2848,7 @@ ivas_error push_indice( 
    hBstr->ind_list[i].id = id;

    hBstr->ind_list[i].value = value;

    hBstr->ind_list[i].nb_bits = nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

    strncpy( hBstr->ind_list[i].function_name, named_indices_table[id], 100 );

#endif
@@ -2865,7 +2865,7 @@ ivas_error push_indice( 
 * Push a new indice into the buffer at the next position

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



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

ivas_error push_next_indice_(

    const char *caller,

#else
@@ -2915,7 +2915,7 @@ ivas_error push_next_indice( 
    hBstr->ind_list[hBstr->nb_ind_tot].value = value;

    hBstr->ind_list[hBstr->nb_ind_tot].nb_bits = nb_bits;



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

    strncpy( hBstr->ind_list[hBstr->nb_ind_tot].function_name, caller, 100 );

#endif
@@ -2932,7 +2932,7 @@ ivas_error push_next_indice( 
 * Push a bit buffer into the buffer at the next position

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



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

ivas_error push_next_bits_(

    const char *caller,

#else
@@ -2978,7 +2978,7 @@ ivas_error push_next_bits( 
        ptr->value = code;

        ptr->nb_bits = 16;

        ptr->id = prev_id;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

        strncpy( ptr->function_name, caller, 100 );

#endif

        hBstr->nb_ind_tot++;
@@ -2997,7 +2997,7 @@ ivas_error push_next_bits( 
        ptr->value = bits[i];

        ptr->nb_bits = 1;

        ptr->id = prev_id;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

        strncpy( ptr->function_name, caller, 100 );

#endif

        hBstr->nb_ind_tot++;
@@ -3069,7 +3069,7 @@ uint16_t delete_indice( 
            hBstr->ind_list[j].id = hBstr->ind_list[i].id;

            hBstr->ind_list[j].value = hBstr->ind_list[i].value;

            hBstr->ind_list[j].nb_bits = hBstr->ind_list[i].nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

            strncpy( hBstr->ind_list[j].function_name, hBstr->ind_list[i].function_name, 100 );

#endif

        }
@@ -3083,7 +3083,7 @@ uint16_t delete_indice( 
    {

        /* reset the shifted indices at the end of the list */

        hBstr->ind_list[j].nb_bits = -1;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

        sprintf( hBstr->ind_list[j].function_name, "RESET in delete_indice" );

#endif

    }
@@ -3388,10 +3388,6 @@ static ivas_error write_indices_element( 
    uint16_t **pt_stream,    /* i  : pointer to bitstream buffer                                     */

    const int16_t is_SCE,    /* i  : flag to distingusih SCE and CPE                                 */

    const int16_t element_id /* i  : id of the SCE or CPE                                            */

#ifdef DBG_BITSTREAM_ANALYSIS

    ,

    int32_t frame

#endif

)

{

    int16_t ch;
@@ -3513,7 +3509,7 @@ static ivas_error write_indices_element( 
    }





#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

    if ( is_SCE ) /* EVS and SCE */

    {

        static FILE *f1 = 0;
@@ -3625,10 +3621,6 @@ ivas_error write_indices_ivas( 
    Encoder_Struct *st_ivas, /* i/o: encoder state structure             */

    uint16_t *bit_stream,    /* i/o: output bitstream                    */

    uint16_t *num_bits       /* i  : number of indices written to output */

#ifdef DBG_BITSTREAM_ANALYSIS

    ,

    int32_t frame

#endif

)

{

    int16_t i, n;
@@ -3694,22 +3686,12 @@ ivas_error write_indices_ivas( 


    for ( n = 0; n < st_ivas->nSCE; n++ )

    {

        write_indices_element( st_ivas, &pt_stream, 1, n

#ifdef DBG_BITSTREAM_ANALYSIS

                               ,

                               frame

#endif

        );

        write_indices_element( st_ivas, &pt_stream, 1, n );

    }



    for ( n = 0; n < st_ivas->nCPE; n++ )

    {

        write_indices_element( st_ivas, &pt_stream, 0, n

#ifdef DBG_BITSTREAM_ANALYSIS

                               ,

                               frame

#endif

        );

        write_indices_element( st_ivas, &pt_stream, 0, n );

    }



    *num_bits = (uint16_t) ( pt_stream - bit_stream );

lib_com/prot.h

+3 −7
Original line number Diff line number Diff line
@@ -473,12 +473,12 @@ ivas_error push_indice( 
    int16_t nb_bits        /* i  : number of bits used to quantize the indice  */

);



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( 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

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

ivas_error push_next_indice_(

    const char *caller,

#else
@@ -489,7 +489,7 @@ ivas_error push_next_indice( 
    int16_t nb_bits /* i  : number of bits used to quantize the indice */

);



#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

ivas_error push_next_bits_(

    const char *caller,

#else
@@ -589,10 +589,6 @@ ivas_error write_indices_ivas( 
    Encoder_Struct *st_ivas, /* i/o: encoder state structure                                       */

    uint16_t *bit_stream,    /* i/o: output bitstream                                              */

    uint16_t *num_bits       /* i/o: number of bits written to output                              */

#ifdef DBG_BITSTREAM_ANALYSIS

    ,

    int32_t frame

#endif

);



Word16 rate2EVSmode(

lib_enc/ivas_corecoder_enc_reconfig.c

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <assert.h>

#endif

#include "wmc_auto.h"

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

#include <string.h>

#endif
@@ -170,7 +170,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                temp_ind_list[i].id = hBstr->ind_list[i].id;

                temp_ind_list[i].value = hBstr->ind_list[i].value;

                temp_ind_list[i].nb_bits = hBstr->ind_list[i].nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

                strncpy( temp_ind_list[i].function_name, hBstr->ind_list[i].function_name, 100 );

#endif

                hBstr->ind_list[i].nb_bits = -1;
@@ -376,7 +376,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                    st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id;

                    st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value;

                    st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

                    strncpy( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->ind_list[i].function_name, temp_ind_list[i].function_name, 100 );

#endif

                }
@@ -396,7 +396,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                    st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].id = temp_ind_list[i].id;

                    st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].value = temp_ind_list[i].value;

                    st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].nb_bits = temp_ind_list[i].nb_bits;

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

                    strncpy( st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->ind_list[i].function_name, temp_ind_list[i].function_name, 100 );

#endif

                }

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "debug.h"

#endif

#include "wmc_auto.h"

#ifdef DBG_BITSTREAM_ANALYSIS

#if defined( DEBUGGING ) && defined( DBG_BITSTREAM_ANALYSIS )

#include <string.h>

#endif