Commit 3910a0ba authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 2122_basop_delay_alignment_split_rendering_and_external_rend_crashes_omasa

parents 93d61051 57b3a061

Workspace_msvc/ambi_converter.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
      <Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_debug.vcxproj">

      <Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

Workspace_msvc/decoder.vcxproj

+1 −3
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\decoder.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\test_mdct.c" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_basop.vcxproj">

Workspace_msvc/lib_enc.vcxproj.filters

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>

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

      <Filter>encoder_evs_c</Filter>

    </ClCompile>
@@ -596,6 +593,9 @@ 
    <ClCompile Include="..\lib_enc\rom_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_util.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
    <ClCompile Include="..\lib_util\cmdl_tools.c" />

    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />

    <ClCompile Include="..\lib_util\hrtf_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_reader.c" />
@@ -121,6 +120,7 @@ 
    <ClCompile Include="..\lib_util\masa_file_reader.c" />

    <ClCompile Include="..\lib_util\masa_file_writer.c" />

    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\obj_edit_file_reader.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />
@@ -145,6 +145,7 @@ 
    <ClInclude Include="..\lib_util\jbm_file_writer.h" />

    <ClInclude Include="..\lib_util\ls_custom_file_reader.h" />

    <ClInclude Include="..\lib_util\mime_io.h" />

    <ClInclude Include="..\lib_util\obj_edit_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_writer.h" />

    <ClInclude Include="..\lib_util\render_config_reader.h" />

apps/decoder.c

+390 −53

File changed.

Preview size limit exceeded, changes collapsed.