Commit 0ec50da4 authored by fotopoulou's avatar fotopoulou
Browse files

cleanup and merge fixes under define FIX_MDCT_BASED_BWD

parent a79f064f

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -157,11 +157,9 @@ 
#ifdef FIX_I109_ORIENTATION_TRACKING

#define OTR_REFERENCE_VECTOR_TRACKING                   /* FhG: enables the reference position orientation tracking mode */

#endif

//#define DISABLE_BWD_MCT                               /* FhG: Disable bandwidth detection for MCT*/

#define FIX_MDCT_STEREO_BWD_TCX10                       /* FhG: enables bw detection also for TCX10 frames */

#define BWD_COUNT_FIX                                   /* FhG/Dolby: fix for issue of reacting to sudden transiensts in SBA/MCT modes */



#define FIX_380_BFI_PARAMISM                            /* VA: issue 380 - fix metadata recovery in ParamISM BFI */

#define FIX_MDCT_BASED_BWD                              /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */





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

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -3827,7 +3827,7 @@ void bw_detect( 
    const float signal_in[], /* i  : input signal                                */

    float *spectrum,         /* i  : MDCT spectrum                               */

    const float *enerBuffer  /* i  : energy buffer                               */

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

    ,

    const int16_t mct_on /* i  : flag MCT mode */

#endif

lib_enc/amr_wb_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void amr_wb_enc( 
     *----------------------------------------------------------------*/



    bw_detect( st, st->input, NULL, NULL

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

               ,

               0

#endif

lib_enc/bw_detect.c

+6 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


#define BWD_COUNT_MAX      100

#define BWD_COUNT_WIDER_BW 10

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

#define BWD_COUNT_WIDER_BW_MDCT 0

#endif
@@ -74,7 +74,7 @@ void bw_detect( 
    const float signal_in[], /* i  : input signal        */

    float *spectrum,         /* i  : MDCT spectrum       */

    const float *enerBuffer  /* i  : energy buffer       */

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

    ,

    const int16_t mct_on /* i  : flag MCT mode */

#endif
@@ -180,7 +180,7 @@ void bw_detect( 
            }

            else

            {

#ifndef FIX_MDCT_STEREO_BWD_TCX10

#ifndef FIX_MDCT_BASED_BWD

                bin_width *= (int16_t) ( ( st->input_Fs / FRAMES_PER_SEC ) / BWD_TOTAL_WIDTH );

                mvr2r( spectrum, spect, (int16_t) ( st->input_Fs / FRAMES_PER_SEC ) );

#else
@@ -403,7 +403,7 @@ void bw_detect( 
             *---------------------------------------------------------------------*/



            /* switching to a higher BW */

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

            if ( st->element_mode == IVAS_CPE_MDCT && ( st->element_brate > IVAS_64k || mct_on ) )

            {

                if ( st->last_input_bwidth == NB )
@@ -498,7 +498,7 @@ void bw_detect( 
                        st->count_FB = BWD_COUNT_MAX;

                    }

                }

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

            }

#endif
@@ -714,7 +714,7 @@ void set_bw_stereo( 


    return;

}

#ifndef DISABLE_BWD_MCT



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

 * set_bw_mct()

 *
@@ -765,4 +765,3 @@ int16_t set_bw_mct( 


    return bw_changed;

}
 
#endif

lib_enc/ivas_core_pre_proc_front.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ ivas_error pre_proc_front_ivas( 
    if ( st->idchan == 0 && element_mode != IVAS_CPE_MDCT )

    {

        bw_detect( st, st->input, NULL, enerBuffer

#ifdef BWD_COUNT_FIX

#ifdef FIX_MDCT_BASED_BWD

                   ,

                   0

#endif