Commit e678e508 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 !2768
parents c0947d4a eba73d93

Workspace_msvc/lib_dec.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ 
    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />

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

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

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

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

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

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

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
@@ -222,7 +224,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -362,9 +359,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -509,6 +503,12 @@ 
    <ClCompile Include="..\lib_dec\rom_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

lib_dec/ivas_dec_fx.c

0 → 100644
+1565 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_jbm_dec_fx.c→lib_dec/ivas_dec_render_fx.c

+1182 −2701

File changed and moved.

Preview size limit exceeded, changes collapsed.