Skip to content
This repository
Browse code

update COPYING, README, wavpack.h

  • Loading branch information...
commit 406e8332f19dab00e6083883276735d7f47d3542 1 parent f6ef710
nu774 authored

Showing 3 changed files with 18 additions and 37 deletions. Show diff stats Hide diff stats

  1. +2 5 COPYING
  2. +2 5 README.rst
  3. +14 27 include/wavpack.h
7 COPYING
@@ -12,9 +12,6 @@ Files under taglib:
12 12 These are part of TagLib (http://developer.kde.org/~wheeler/taglib.html),
13 13 version 1.7.0
14 14
15   -include/fp.h, include/Math64.h:
16   -These are part of QuickTimeSDK, and slightly modified for gcc compatibility.
17   -
18 15 utf8_codecvt_facet.[ch]pp:
19 16 These are part of Boost (http://www.boost.org/),
20 17 version 1.45.0
@@ -36,8 +33,8 @@ version 1.0.24
36 33
37 34 include/wavpack.h:
38 35 This is a header file of WavPack (http://www.wavpack.com/),
39   -version 4.50.1
40   -Slightly modified due to incompatibility with QuickTime's stdint.h.
  36 +version 4.60.1
  37 +Slightly modified due to incompatibility with MSVC's stdint.h.
41 38
42 39 include/tak_deco_lib.h:
43 40 This is a header file of TAK (http://www.thbeck.de/Tak/Tak.html),
7 README.rst
Source Rendered
@@ -4,8 +4,5 @@ qaac - CLI QuickTime AAC/ALAC encoder
4 4
5 5 How to build
6 6 ------------
7   -You need QuickTime SDK 7.3 for Windows to build qaac. You can download QuickTime SDK from http://developer.apple.com/quicktime/ (registration is required).
8   -
9   -SDK is installed under C:/Program Files/QuickTime SDK (or C:/Program Files (x86)/QuickTime SDK, if you are using 64bit OS).
10   -
11   -You have to modify qaac.props, if your SDK install directory is different from the project settings.
  7 +You need Microsoft Visual C++ 2010 to build qaac/refalac.
  8 +AMD64 build is only available for refalac.
41 include/wavpack.h
@@ -16,29 +16,11 @@
16 16
17 17 #include <sys/types.h>
18 18
19   -#if 0
20 19 #if defined(_WIN32) && !defined(__MINGW32__)
21 20 #include <stdlib.h>
22   -typedef unsigned __int64 uint64_t;
23   -typedef unsigned __int32 uint32_t;
24   -typedef unsigned __int16 uint16_t;
25   -typedef unsigned __int8 uint8_t;
26   -typedef __int64 int64_t;
27   -typedef __int32 int32_t;
28   -typedef __int16 int16_t;
29   -typedef __int8 int8_t;
30   -typedef float float32_t;
31 21 #else
32 22 #include <inttypes.h>
33 23 #endif
34   -#endif
35   -
36   -typedef unsigned char uchar;
37   -
38   -#if !defined(__GNUC__) || defined(WIN32)
39   -typedef unsigned short ushort;
40   -typedef unsigned int uint;
41   -#endif
42 24
43 25 // RIFF / wav header formats (these occur at the beginning of both wav files
44 26 // and pre-4.0 WavPack files that are not in the "raw" mode). Generally, an
@@ -59,12 +41,12 @@ typedef struct {
59 41 #define ChunkHeaderFormat "4L"
60 42
61 43 typedef struct {
62   - ushort FormatTag, NumChannels;
  44 + unsigned short FormatTag, NumChannels;
63 45 uint32_t SampleRate, BytesPerSecond;
64   - ushort BlockAlign, BitsPerSample;
65   - ushort cbSize, ValidBitsPerSample;
  46 + unsigned short BlockAlign, BitsPerSample;
  47 + unsigned short cbSize, ValidBitsPerSample;
66 48 int32_t ChannelMask;
67   - ushort SubFormat;
  49 + unsigned short SubFormat;
68 50 char GUID [14];
69 51 } WaveHeader;
70 52
@@ -81,7 +63,7 @@ typedef struct {
81 63 char ckID [4];
82 64 uint32_t ckSize;
83 65 short version;
84   - uchar track_no, index_no;
  66 + unsigned char track_no, index_no;
85 67 uint32_t total_samples, block_index, block_samples, flags, crc;
86 68 } WavpackHeader;
87 69
@@ -166,7 +148,7 @@ typedef struct {
166 148 int bits_per_sample, bytes_per_sample;
167 149 int qmode, flags, xmode, num_channels, float_norm_exp;
168 150 int32_t block_samples, extra_flags, sample_rate, channel_mask;
169   - uchar md5_checksum [16], md5_read;
  151 + unsigned char md5_checksum [16], md5_read;
170 152 int num_tag_strings;
171 153 char **tag_strings;
172 154 } WavpackConfig;
@@ -189,6 +171,7 @@ typedef struct {
189 171 #define CONFIG_SKIP_WVX 0x4000000 // no wvx stream w/ floats & big ints
190 172 #define CONFIG_MD5_CHECKSUM 0x8000000 // store MD5 signature
191 173 #define CONFIG_MERGE_BLOCKS 0x10000000 // merge blocks of equal redundancy (for lossyWAV)
  174 +#define CONFIG_PAIR_UNDEF_CHANS 0x20000000 // encode undefined channels in stereo pairs
192 175 #define CONFIG_OPTIMIZE_MONO 0x80000000 // optimize for mono streams posing as stereo
193 176
194 177 ////////////// Callbacks used for reading & writing WavPack streams //////////
@@ -263,9 +246,9 @@ int WavpackGetNumChannels (WavpackContext *wpc);
263 246 int WavpackGetChannelMask (WavpackContext *wpc);
264 247 int WavpackGetReducedChannels (WavpackContext *wpc);
265 248 int WavpackGetFloatNormExp (WavpackContext *wpc);
266   -int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16]);
  249 +int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16]);
267 250 uint32_t WavpackGetWrapperBytes (WavpackContext *wpc);
268   -uchar *WavpackGetWrapperData (WavpackContext *wpc);
  251 +unsigned char *WavpackGetWrapperData (WavpackContext *wpc);
269 252 void WavpackFreeWrapper (WavpackContext *wpc);
270 253 void WavpackSeekTrailingWrapper (WavpackContext *wpc);
271 254 double WavpackGetProgress (WavpackContext *wpc);
@@ -276,14 +259,18 @@ double WavpackGetInstantBitrate (WavpackContext *wpc);
276 259 int WavpackGetNumTagItems (WavpackContext *wpc);
277 260 int WavpackGetTagItem (WavpackContext *wpc, const char *item, char *value, int size);
278 261 int WavpackGetTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
  262 +int WavpackGetNumBinaryTagItems (WavpackContext *wpc);
  263 +int WavpackGetBinaryTagItem (WavpackContext *wpc, const char *item, char *value, int size);
  264 +int WavpackGetBinaryTagItemIndexed (WavpackContext *wpc, int index, char *item, int size);
279 265 int WavpackAppendTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
  266 +int WavpackAppendBinaryTagItem (WavpackContext *wpc, const char *item, const char *value, int vsize);
280 267 int WavpackDeleteTagItem (WavpackContext *wpc, const char *item);
281 268 int WavpackWriteTag (WavpackContext *wpc);
282 269
283 270 WavpackContext *WavpackOpenFileOutput (WavpackBlockOutput blockout, void *wv_id, void *wvc_id);
284 271 int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples);
285 272 int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount);
286   -int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16]);
  273 +int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16]);
287 274 int WavpackPackInit (WavpackContext *wpc);
288 275 int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count);
289 276 int WavpackFlushSamples (WavpackContext *wpc);

0 comments on commit 406e833

Please sign in to comment.
Something went wrong with that request. Please try again.