Commit ba18ed9d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_481_UNUSED_VARIABLES

parent 1165de2e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 






#define FIX_481_UNUSED_VARIABLES                        /* Nokia: Fix issue #481: Unused debug variables */



#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

lib_dec/ivas_qmetadata_dec.c

+0 −40
Original line number Diff line number Diff line
@@ -780,22 +780,14 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
)

{

    int16_t d, b, m;

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    int16_t bits_diff_sum;

#endif

#else

    int16_t bits_diff_sum;

#endif

    int16_t nbands, start_band;

    IVAS_QDIRECTION *q_direction;

    int16_t start_index_0;

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    int16_t bits_no_dirs_coh, bits_sur_coherence;

#endif

#else

    int16_t bits_no_dirs_coh, bits_sur_coherence;

#endif

    uint16_t all_coherence_zero;

    int16_t p[MASA_MAXIMUM_CODING_SUBBANDS], dif_p[MASA_MAXIMUM_CODING_SUBBANDS];
@@ -875,24 +867,16 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
    hQMetaData->q_direction[0].cfg.nbands = codedBands;



    /*Coherence flag decoding*/

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    bits_no_dirs_coh = 0;

#endif

#else

    bits_no_dirs_coh = 0;

#endif

    all_coherence_zero = 1;

    if ( hQMetaData->coherence_flag )

    {

        /* read if coherence is zero */

        all_coherence_zero = bitstream[( *index )--];

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_no_dirs_coh += 1;

#endif

#else

        bits_no_dirs_coh += 1;

#endif

    }
@@ -923,12 +907,8 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
            p[b] = p[b - 1] + dif_p[b] + 1;

            hQMetaData->twoDirBands[p[b]] = 1;

        }

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_no_dirs_coh += ( d - *index );

#endif

#else

        bits_no_dirs_coh += ( d - *index );

#endif

    }
@@ -940,23 +920,15 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
            hQMetaData->q_direction[1].cfg.nbands = codedBands;

        }

    }

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    bits_diff_sum =

#endif

#else

    bits_diff_sum =

#endif

        ivas_qmetadata_entropy_decode_diffuseness_hr_512( bitstream, index, &( hQMetaData->q_direction[0] ) );



    if ( hQMetaData->no_directions == 2 )

    {

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_diff_sum +=

#endif

#else

        bits_diff_sum +=

#endif

            ivas_qmetadata_entropy_decode_diffuseness_hr_512( bitstream, index, &( hQMetaData->q_direction[1] ) );

    }
@@ -1007,23 +979,15 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 


    if ( all_coherence_zero == 0 )

    {

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_sur_coherence =

#endif

#else

        bits_sur_coherence =

#endif

            read_surround_coherence_hr( bitstream, index, hQMetaData );

    }

    else

    {

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_sur_coherence = 0;

#endif

#else

        bits_sur_coherence = 0;

#endif

        /*Surround coherence*/

        for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ )
@@ -1034,13 +998,9 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
            }

        }

    }

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    bits_no_dirs_coh += bits_sur_coherence;

#endif

#else

    bits_no_dirs_coh += bits_sur_coherence;

#endif



    for ( d = 0; d < hQMetaData->no_directions; d++ )

    {

lib_enc/ivas_qmetadata_enc.c

+0 −16
Original line number Diff line number Diff line
@@ -740,12 +740,8 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512( 
    int16_t nbands, nblocks, start_band;

    int16_t ndirections, d;

    int16_t all_coherence_zero;

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    int16_t bits_no_dirs_coh;

#endif

#else

    int16_t bits_no_dirs_coh;

#endif

    int16_t bits_ec;

    float azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES];
@@ -783,12 +779,8 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512( 


    /* Check if coherence should be encoded */

    all_coherence_zero = 1;

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

    bits_no_dirs_coh = 0;

#endif

#else

    bits_no_dirs_coh = 0;

#endif

    if ( hQMetaData->q_direction->cfg.inactiveBands > 0 )

    {
@@ -805,24 +797,16 @@ ivas_error ivas_qmetadata_enc_encode_hr_384_512( 
    {

        all_coherence_zero = hQMetaData->all_coherence_zero;

        push_next_indice( hMetaData, all_coherence_zero, 1 ); /* signal coherence */

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_no_dirs_coh += 1;

#endif

#else

        bits_no_dirs_coh += 1;

#endif

    }



    /* encode 2 direction subbands position */

    if ( ndirections == 2 && bits_sph_idx == 11 )

    {

#ifdef FIX_481_UNUSED_VARIABLES

#ifdef DEBUG_MODE_QMETADATA

        bits_no_dirs_coh +=

#endif

#else

        bits_no_dirs_coh +=

#endif

            write_2dir_info( hMetaData, hQMetaData->twoDirBands, hQMetaData->q_direction[0].cfg.nbands, hQMetaData->numTwoDirBands );