Skip to content

Commit

Permalink
update vendored wavpack to latest release 5.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Mar 3, 2024
1 parent 252c6c8 commit 5ed715a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
[submodule "external/wavpack"]
path = external/wavpack
url = https://github.com/libsdl-org/wavpack.git
branch = 5.6.0-sdl
branch = 5.7.0-sdl
[submodule "external/libgme"]
path = external/libgme
url = https://github.com/libsdl-org/game-music-emu.git
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1041,6 +1041,7 @@ if(SDL3MIXER_WAVPACK)
set(SDL3MIXER_WAVPACK_ENABLED TRUE)
message(STATUS "Using vendored WavPack")
sdl_check_project_in_subfolder(external/wavpack WavPack SDL3MIXER_VENDORED)
set(WAVPACK_ENABLE_THREADS FALSE)
set(WAVPACK_BUILD_PROGRAMS FALSE)
set(WAVPACK_BUILD_COOLEDIT_PLUGIN OFF)
set(WAVPACK_BUILD_WINAMP_PLUGIN OFF)
Expand Down
11 changes: 9 additions & 2 deletions VisualC/external/include/wavpack/wavpack.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////////////////////
// **** WAVPACK **** //
// Hybrid Lossless Wavefile Compressor //
// Copyright (c) 1998 - 2022 David Bryant. //
// Copyright (c) 1998 - 2024 David Bryant. //
// All Rights Reserved. //
// Distributed under the BSD Software License (see license.txt) //
////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -189,6 +189,7 @@ typedef struct {
#define ID_ALT_MD5_CHECKSUM (ID_OPTIONAL_DATA | 0x9)
#define ID_NEW_CONFIG_BLOCK (ID_OPTIONAL_DATA | 0xa)
#define ID_CHANNEL_IDENTITIES (ID_OPTIONAL_DATA | 0xb)
#define ID_WVX_NEW_BITSTREAM (ID_OPTIONAL_DATA | ID_WVX_BITSTREAM)
#define ID_BLOCK_CHECKSUM (ID_OPTIONAL_DATA | 0xf)

///////////////////////// WavPack Configuration ///////////////////////////////
Expand All @@ -201,7 +202,7 @@ typedef struct {
float bitrate, shaping_weight;
int bits_per_sample, bytes_per_sample;
int qmode, flags, xmode, num_channels, float_norm_exp;
int32_t block_samples, extra_flags, sample_rate, channel_mask;
int32_t block_samples, worker_threads, sample_rate, channel_mask;
unsigned char md5_checksum [16], md5_read;
int num_tag_strings; // this field is not used
char **tag_strings; // this field is not used
Expand All @@ -228,6 +229,7 @@ typedef struct {
#define CONFIG_MD5_CHECKSUM 0x8000000 // store MD5 signature
#define CONFIG_MERGE_BLOCKS 0x10000000 // merge blocks of equal redundancy (for lossyWAV)
#define CONFIG_PAIR_UNDEF_CHANS 0x20000000 // encode undefined channels in stereo pairs
#define CONFIG_OPTIMIZE_32BIT 0x40000000 // new optimizations for 32-bit integer files
#define CONFIG_OPTIMIZE_MONO 0x80000000 // optimize for mono streams posing as stereo

// The lower 8 bits of qmode indicate the use of new features in version 5 that (presently)
Expand Down Expand Up @@ -328,6 +330,11 @@ WavpackContext *WavpackOpenFileInput (const char *infilename, char *error, int f
// (just affects retrieving wrappers & MD5 checksums)
#define OPEN_NO_CHECKSUM 0x800 // don't verify block checksums before decoding

// new for multithreaded

#define OPEN_THREADS_SHFT 12 // specify number of additional worker threads here for
#define OPEN_THREADS_MASK 0xF000 // decode; 0 to disable, otherwise 1-15 added threads

int WavpackGetMode (WavpackContext *wpc);

#define MODE_WVC 0x1
Expand Down
Binary file modified VisualC/external/optional/x64/libwavpack-1.dll
Binary file not shown.
Binary file modified VisualC/external/optional/x86/libwavpack-1.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion external/wavpack
Submodule wavpack updated 69 files
+14 −7 CMakeLists.txt
+1 −1 COPYING
+275 −0 ChangeLog
+3 −6 Makefile.am
+31 −0 NEWS
+1 −1 README.md
+50 −26 audition/cool_wv4.c
+ audition/readme.odt
+ audition/readme.pdf
+25 −11 cli/aiff.c
+1 −5 cli/aiff_write.c
+1 −1 cli/all-tests
+1 −6 cli/caff.c
+1 −1 cli/caff_write.c
+2 −6 cli/dsdiff.c
+1 −1 cli/dsdiff_write.c
+2 −6 cli/dsf.c
+1 −1 cli/dsf_write.c
+1 −1 cli/fast-tests
+366 −167 cli/import_id3.c
+25 −15 cli/riff.c
+1 −1 cli/riff_write.c
+9 −5 cli/utils.c
+7 −2 cli/utils.h
+1 −5 cli/wave64.c
+1 −1 cli/wave64_write.c
+323 −141 cli/wavpack.c
+50 −33 cli/wvgain.c
+2 −2 cli/wvparser.c
+7 −11 cli/wvtag.c
+186 −128 cli/wvtest.c
+77 −43 cli/wvunpack.c
+15 −4 configure.ac
+ doc/WavPack5LibraryDoc.odt
+ doc/WavPack5LibraryDoc.pdf
+79 −16 doc/wavpack_doc.html
+9 −2 include/wavpack.h
+1 −1 license.txt
+41 −6 man/wavpack.1
+3 −1 man/wvgain.1
+1 −1 man/wvtag.1
+9 −1 man/wvunpack.1
+65 −24 src/common_utils.c
+24 −29 src/extra1.c
+26 −31 src/extra2.c
+5 −5 src/libwavpack.vcxproj
+12 −2 src/open_filename.c
+1 −1 src/open_legacy.c
+1 −1 src/open_raw.c
+58 −15 src/open_utils.c
+188 −142 src/pack.c
+5 −6 src/pack_dns.c
+13 −28 src/pack_dsd.c
+510 −79 src/pack_utils.c
+38 −36 src/unpack.c
+1 −1 src/unpack_armv7.S
+17 −8 src/unpack_dsd.c
+15 −2 src/unpack_floats.c
+18 −18 src/unpack_seek.c
+319 −94 src/unpack_utils.c
+121 −23 src/wavpack_local.h
+3 −3 src/wavpack_version.h
+10 −0 wavpack.sln
+5 −5 wavpackdll/wavpackdll.rc
+4 −4 wavpackexe/wavpack.vcxproj
+11 −4 winamp/in_wv.c
+5 −5 wvgainexe/wvgain.vcxproj
+205 −0 wvtestexe/wvtest.vcxproj
+4 −4 wvunpackexe/wvunpack.vcxproj

0 comments on commit 5ed715a

Please sign in to comment.