Commit bf1c0053 authored by vaclav's avatar vaclav
Browse files

remove DEBUG_MODE_INFO

parent 57e03bab

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5161,7 +5161,7 @@ void ivas_omasa_enc( 
#ifdef OMASA_BRATE

void ivas_set_surplus_brate_enc(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

#ifdef DEBUG_VA

#ifdef DEBUG_MODE_INFO

    ,

    const int16_t *nb_bits_metadata                             /* i  : number of metadata bits                 */

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 
#define MASA_AND_OBJECTS_VE // VA: improve codec print-outs

#define OMASA_BRATE /* VA: combined format bit-budget distribution */

#define OMASA_BRATE_TD // support of bitrate adaptation in TD stereo

#define DEBUG_VA // output 'res/brate_ism' and 'res_brate_masa' bit-rates debugging files



#endif

lib_enc/ivas_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -200,14 +200,6 @@ ivas_error ivas_core_enc( 
    {

        ivas_combined_format_brate_sanity( hCPE->element_brate, sts[0]->core, &( sts[0]->core_brate ), &diff_nBits );

    }



#ifdef DEBUG_VA

    if ( hCPE != NULL && hCPE->element_mode == IVAS_CPE_DFT )

    {

        diff_nBits = max( diff_nBits, 0 );

        dbgwrite( &diff_nBits, 2, 1, 960, "res/_diff" );

    }

#endif

#endif



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

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ ivas_error ivas_enc( 
                          st_ivas->ism_mode, hEncoderConfig->nchan_ism, st_ivas->hIsmMetaData, idx_separated_object, st_ivas->hOMasa );



        /* Configuration of combined-format bit-budget distribution */

#ifdef DEBUG_VA

#ifdef DEBUG_MODE_INFO

        ivas_set_surplus_brate_enc( st_ivas, nb_bits_metadata );

#else

        ivas_set_surplus_brate_enc( st_ivas );

lib_enc/ivas_omasa_enc.c

+2 −6
Original line number Diff line number Diff line
@@ -473,10 +473,6 @@ void ivas_omasa_enc( 


        /* Estimate energies and ratios */

        ivas_omasa_energy_and_ratio_est( hOMasa, hMasa, data_in_f, input_frame, nchan_ism );



#ifdef DEBUG_VA

        dbgwrite( &selected_object, 2, 1, input_frame, "res/selected_object" );

#endif

    }



    /* Downmix */
@@ -564,7 +560,7 @@ void set_ism_importance_interformat( 


void ivas_set_surplus_brate_enc(

    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */

#ifdef DEBUG_VA

#ifdef DEBUG_MODE_INFO

    ,

    const int16_t *nb_bits_metadata /* i  : number of metadata bits         */

#endif
@@ -584,7 +580,7 @@ void ivas_set_surplus_brate_enc( 
        st_ivas->hCPE[0]->brate_surplus = 0;

    }



#ifdef DEBUG_VA

#ifdef DEBUG_MODE_INFO

    if ( st_ivas->hSCE[0] != NULL )

    {

        int16_t input_frame = (int16_t) ( st_ivas->hEncoderConfig->input_Fs / FRAMES_PER_SEC );