Commit ca30b7ea authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into float-1537-make-clang-the-default-compiler-in-makefile-and-cmakelists-txt

parents 8bfe7d77 a6b0e09b

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 
    <ClCompile Include="..\lib_com\gain_inov_fx.c" />

    <ClCompile Include="..\lib_com\get_gain_fx.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />

    <ClCompile Include="..\lib_com\gs_gains_fx.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c" />

    <ClCompile Include="..\lib_com\gs_noisefill_fx.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −6
Original line number Diff line number Diff line
@@ -265,12 +265,6 @@ 
    <ClCompile Include="..\lib_com\get_gain_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\gs_gains_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -481,6 +475,9 @@ 
    <ClCompile Include="..\lib_com\rom_com_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\ivas_error.h">

Workspace_msvc/lib_enc.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ 
    <ClCompile Include="..\lib_enc\igf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

apps/decoder.c

+4 −6
Original line number Diff line number Diff line
@@ -2962,6 +2962,8 @@ static ivas_error decodeVoIP( 


            *phIvasDec = hIvasDec; /* Update for main()' s free */

            ivasRtp.restartNeeded = false;

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

        }



        /* reference vector */
@@ -3211,6 +3213,8 @@ static ivas_error decodeVoIP( 
                    }



                    *phIvasDec = hIvasDec; /* Update for main()' s free */

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

                }



                /* Placeholder for memory reallocation */
@@ -3974,12 +3978,6 @@ static ivas_error restartDecoder( 
        }

    }



    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )