Commit 2e49f789 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 631-ubsan-initsplitrend-tries-to-access-null-pointer
parents 6717da41 d37ae1e8

Workspace_msvc/lib_dec.vcxproj

+0 −3
Original line number Diff line number Diff line
@@ -271,10 +271,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />

    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_rom_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ 
    <ClCompile Include="..\lib_rend\ivas_splitRendererPLC.c" />

    <ClCompile Include="..\lib_rend\ivas_crend.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_efap.c" />

    <ClCompile Include="..\lib_rend\ivas_limiter.c" />

    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -2352,7 +2352,6 @@ static ivas_error decodeVoIP( 
    uint32_t nextPacketRcvTime_ms = 0;

    uint32_t systemTime_ms = 0;

    uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;

    int32_t nFramesWritten = 0;

    int32_t nFramesFed = 0;
@@ -2710,7 +2709,6 @@ static ivas_error decodeVoIP( 


        frame++;

        systemTime_ms += systemTimeInc_ms;

        nFramesWritten++;



#ifdef WMOPS

        update_mem();

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -3485,7 +3485,7 @@ static void parseSceneDescriptionFile( 
    return;

}



static void printSupportedAudioConfigs()

static void printSupportedAudioConfigs( void )

{

    uint16_t i;

    const char *supportedFormats[] = {