Commit 8b1739b3 authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1010-complexity-high-complexity-overhead-for-parammc-decoding
parents 42cfa92c d5b43b02

Workspace_msvc/lib_enc.vcxproj

+1 −17
Original line number Diff line number Diff line
@@ -381,18 +381,10 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\noise_adjust.c" />

    <ClCompile Include="..\lib_enc\nois_est.c" />

    <ClCompile Include="..\lib_enc\normalizecoefs.c" />

    <ClCompile Include="..\lib_enc\peak_vq_enc.c" />

    <ClCompile Include="..\lib_enc\pitch_ol.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2.c" />

    <ClCompile Include="..\lib_enc\pit_enc.c" />

    <ClCompile Include="..\lib_enc\plc_enc_ext.c" />

    <ClCompile Include="..\lib_enc\ppp_enc.c" />

    <ClCompile Include="..\lib_enc\pre_proc.c" />

    <ClCompile Include="..\lib_enc\pvq_core_enc.c" />

    <ClCompile Include="..\lib_enc\pvq_encode.c" />

    <ClCompile Include="..\lib_enc\qlpc_avq.c" />

    <ClCompile Include="..\lib_enc\q_gain2p.c" />

    <ClCompile Include="..\lib_enc\rom_enc.c" />

    <ClCompile Include="..\lib_enc\setmodeindex.c" />

    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
@@ -408,22 +400,14 @@ 
    <ClCompile Include="..\lib_enc\update_decision_fx.c" />

    <ClCompile Include="..\lib_enc\updt_enc_fx.c" />

    <ClCompile Include="..\lib_enc\updt_tar_fx.c" />

    <ClCompile Include="..\lib_enc\vad.c" />

    <ClCompile Include="..\lib_enc\vad_basop_fx.c" />

    <ClCompile Include="..\lib_enc\vad_fx.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt.c" />

    <ClCompile Include="..\lib_enc\vad_param_updt_fx.c" />

    <ClCompile Include="..\lib_enc\vad_proc.c" />

    <ClCompile Include="..\lib_enc\vad_proc_fx.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate.c" />

    <ClCompile Include="..\lib_enc\vbr_average_rate_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_1st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c" />

    <ClCompile Include="..\lib_enc\vlpc_2st_cod_fx.c" />

    <ClCompile Include="..\lib_enc\voiced_enc.c" />

    <ClCompile Include="..\lib_enc\voiced_enc_fx.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c" />

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c" />

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_enc.vcxproj.filters

+1 −48
Original line number Diff line number Diff line
@@ -67,30 +67,14 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ppp_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\plc_enc_ext.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pre_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vbr_average_rate.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\voiced_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\q_gain2p.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ltd_stable.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ari_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -238,12 +222,6 @@ 
    <ClCompile Include="..\lib_enc\noise_adjust.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\normalizecoefs.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\peak_vq_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -253,37 +231,12 @@ 
    <ClCompile Include="..\lib_enc\pitch_ol2.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pvq_core_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pvq_encode.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\qlpc_avq.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\rom_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\setmodeindex.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_pre_proc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad_param_updt.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vlpc_1st_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vlpc_2st_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\waveadjust_fec_cod.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\comvad_decision.c">

apps/encoder.c

+41 −1
Original line number Diff line number Diff line
@@ -353,6 +353,15 @@ int main( 
        goto cleanup;

    }



#ifdef SUPPORT_FORCE_TCX10_TCX20

#ifdef DEBUGGING

    if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )

    {

        fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );

    }

#endif

#endif



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

     * Configure and initialize (allocate memory for static variables) the encoder

     *------------------------------------------------------------------------------------------*/
@@ -998,7 +1007,24 @@ static bool parseCmdlIVAS_enc( 
            }

            else

            {

#ifdef SUPPORT_FORCE_TCX10_TCX20

                if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )

                {

                    strcpy( stmp, "TCX10" );

                }

                else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )

                {

                    strcpy( stmp, "TCX20" );

                }

                else

                {

                    strncpy( stmp, argv[i + 1], sizeof( stmp ) );

                }



                fprintf( stdout, "Forcing codec to:       %s\n", stmp );

#else

                fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );

#endif

            }



            i += 2;
@@ -1919,10 +1945,24 @@ static IVAS_ENC_FORCED_MODE parseForcedMode( 
    {

        return IVAS_ENC_FORCE_GSC;

    }

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 )

#ifdef SUPPORT_FORCE_TCX10_TCX20

         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )

#endif

    )

    {

#ifdef SUPPORT_FORCE_TCX10_TCX20

        return IVAS_ENC_FORCE_TCX20;

#else

        return IVAS_ENC_FORCE_TCX;

#endif

    }

#ifdef SUPPORT_FORCE_TCX10_TCX20

    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_TCX10;

    }

#endif

    if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_HQ;

lib_com/arith_coder_fx.c

+1 −17
Original line number Diff line number Diff line
@@ -224,11 +224,7 @@ void tcx_arith_scale_envelope( 


        tmp = norm_l( env[k] );

        tmp2 = sub( 15, tmp );

#ifdef BASOP_NOGLOB

        tmp = Inv16( round_fx_o( L_shl_o( env[k], tmp, &Overflow ), &Overflow ), &tmp2 ); /* exp(tmp2) */

#else

        tmp = Inv16( round_fx( L_shl( env[k], tmp ) ), &tmp2 );

#endif

        ienv[k] = L_shl( L_deposit_h( tmp ), sub( tmp2, 15 ) );                           /* Q16 */

        move32();

        mean = L_add( mean, ienv[k] ); /* Q16 */
@@ -276,11 +272,7 @@ void tcx_arith_scale_envelope( 


    tmp2 = BASOP_Util_Add_MantExp( negate( b ), b_e, tmp, tmp2, &scale ); /* exp(scale) */

    scale = BASOP_Util_Divide1616_Scale( scale, round_fx( a ), &tmp );

#ifdef BASOP_NOGLOB

    scale = shl_o( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ), &Overflow ); /* Q15 */

#else

    scale = shl( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ) ); /* Q15 */

#endif



    /* iscale = 1.0f / scale; */

    iscale_e = 0;
@@ -329,11 +321,7 @@ void tcx_arith_scale_envelope( 
                L_tmp = L_add( L_tmp, L_shl( Mpy_32_16_1( env[k], mult_r( 1147 /*0.035f Q15*/, iscale ) ), iscale_e ) ); /* Q16 */



                tmp = norm_l( L_tmp );

#ifdef BASOP_NOGLOB

                statesi = mult_r( statesi, round_fx_o( L_shl_o( L_tmp, tmp, &Overflow ), &Overflow ) );

#else

                statesi = mult_r( statesi, round_fx( L_shl( L_tmp, tmp ) ) );

#endif

                bits = add( bits, sub( 15, tmp ) );



                tmp = norm_s( statesi );
@@ -420,11 +408,7 @@ void tcx_arith_scale_envelope( 
    *s_env_e = sub( add( 15, iscale_e ), tmp );

    move16();

    BASOP_SATURATE_WARNING_OFF_EVS;

#ifdef BASOP_NOGLOB

    a = L_shl_o( 1265000, sub( 15, *s_env_e ), &Overflow );

#else /* BASOP_NOGLOB */

    a = L_shl( 1265000, sub( 15, *s_env_e ) );

#endif

    BASOP_SATURATE_WARNING_ON_EVS;



    FOR( k = 0; k < L_frame; k++ )

lib_com/basop32.c

+0 −300

File changed.

Preview size limit exceeded, changes collapsed.