Commit 07bd5230 authored by Manuel Jander's avatar Manuel Jander
Browse files

Resolve merge conflict.

parents 4ae49556 525fb9bc

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ 
#define FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS         /* FhG: BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs() */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC        /* VA : Basop issue 2547: Align conditions in core sw dec */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS    /* VA : Basop issue 2547: Align conditions in core sw dec, condition that could affect EVS as well, but adapted to keep EVS BE */





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

lib_dec/core_switching_dec_fx.c

+38 −3
Original line number Diff line number Diff line
@@ -183,8 +183,13 @@ void bw_switching_pre_proc_fx( 
    {

        st_fx->prev_ener_shb_fx = 0;

        move16();

#ifdef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

        IF( st_fx->hBWE_FD != NULL )

#endif

        {

            set16_fx( st_fx->hBWE_FD->prev_SWB_fenv_fx, 0, SWB_FENV );

        }

    }

    ELSE IF( ( ( st_fx->core == ACELP_CORE && ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) ) ) || ( EQ_16( st_fx->core, st_fx->last_core ) && NE_16( st_fx->extl, st_fx->last_extl ) ) ) && GE_16( st_fx->last_bwidth, SWB ) )

    {

        st_fx->attenu_fx = 3277; /* Q15 */
@@ -567,7 +572,11 @@ ivas_error core_switching_post_dec_fx( 
                hBWE_TD->bwe_non_lin_prev_scale_fx = L_deposit_l( 0 );

                move32();

            }

#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

            IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && EQ_32( st_fx->core_brate, HQ_32k ) ) )

#else

            IF( st_fx->hHQ_core != NULL && !( EQ_16( inner_frame_tbl[st_fx->bwidth], L_FRAME16k ) && LE_32( st_fx->core_brate, HQ_32k ) ) )

#endif

            {

                set32_fx( hHQ_core->prev_env_fx, 0, SFM_N_WB );

                set32_fx( hHQ_core->prev_normq_fx, 0, SFM_N_WB );
@@ -725,9 +734,31 @@ ivas_error core_switching_post_dec_fx( 
    test();

    test();

    test();

    IF( ( st_fx->hBWE_FD != NULL ) && ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) || ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) ||

                                        ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) && st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) || ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )

#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS

    IF( ( st_fx->hBWE_FD != NULL ) &&

        ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) || ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) || ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) && st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) || ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) && ( ( NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) ) || ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) ) && st_fx->bws_cnt > 0 ) ) )

#else

    IF( st_fx->hBWE_FD != NULL &&

        ( ( NE_16( st_fx->last_extl, SWB_BWE ) && EQ_16( st_fx->extl, SWB_BWE ) ) ||

          ( NE_16( st_fx->last_extl, FB_BWE ) && EQ_16( st_fx->extl, FB_BWE ) ) ||

          ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

            ( NE_16( st_fx->prev_coder_type, AUDIO ) && EQ_16( st_fx->coder_type, AUDIO ) ) &&

            st_fx->bws_cnt > 0 ) ||

          ( st_fx->element_mode == EVS_MONO &&

            ( ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&

                st_fx->extl < 0 && NE_16( st_fx->core, HQ_CORE ) ) ||

              ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

                NE_16( st_fx->prev_coder_type, INACTIVE ) && EQ_16( st_fx->coder_type, INACTIVE ) &&

                st_fx->bws_cnt > 0 ) ) ) ||

          ( st_fx->element_mode != EVS_MONO &&

            ( ( ( EQ_16( st_fx->last_core, HQ_CORE ) || EQ_16( st_fx->last_core, TCX_20_CORE ) || EQ_16( st_fx->last_core, TCX_10_CORE ) || EQ_16( st_fx->last_extl, SWB_TBE ) ) &&

                st_fx->extl < 0 && EQ_16( st_fx->core, ACELP_CORE ) ) ||

              ( EQ_16( st_fx->last_core, ACELP_CORE ) && EQ_16( st_fx->core, ACELP_CORE ) &&

                NE_16( st_fx->prev_coder_type, INACTIVE ) && NE_16( st_fx->coder_type, INACTIVE ) &&

                st_fx->bws_cnt > 0 ) ) ) ) )

#endif

    {



        set16_fx( hBWE_FD->L_old_wtda_swb_fx, 0, output_frame );

        hBWE_FD->old_wtda_swb_fx_exp = 0;

        move16();
@@ -852,7 +883,11 @@ ivas_error core_switching_post_dec_fx( 


        /* reset WB TBE buffers */

        test();

#ifndef FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC

        IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) )

#else

        IF( NE_16( st_fx->last_extl, WB_TBE ) && EQ_16( st_fx->extl, WB_TBE ) && NE_16( st_fx->last_core, TCX_20_CORE ) && NE_16( st_fx->last_core, TCX_10_CORE ) )

#endif

        {

            wb_tbe_extras_reset_fx( hBWE_TD->mem_genSHBexc_filt_down_wb2_fx, hBWE_TD->mem_genSHBexc_filt_down_wb3_fx );

            wb_tbe_extras_reset_synth_fx( hBWE_TD->state_lsyn_filt_shb_fx, hBWE_TD->state_lsyn_filt_dwn_shb_fx, hBWE_TD->state_32and48k_WB_upsample_fx, hBWE_TD->mem_resamp_HB_fx );

lib_util/tinywavein_c.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <stdlib.h>

#include <string.h>



#if defined( __i386__ ) || defined( _M_IX86 ) || defined( __x86_64__ ) || defined( _M_X64 ) || defined( __arm__ ) || defined( __aarch64__ ) || ( defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ )

#if defined( __i386__ ) || defined( _M_IX86 ) || defined( __x86_64__ ) || defined( _M_X64 ) || defined( __arm__ ) || defined( __aarch64__ ) || defined( _M_ARM ) || defined( _M_ARM64 ) || ( defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ )

#define __TWI_LE /* _T_iny _W_ave _I_n _L_ittle _E_ndian */

#endif

lib_util/tinywaveout_c.h

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <stdio.h>

#include <stdlib.h>



#if defined( __i386__ ) || defined( _M_IX86 ) || defined( _M_X64 ) || defined( __x86_64__ ) || defined( __arm__ ) || defined( __aarch64__ ) || ( defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ )

#if defined( __i386__ ) || defined( _M_IX86 ) || defined( _M_X64 ) || defined( __x86_64__ ) || defined( __arm__ ) || defined( __aarch64__ ) || defined( _M_ARM ) || defined( _M_ARM64 ) || ( defined( __BYTE_ORDER__ ) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ )

#define __TWO_LE /* _T_iny _W_ave _O_ut _L_ittle _E_ndian */

#endif
@@ -47,7 +47,7 @@ 


#if !defined( __TWO_LE ) && !defined( __TWO_BE )

#pragma message( "unknown processor - assuming Little Endian" )

#define __TWI_LE

#define __TWO_LE

#endif



#define __TWO_SUCCESS ( 0 )
@@ -97,7 +97,6 @@ typedef struct tinyWaveOutDataChunk 
{

    uint32_t dataType;

    uint32_t dataSize;



} tinyWaveOutDataChunk;



typedef struct tinyWaveOutHandle