Commit 9f8407bf authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_TCX_LOWRATE_LIMITATION

parent e4754cd7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ 
#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */

#define FIX_571_REVERB_NOT_ACTIVATED_ISM                /* Philips: Issue 571: Reverb not activated for discrete and parametric ISM */

#define FIX_QMETA_SID_5k2                               /* Nokia: Issue 137: enable using full 5.2k bitrate in MASA SID */

#define FIX_TCX_LOWRATE_LIMITATION                      /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */

#define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/

#define FIX_550_FIRST_FRAME_ACCESS                      /* Eri: Issue 550: TD Object renderer: first frame accesses wrong transport channel offsets */

#define FIX_550_FIRST_FRAME_ACCESS_ALT                  /* Eri: Issue 550: Should be merged with FIX_550_FIRST_FRAME_ACCESS above, or accepted at the same time */

lib_enc/ivas_decision_matrix_enc.c

+0 −29
Original line number Diff line number Diff line
@@ -165,19 +165,6 @@ void ivas_decision_matrix_enc( 
            st->core = mdct_classifier( st, fft_buff, enerBuffer, st->bits_frame_nominal * FRAMES_PER_SEC );

        }



#ifndef FIX_TCX_LOWRATE_LIMITATION

        /* Warning: TCX not available at low bitrates -> replace it by GSC */

        if ( st->core == TCX_20_CORE && st->total_brate < STEREO_TCX_MIN_RATE )

        {

            st->core = ACELP_CORE;

            st->coder_type = AUDIO;

            st->sp_aud_decision2 = 0;

            if ( st->low_rate_mode )

            {

                st->coder_type = INACTIVE;

            }

        }

#endif

    }



    /* do not allow TD stereo ACELP core -> DFT stereo TCX core switching as it is on the WC complexity path */
@@ -224,23 +211,8 @@ void ivas_decision_matrix_enc( 
        }

    }



#ifndef FIX_TCX_LOWRATE_LIMITATION

    /* TCX not available at low bitrates -> replace it by GSC */

    if ( st->core == TCX_20_CORE && st->total_brate < STEREO_TCX_MIN_RATE )

    {

        st->core = ACELP_CORE;

        st->coder_type = AUDIO;

        st->sp_aud_decision2 = 0;



        if ( st->low_rate_mode )

        {

            st->coder_type = INACTIVE;

        }

    }

#endif

#endif



#ifdef FIX_TCX_LOWRATE_LIMITATION

    /* TCX not available at low bitrates -> replace it by GSC */

    if ( st->core == TCX_20_CORE && st->total_brate < STEREO_TCX_MIN_RATE )

    {
@@ -253,7 +225,6 @@ void ivas_decision_matrix_enc( 
            st->coder_type = INACTIVE;

        }

    }

#endif



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

     * Select ACELP and GSC extension layer