Commit 4f523415 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_418_SID_BITRATE

parent 045e4e85

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/





#define FIX_418_SID_BITRATE                             /* Eri: Issue 418: Using the correct bitrate for unified stereo SID */

#define PARAMMC_SHORT_ENC_MDFT                          /* FhG: Issue 410: complexity optimization for parametric Multichannel modes */

#define FIX_421_TD_INT_TUNE                             /* Eri: Issue 421: Increase use of interpolation in TD renderer filter transition */

#define FIX_419_ISM_BRATE_SW_DTX                        /* VA: issue 419: fix ISM Bitrate Switching with dtx */

lib_dec/ivas_stereo_cng_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -90,12 +90,7 @@ void stereo_dft_dec_sid_coh( 
    int16_t bits_tmp;

    int16_t b;



#ifdef FIX_418_SID_BITRATE

    nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#else

    /* TODO: still use old number of bits to keep bitexactness in output */

    nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#endif



    /* If the coherence is not encoded due to lack of bits set alpha to zero which leads to that the coherence */

    /* from the previous frame is used. */
@@ -178,9 +173,6 @@ void stereo_dft_dec_sid_coh( 
        ( *nb_bits )++;

    }



#ifndef FIX_418_SID_BITRATE

    dtx_read_padding_bits( st, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );

#endif



    return;

}

lib_enc/ivas_stereo_cng_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -173,12 +173,7 @@ void stereo_dft_enc_sid_coh( 
    int16_t alpha_level;

    int16_t n;



#ifdef FIX_418_SID_BITRATE

    nr_of_sid_stereo_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#else

    /* TODO: still use old number of bits to keep bitexactness in output */

    nr_of_sid_stereo_bits = ( 4400 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;

#endif

    zeropad = 0;



    /* Encode coherence vector. Find best fixed predictor by minimizing prediction error on input vector.
@@ -333,9 +328,6 @@ void stereo_dft_enc_sid_coh( 
        ( *nb_bits )++;

    }



#ifndef FIX_418_SID_BITRATE

    push_next_indice( hBstr, zeropad, ( IVAS_SID_5k2 - 4400 ) / FRAMES_PER_SEC );

#endif



    return;

}