Commit 4a8913d7 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 98-setting-of-decoder-handles-to-null

parents b027ec60 fbcebe16

lib_com/cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -798,9 +798,6 @@ typedef enum 
#define BWD_COUNT_MAX                       100                     /* maximum value of BWD counter              */

#define BWD_N_BINS_MAX                      13                      /* maximum number of BWD bins */

#define BWS_TRAN_PERIOD                     5                       /* BWS - number of frames for transition period */

#ifdef FIX_I2_BWD

#define BWD_HIGH_BRATE_THR                  IVAS_256k               /* BWD - threshold from which the bitrate sets bws_high_rate_flag = 1 */

#endif



#define PREEMPH_FAC                         0.68f                   /* preemphasis factor at 12.8kHz                */

#define PREEMPH_FAC_16k                     0.72f

lib_com/options.h

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


#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */

#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define FIX_I2_BWD                                      /* Issue 2: BWD fix to more quickly react to WB -> SWB/FB change */ 

#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */



/* ################## End DEVELOPMENT switches ######################### */

lib_enc/bw_detect.c

+0 −38
Original line number Diff line number Diff line
@@ -486,44 +486,6 @@ void bw_detect( 
                }

            }

        }

#ifdef FIX_I2_BWD

        else if ( st->localVAD == 0 && st->bwd_high_brate_flag == 1 && st->input_bwidth == WB ) /* applies in IVAS only */

        {

            if( st->count_SWB > 0 )

            {

                st->count_SWB++;

            }



            if ( st->count_FB > 0 )

            {

                st->count_FB++;

            }



            if ( st->last_input_bwidth == WB && st->input_Fs > 16000 )

            {

                if ( st->count_SWB > BWD_COUNT_WIDER_BW )

                {

                    st->input_bwidth = SWB;

                    st->count_SWB = BWD_COUNT_MAX;



                    if ( st->count_FB > BWD_COUNT_WIDER_BW )

                    {

                        st->input_bwidth = FB;

                        st->count_FB = BWD_COUNT_MAX;

                    }

                }

            }



            if ( st->last_input_bwidth == SWB && st->input_Fs > 32000 )

            {

                if ( st->count_FB > BWD_COUNT_WIDER_BW )

                {

                    st->input_bwidth = FB;

                    st->count_FB = BWD_COUNT_MAX;

                }

            }

        }

#endif

    }



    /* verify that maximum encoded bandwidth (specified on the command line) is not exceeded */

lib_enc/init_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -398,9 +398,6 @@ ivas_error init_encoder( 
    st->last_bwidth = st->bwidth;

    st->last_bwidth_cng = st->bwidth;

    st->bwidth_sw_cnt = 0;

#ifdef FIX_I2_BWD

    st->bwd_high_brate_flag = 0;

#endif





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

lib_enc/ivas_core_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -443,9 +443,6 @@ ivas_error ivas_core_enc( 


        dbgwrite( &st->count_WB, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "count_WB", n, id, ENC ) );

        dbgwrite( &st->count_SWB, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "count_SWB", n, id, ENC ) );

#ifdef FIX_I2_BWD

        dbgwrite( &st->count_FB, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "count_FB", n, id, ENC ) );

#endif



#ifdef DEBUG_MODE_ACELP

        dbgwrite( snr_[n], sizeof( float ), 320, 1, fname( debug_dir, "snr", n, id, ENC ) );