Commit 98330c5e authored by vaclav's avatar vaclav
Browse files

Merge branch 'float-880-ivas_dec_file_name' into 'main' 

move back ivas_dec() into ivas_dec.c

See merge request !2509
parents 0064f65d d4b6659a

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
@@ -219,7 +220,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+3 −6
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -49,9 +46,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -515,6 +509,9 @@ 
      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">

lib_dec/ivas_dec.c

+1202 −7

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_jbm_dec.c→lib_dec/ivas_dec_render.c

+832 −2046

File changed and moved.

Preview size limit exceeded, changes collapsed.