Commit e5d93c90 authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

enabled HQ -FORCE MUSIC simuations at 32kbps and 64 kbps with DEBUGGING On in MSVC

parent 79ff1119

lib_com/options.h

+5 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


#ifndef RELEASE

/* #define DEBUGGING */                           /* Activate debugging part of the code */



#endif

/*#define WMOPS*/                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
@@ -176,6 +177,9 @@ 
#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

#define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING           /* Ericsson: issue 1180, corrected long term mute loop attnuation after 200ms  in PhECU-PLC  */

# ifdef DEBUGGING 

#   define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING_DEBUG     /* Ericsson FORCE HQ music mode at 32 kbps for PLC simulations, -force HQ is not  working at 32 kbps */  

# endif



/* ##################### End NON-BE switches ########################### */

lib_enc/mdct_classifier.c

+7 −0
Original line number Diff line number Diff line
@@ -347,6 +347,13 @@ int16_t mdct_classifier( 
    hTcxEnc->last_gain1 = gain1;

    hTcxEnc->last_gain2 = gain2;





#ifdef DEBUGGING 

#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING_DEBUG 

        clas_final = HQ_CORE; 

#endif 

#endif 



    return clas_final;

}

lib_enc/mdct_selector.c

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,12 @@ void MDCT_selector( 
            st->core = TCX_20_CORE;

        }



#ifdef DEBUGGING

#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING_DEBUG

        st->core = HQ_CORE;

#endif

#endif 





        /* Update memories */

        if ( hi_sparse <= 0 )

lib_enc/speech_music_classif.c

+5 −0
Original line number Diff line number Diff line
@@ -352,6 +352,11 @@ void speech_music_classif( 
        st->sp_aud_decision0 = st->sp_aud_decision1;

    }



#ifdef FORCE_AUDIO_DECISION

    st->sp_aud_decision1 = 1;

    sp_aud_decision 

#endif





    return;

}

lib_enc/pre_proc.c

+1 −1

File changed.

Contains only whitespace changes.