Commit 6f4f68eb authored by Manuel Jander's avatar Manuel Jander
Browse files

merge conflict resolution

parents 0a5f388b 02579bc7

Workspace_msvc/lib_dec.vcxproj

+5 −1
Original line number Diff line number Diff line
@@ -68,7 +68,11 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

<<<<<<< HEAD

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

=======

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

>>>>>>> origin

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -109,7 +113,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_rend;..\lib_lc3plus;..\lib_util;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_basop;..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

lib_dec/ivas_sba_rendering_internal_fx.c

+26 −0
Original line number Diff line number Diff line
@@ -266,6 +266,32 @@ void ivas_stereo2sba_fx( 
}





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

 * ivas_stereo2sba()

 *

 * stereo signal is transformed into SBA in TD domain

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



void ivas_stereo2sba_fx(

    Word32 *input_fx[],       /* i  : core-coder transport stereo channels */

    Word32 *output_fx[],      /* o  : SBA output channels                  */

    const Word16 output_frame /* i  : output frame length per channel      */

)

{

    Word16 n;

    Word32 tmp;



    FOR( n = 0; n < output_frame; n++ )

    {

        tmp = input_fx[0][n];

        output_fx[0][n] = L_shr( L_add( tmp, input_fx[1][n] ), 1 ); /* W = 0.5 * ( L + R ) */

        output_fx[1][n] = L_shr( L_sub( tmp, input_fx[1][n] ), 1 ); /* Y = 0.5 * ( L - R ) */

    }



    return;

}





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

 * ivas_param_mc_mc2sba_cldfb()

 *

lib_enc/swb_pre_proc_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -1177,6 +1177,9 @@ void swb_pre_proc_ivas_fx( 
                CldfbHB_fx = EPSILON_FX;

                move32();

            }

#ifdef FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC

            exp = norm_l( CldfbHB_fx );

#endif

            CldfbHB_fx = L_shl( CldfbHB_fx, exp );   /* CldfbHB_ener = CldfbHB_fl*2^(exp) */

            Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */

            Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );