Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 11:18:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: move clHCA to coding to simplify

Browse Source 
Also has changed a lot from the original so it's barely external now
This commit is contained in:
bnnm 2021-08-14 11:39:54 +02:00
parent bb445efea1
commit 36cf5c18f4
9 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.autotools.am
View File

@ -10,10 +10,8 @@ SUBDIRS = coding layout meta
# sources/headers are updated automatically by ./bootstrap script (not all headers are needed though) # sources/headers are updated automatically by ./bootstrap script (not all headers are needed though)
libvgmstream_la_LDFLAGS = coding/libcoding.la layout/liblayout.la meta/libmeta.la libvgmstream_la_LDFLAGS = coding/libcoding.la layout/liblayout.la meta/libmeta.la
libvgmstream_la_SOURCES = (auto-updated) libvgmstream_la_SOURCES = (auto-updated)
libvgmstream_la_SOURCES += ../ext_libs/clHCA.c
libvgmstream_la_LIBADD = -lm libvgmstream_la_LIBADD = -lm
EXTRA_DIST = (auto-updated) EXTRA_DIST = (auto-updated)
EXTRA_DIST += ../ext_includes/clHCA.h
AM_CFLAGS += -DVGM_USE_G7221 AM_CFLAGS += -DVGM_USE_G7221

2
src/coding/coding.h
View File

@ -2,6 +2,8 @@
#define _CODING_H #define _CODING_H
#include "../vgmstream.h" #include "../vgmstream.h"
//todo remove
#include "hca_decoder_clhca.h"
/* adx_decoder */ /* adx_decoder */
void decode_adx(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do, int32_t frame_bytes, coding_t coding_type); void decode_adx(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do, int32_t frame_bytes, coding_t coding_type);

2
src/coding/hca_decoder.c
View File

@ -1,5 +1,5 @@
#include "coding.h" #include "coding.h"
#include <clHCA.h> #include "hca_decoder_clhca.h"
struct hca_codec_data { struct hca_codec_data {

2
ext_libs/clHCA.c → src/coding/hca_decoder_clhca.c
View File

@ -25,7 +25,7 @@
//-------------------------------------------------- //--------------------------------------------------
// Includes // Includes
//-------------------------------------------------- //--------------------------------------------------
#include "clHCA.h" #include "hca_decoder_clhca.h"
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <memory.h> #include <memory.h>

0
ext_includes/clHCA.h → src/coding/hca_decoder_clhca.h
View File

4
src/libvgmstream.vcxproj
View File

@ -83,7 +83,7 @@
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\ext_includes\clHCA.h" /> <ClInclude Include="coding\hca_decoder_clhca.h" />
<ClInclude Include="coding\mpeg_bitreader.h" /> <ClInclude Include="coding\mpeg_bitreader.h" />
<ClInclude Include="coding\mpeg_decoder.h" /> <ClInclude Include="coding\mpeg_decoder.h" />
<ClInclude Include="coding\vorbis_bitreader.h" /> <ClInclude Include="coding\vorbis_bitreader.h" />
@ -622,6 +622,7 @@
<ClCompile Include="coding\g7221_decoder_aes.c" /> <ClCompile Include="coding\g7221_decoder_aes.c" />
<ClCompile Include="coding\g7221_decoder_lib.c" /> <ClCompile Include="coding\g7221_decoder_lib.c" />
<ClCompile Include="coding\hca_decoder.c" /> <ClCompile Include="coding\hca_decoder.c" />
<ClCompile Include="coding\hca_decoder_clhca.c" />
<ClCompile Include="coding\ima_decoder.c" /> <ClCompile Include="coding\ima_decoder.c" />
<ClCompile Include="coding\imuse_decoder.c" /> <ClCompile Include="coding\imuse_decoder.c" />
<ClCompile Include="coding\l5_555_decoder.c" /> <ClCompile Include="coding\l5_555_decoder.c" />
@ -706,7 +707,6 @@
<ClCompile Include="layout\blocked_xa.c" /> <ClCompile Include="layout\blocked_xa.c" />
<ClCompile Include="layout\blocked_xa_aiff.c" /> <ClCompile Include="layout\blocked_xa_aiff.c" />
<ClCompile Include="layout\blocked_xvas.c" /> <ClCompile Include="layout\blocked_xvas.c" />
<ClCompile Include="..\ext_libs\clHCA.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

10
src/libvgmstream.vcxproj.filters
View File

@ -263,8 +263,8 @@
<ClInclude Include="layout\layout.h"> <ClInclude Include="layout\layout.h">
<Filter>layout\Header Files</Filter> <Filter>layout\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\ext_includes\clHCA.h"> <ClInclude Include="coding\hca_decoder_clhca.h">
<Filter>ext_libs\Header Files</Filter> <Filter>coding\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="coding\mpeg_bitreader.h"> <ClInclude Include="coding\mpeg_bitreader.h">
<Filter>coding\Header Files</Filter> <Filter>coding\Header Files</Filter>
@ -1333,6 +1333,9 @@
<ClCompile Include="coding\hca_decoder.c"> <ClCompile Include="coding\hca_decoder.c">
<Filter>coding\Source Files</Filter> <Filter>coding\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="coding\hca_decoder_clhca.c">
<Filter>coding\Source Files</Filter>
</ClCompile>
<ClCompile Include="coding\ima_decoder.c"> <ClCompile Include="coding\ima_decoder.c">
<Filter>coding\Source Files</Filter> <Filter>coding\Source Files</Filter>
</ClCompile> </ClCompile>
@ -1789,9 +1792,6 @@
<ClCompile Include="coding\g719_decoder.c"> <ClCompile Include="coding\g719_decoder.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\ext_libs\clHCA.c">
<Filter>ext_libs\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\ffmpeg.c"> <ClCompile Include="meta\ffmpeg.c">
<Filter>meta\Source Files</Filter> <Filter>meta\Source Files</Filter>
</ClCompile> </ClCompile>

2
src/meta/hca.c
View File

@ -1,7 +1,7 @@
#include "meta.h" #include "meta.h"
#include "hca_keys.h" #include "hca_keys.h"
#include "../coding/coding.h" #include "../coding/coding.h"
#include <clHCA.h> #include "../coding/hca_decoder_clhca.h"
//#define HCA_BRUTEFORCE //#define HCA_BRUTEFORCE
#ifdef HCA_BRUTEFORCE #ifdef HCA_BRUTEFORCE

2
src/vgmstream.h
View File

@ -42,8 +42,6 @@ enum {
#include <aacdecoder_lib.h> #include <aacdecoder_lib.h>
#endif #endif
#include <clHCA.h>
#include "coding/g72x_state.h" #include "coding/g72x_state.h"