Commit 273335ab authored by vaclav's avatar vaclav
Browse files

simplify the condition

parent 9f26f8d7

lib_dec/core_switching_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ ivas_error core_switching_pre_dec( 


#ifdef NONBE_1214_PLC_LSF_MEMORY

    if ( ( ( st->core == ACELP_CORE || st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) || ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD || ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && nchan_out == 2 && st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA && ( last_core_brate_st0 == FRAME_NO_DATA || last_core_brate_st0 == SID_2k40 ) ) ||

         ( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k && st->L_frame <= L_FRAME16k && st->element_mode > EVS_MONO ) /* TCX @ 25.6/32 kHz -> ACELP */ )

         ( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k ) /* TCX @ 25.6/32 kHz -> ACELP */ )

#else

    if ( ( ( st->core == ACELP_CORE || st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) || ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD || ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && nchan_out == 2 &&

                                                                                                    st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA && ( last_core_brate_st0 == FRAME_NO_DATA || last_core_brate_st0 == SID_2k40 ) ) )

lib_enc/core_switching_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void core_switching_pre_enc( 


#ifdef NONBE_1214_PLC_LSF_MEMORY

    if ( ( ( st->core == ACELP_CORE || st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) || ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD || ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && active_cnt == 1 ) ||

         ( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k && st->L_frame <= L_FRAME16k && st->element_mode > EVS_MONO ) /* TCX @ 25.6/32 kHz -> ACELP */ )

         ( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k ) /* TCX @ 25.6/32 kHz -> ACELP */ )

#else

    if ( ( ( st->core == ACELP_CORE || st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) || ( ( st->element_mode == IVAS_CPE_DFT || st->element_mode == IVAS_CPE_TD || ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && active_cnt == 1 ) )

#endif