Commit 65169a29 authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_565_SBA_BURST_IN_FEC

parent e0a4cb89

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

#define FIX_565_SBA_BURST_IN_FEC                        /* VA: Issue 565: Fix noise burst during FEC, due to wrong total_brate initialization */

#define FIX_562_ISM2_64KBPS                             /* VA: issue 562: fix ISM2 at 64kbps issue */

#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 */

lib_dec/FEC.c

+0 −8
Original line number Diff line number Diff line
@@ -331,11 +331,7 @@ void FEC_exc_estim( 
    /*-----------------------------------------------------------------*

     * Replicate the last spectrum in case the last good frame was coded by GSC

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

#ifndef FIX_565_SBA_BURST_IN_FEC

    if ( ( st->last_coder_type == AUDIO || st->last_good == INACTIVE_CLAS ) && st->total_brate <= ACELP_24k40 && !st->Opt_AMR_WB )

#else

    if ( ( st->last_coder_type == AUDIO || st->last_good == INACTIVE_CLAS ) && st->total_brate <= MAX_GSC_INACTIVE_BRATE && !st->Opt_AMR_WB )

#endif

    {

        /* Replication of the last spectrum, with a slight downscaling of its dynamic */

        st->GSC_noisy_speech = st->Last_GSC_noisy_speech_flag;
@@ -407,11 +403,7 @@ void FEC_exc_estim( 
    /*-----------------------------------------------------------------*

     * Total excitation

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

#ifndef FIX_565_SBA_BURST_IN_FEC

    if ( ( st->last_coder_type == AUDIO || st->last_good == INACTIVE_CLAS ) && st->total_brate <= ACELP_24k40 && !st->Opt_AMR_WB )

#else

    if ( ( st->last_coder_type == AUDIO || st->last_good == INACTIVE_CLAS ) && st->total_brate <= MAX_GSC_INACTIVE_BRATE && !st->Opt_AMR_WB )

#endif

    {

        /* For GSC - the excitation is already computed */

        mvr2r( exc, exc2, st->L_frame );

lib_dec/ivas_sce_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -185,17 +185,10 @@ ivas_error ivas_sce_dec( 
    {

        st->total_brate = ivas_total_brate;

    }

#ifndef FIX_565_SBA_BURST_IN_FEC

    else if ( st_ivas->ivas_format != ISM_FORMAT ) /* note: in ISMs, total_brate[] is set in ivas_ism_config() */

    {

        st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC;

    }

#else

    else if ( !st_ivas->bfi && st_ivas->ivas_format != ISM_FORMAT ) /* note: in ISMs, total_brate[] is set in ivas_ism_config() */

    {

        st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC;

    }

#endif

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

     * Core codec configuration

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

lib_dec/ivas_spar_decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -345,9 +345,7 @@ ivas_error ivas_spar_dec( 
    st0->bit_stream = bstr_meta;

    st0->next_bit_pos = 0;

    st0->bits_frame = min( MAX_BITS_METADATA, last_bit_pos + 1 );

#ifdef FIX_565_SBA_BURST_IN_FEC

    if ( !st0->bfi )

#endif

    {

        st0->total_brate = hDecoderConfig->ivas_total_brate; /* to avoid BER detect */

    }