1 files changed, 206 insertions, 111 deletions

diff --git a/apps/codecs/libwavpack/wavpack.h b/apps/codecs/libwavpack/wavpack.h
index 3aee4718b1..12212bb0f8 100644
--- a/apps/codecs/libwavpack/wavpack.h
+++ b/apps/codecs/libwavpack/wavpack.h
@@ -14,11 +14,10 @@
 
 // This header file contains all the definitions required by WavPack.
 
-// not sure about them.. testing will bring more light into it..
-typedef unsigned char   uchar;
-typedef unsigned short  ushort;
-typedef unsigned long   ulong;
-typedef unsigned int    uint;
+typedef unsigned char   uchar;
+typedef unsigned short  ushort;
+typedef unsigned long   ulong;
+typedef unsigned int    uint;
 
 // This structure is used to access the individual fields of 32-bit ieee
 // floating point numbers. This will not be compatible with compilers that
@@ -54,70 +53,71 @@ typedef struct {
 
 // or-values for "flags"
 
-#define BYTES_STORED    3       // 1-4 bytes/sample
-#define MONO_FLAG       4       // not stereo
-#define HYBRID_FLAG     8       // hybrid mode
-#define JOINT_STEREO    0x10    // joint stereo
-#define CROSS_DECORR    0x20    // no-delay cross decorrelation
-#define HYBRID_SHAPE    0x40    // noise shape (hybrid mode only)
-#define FLOAT_DATA      0x80    // ieee 32-bit floating point data
+#define BYTES_STORED    3       // 1-4 bytes/sample
+#define MONO_FLAG       4       // not stereo
+#define HYBRID_FLAG     8       // hybrid mode
+#define JOINT_STEREO    0x10    // joint stereo
+#define CROSS_DECORR    0x20    // no-delay cross decorrelation
+#define HYBRID_SHAPE    0x40    // noise shape (hybrid mode only)
+#define FLOAT_DATA      0x80    // ieee 32-bit floating point data
 
-#define INT32_DATA      0x100   // special extended int handling
-#define HYBRID_BITRATE  0x200   // bitrate noise (hybrid mode only)
-#define HYBRID_BALANCE  0x400   // balance noise (hybrid stereo mode only)
+#define INT32_DATA      0x100   // special extended int handling
+#define HYBRID_BITRATE  0x200   // bitrate noise (hybrid mode only)
+#define HYBRID_BALANCE  0x400   // balance noise (hybrid stereo mode only)
 
-#define INITIAL_BLOCK   0x800   // initial block of multichannel segment
-#define FINAL_BLOCK     0x1000  // final block of multichannel segment
+#define INITIAL_BLOCK   0x800   // initial block of multichannel segment
+#define FINAL_BLOCK     0x1000  // final block of multichannel segment
 
-#define SHIFT_LSB       13
-#define SHIFT_MASK      (0x1fL << SHIFT_LSB)
+#define SHIFT_LSB       13
+#define SHIFT_MASK      (0x1fL << SHIFT_LSB)
 
-#define MAG_LSB         18
-#define MAG_MASK        (0x1fL << MAG_LSB)
+#define MAG_LSB         18
+#define MAG_MASK        (0x1fL << MAG_LSB)
 
-#define SRATE_LSB       23
-#define SRATE_MASK      (0xfL << SRATE_LSB)
+#define SRATE_LSB       23
+#define SRATE_MASK      (0xfL << SRATE_LSB)
 
-#define IGNORED_FLAGS   0x18000000      // reserved, but ignore if encountered
-#define NEW_SHAPING     0x20000000      // use IIR filter for negative shaping
-#define UNKNOWN_FLAGS   0xC0000000      // also reserved, but refuse decode if
-                                        //  encountered
+#define IGNORED_FLAGS   0x18000000      // reserved, but ignore if encountered
+#define NEW_SHAPING     0x20000000      // use IIR filter for negative shaping
+#define UNKNOWN_FLAGS   0xC0000000      // also reserved, but refuse decode if
+                                        //  encountered
 
 //////////////////////////// WavPack Metadata /////////////////////////////////
 
 // This is an internal representation of metadata.
 
 typedef struct {
+    uchar temp_data [64];
     long byte_length;
     void *data;
     uchar id;
 } WavpackMetadata;
 
-#define ID_OPTIONAL_DATA        0x20
-#define ID_ODD_SIZE             0x40
-#define ID_LARGE                0x80
-
-#define ID_DUMMY                0x0
-#define ID_ENCODER_INFO         0x1
-#define ID_DECORR_TERMS         0x2
-#define ID_DECORR_WEIGHTS       0x3
-#define ID_DECORR_SAMPLES       0x4
-#define ID_ENTROPY_VARS         0x5
-#define ID_HYBRID_PROFILE       0x6
-#define ID_SHAPING_WEIGHTS      0x7
-#define ID_FLOAT_INFO           0x8
-#define ID_INT32_INFO           0x9
-#define ID_WV_BITSTREAM         0xa
-#define ID_WVC_BITSTREAM        0xb
-#define ID_WVX_BITSTREAM        0xc
-#define ID_CHANNEL_INFO         0xd
-
-#define ID_RIFF_HEADER          (ID_OPTIONAL_DATA | 0x1)
-#define ID_RIFF_TRAILER         (ID_OPTIONAL_DATA | 0x2)
-#define ID_REPLAY_GAIN          (ID_OPTIONAL_DATA | 0x3)
-#define ID_CUESHEET             (ID_OPTIONAL_DATA | 0x4)
-#define ID_CONFIG_BLOCK         (ID_OPTIONAL_DATA | 0x5)
-#define ID_MD5_CHECKSUM         (ID_OPTIONAL_DATA | 0x6)
+#define ID_OPTIONAL_DATA        0x20
+#define ID_ODD_SIZE             0x40
+#define ID_LARGE                0x80
+
+#define ID_DUMMY                0x0
+#define ID_ENCODER_INFO         0x1
+#define ID_DECORR_TERMS         0x2
+#define ID_DECORR_WEIGHTS       0x3
+#define ID_DECORR_SAMPLES       0x4
+#define ID_ENTROPY_VARS         0x5
+#define ID_HYBRID_PROFILE       0x6
+#define ID_SHAPING_WEIGHTS      0x7
+#define ID_FLOAT_INFO           0x8
+#define ID_INT32_INFO           0x9
+#define ID_WV_BITSTREAM         0xa
+#define ID_WVC_BITSTREAM        0xb
+#define ID_WVX_BITSTREAM        0xc
+#define ID_CHANNEL_INFO         0xd
+
+#define ID_RIFF_HEADER          (ID_OPTIONAL_DATA | 0x1)
+#define ID_RIFF_TRAILER         (ID_OPTIONAL_DATA | 0x2)
+#define ID_REPLAY_GAIN          (ID_OPTIONAL_DATA | 0x3)
+#define ID_CUESHEET             (ID_OPTIONAL_DATA | 0x4)
+#define ID_CONFIG_BLOCK         (ID_OPTIONAL_DATA | 0x5)
+#define ID_MD5_CHECKSUM         (ID_OPTIONAL_DATA | 0x6)
 
 ///////////////////////// WavPack Configuration ///////////////////////////////
 
@@ -127,39 +127,39 @@ typedef struct {
 
 typedef struct {
     int bits_per_sample, bytes_per_sample;
-    int qmode, flags, xmode, num_channels, float_norm_exp;
-    long block_samples, extra_flags, sample_rate, channel_mask;
+    int flags, num_channels, float_norm_exp;
+    ulong sample_rate, channel_mask;
 } WavpackConfig;
 
-#define CONFIG_BYTES_STORED     3       // 1-4 bytes/sample
-#define CONFIG_MONO_FLAG        4       // not stereo
-#define CONFIG_HYBRID_FLAG      8       // hybrid mode
-#define CONFIG_JOINT_STEREO     0x10    // joint stereo
-#define CONFIG_CROSS_DECORR     0x20    // no-delay cross decorrelation
-#define CONFIG_HYBRID_SHAPE     0x40    // noise shape (hybrid mode only)
-#define CONFIG_FLOAT_DATA       0x80    // ieee 32-bit floating point data
-
-#define CONFIG_ADOBE_MODE       0x100   // "adobe" mode for 32-bit floats
-#define CONFIG_FAST_FLAG        0x200   // fast mode
-#define CONFIG_VERY_FAST_FLAG   0x400   // double fast
-#define CONFIG_HIGH_FLAG        0x800   // high quality mode
-#define CONFIG_VERY_HIGH_FLAG   0x1000  // double high (not used yet)
-#define CONFIG_BITRATE_KBPS     0x2000  // bitrate is kbps, not bits / sample
-#define CONFIG_AUTO_SHAPING     0x4000  // automatic noise shaping
-#define CONFIG_SHAPE_OVERRIDE   0x8000  // shaping mode specified
-#define CONFIG_JOINT_OVERRIDE   0x10000 // joint-stereo mode specified
-#define CONFIG_COPY_TIME        0x20000 // copy file-time from source
-#define CONFIG_CREATE_EXE       0x40000 // create executable (not yet)
-#define CONFIG_CREATE_WVC       0x80000 // create correction file
-#define CONFIG_OPTIMIZE_WVC     0x100000 // maximize bybrid compression
-#define CONFIG_QUALITY_MODE     0x200000 // psychoacoustic quality mode
-#define CONFIG_RAW_FLAG         0x400000 // raw mode (not implemented yet)
-#define CONFIG_CALC_NOISE       0x800000 // calc noise in hybrid mode
-#define CONFIG_LOSSY_MODE       0x1000000 // obsolete (for information)
-#define CONFIG_EXTRA_MODE       0x2000000 // extra processing mode
-#define CONFIG_SKIP_WVX         0x4000000 // no wvx stream w/ floats & big ints
-#define CONFIG_MD5_CHECKSUM     0x8000000 // compute & store MD5 signature
-#define CONFIG_QUIET_MODE       0x10000000 // don't report progress %
+#define CONFIG_BYTES_STORED     3       // 1-4 bytes/sample
+#define CONFIG_MONO_FLAG        4       // not stereo
+#define CONFIG_HYBRID_FLAG      8       // hybrid mode
+#define CONFIG_JOINT_STEREO     0x10    // joint stereo
+#define CONFIG_CROSS_DECORR     0x20    // no-delay cross decorrelation
+#define CONFIG_HYBRID_SHAPE     0x40    // noise shape (hybrid mode only)
+#define CONFIG_FLOAT_DATA       0x80    // ieee 32-bit floating point data
+
+#define CONFIG_ADOBE_MODE       0x100   // "adobe" mode for 32-bit floats
+#define CONFIG_FAST_FLAG        0x200   // fast mode
+#define CONFIG_VERY_FAST_FLAG   0x400   // double fast
+#define CONFIG_HIGH_FLAG        0x800   // high quality mode
+#define CONFIG_VERY_HIGH_FLAG   0x1000  // double high (not used yet)
+#define CONFIG_BITRATE_KBPS     0x2000  // bitrate is kbps, not bits / sample
+#define CONFIG_AUTO_SHAPING     0x4000  // automatic noise shaping
+#define CONFIG_SHAPE_OVERRIDE   0x8000  // shaping mode specified
+#define CONFIG_JOINT_OVERRIDE   0x10000 // joint-stereo mode specified
+#define CONFIG_COPY_TIME        0x20000 // copy file-time from source
+#define CONFIG_CREATE_EXE       0x40000 // create executable (not yet)
+#define CONFIG_CREATE_WVC       0x80000 // create correction file
+#define CONFIG_OPTIMIZE_WVC     0x100000 // maximize bybrid compression
+#define CONFIG_QUALITY_MODE     0x200000 // psychoacoustic quality mode
+#define CONFIG_RAW_FLAG         0x400000 // raw mode (not implemented yet)
+#define CONFIG_CALC_NOISE       0x800000 // calc noise in hybrid mode
+#define CONFIG_LOSSY_MODE       0x1000000 // obsolete (for information)
+#define CONFIG_EXTRA_MODE       0x2000000 // extra processing mode
+#define CONFIG_SKIP_WVX         0x4000000 // no wvx stream w/ floats & big ints
+#define CONFIG_MD5_CHECKSUM     0x8000000 // compute & store MD5 signature
+#define CONFIG_QUIET_MODE       0x10000000 // don't report progress %
 
 //////////////////////////////// WavPack Stream ///////////////////////////////
 
@@ -191,35 +191,38 @@ struct entropy_data {
     ulong median [3], slow_level, error_limit;
 };
 
+struct words_data {
+    ulong bitrate_delta [2], bitrate_acc [2];
+    ulong pend_data, holding_one, zeros_acc;
+    int holding_zero, pend_count;
+    struct entropy_data c [2];
+};
+
 typedef struct {
     WavpackHeader wphdr;
     Bitstream wvbits;
 
-    struct {
-        ulong bitrate_delta [2], bitrate_acc [2];
-        ulong pend_data, holding_one, zeros_acc;
-        int holding_zero, pend_count;
-        struct entropy_data c [2];
-    } w;
+    struct words_data w;
 
     int num_terms, mute_error;
     ulong sample_index, crc;
 
     uchar int32_sent_bits, int32_zeros, int32_ones, int32_dups;
     uchar float_flags, float_shift, float_max_exp, float_norm_exp;
- 
+    uchar *blockbuff, *blockend;
+
     struct decorr_pass decorr_passes [MAX_NTERMS];
 
 } WavpackStream;
 
 // flags for float_flags:
 
-#define FLOAT_SHIFT_ONES 1      // bits left-shifted into float = '1'
-#define FLOAT_SHIFT_SAME 2      // bits left-shifted into float are the same
-#define FLOAT_SHIFT_SENT 4      // bits shifted into float are sent literally
-#define FLOAT_ZEROS_SENT 8      // "zeros" are not all real zeros
-#define FLOAT_NEG_ZEROS  0x10   // contains negative zeros
-#define FLOAT_EXCEPTIONS 0x20   // contains exceptions (inf, nan, etc.)
+#define FLOAT_SHIFT_ONES 1      // bits left-shifted into float = '1'
+#define FLOAT_SHIFT_SAME 2      // bits left-shifted into float are the same
+#define FLOAT_SHIFT_SENT 4      // bits shifted into float are sent literally
+#define FLOAT_ZEROS_SENT 8      // "zeros" are not all real zeros
+#define FLOAT_NEG_ZEROS  0x10   // contains negative zeros
+#define FLOAT_EXCEPTIONS 0x20   // contains exceptions (inf, nan, etc.)
 
 /////////////////////////////// WavPack Context ///////////////////////////////
 
@@ -231,6 +234,13 @@ typedef struct {
     WavpackStream stream;
     WavpackConfig config;
 
+    WavpackMetadata *metadata;
+    ulong metabytes;
+    int metacount;
+
+    uchar *wrapper_data;
+    int wrapper_bytes;
+ 
     uchar read_buffer [1024];
     char error_message [80];
 
@@ -247,32 +257,96 @@ typedef struct {
 // bits.c
 
 void bs_open_read (Bitstream *bs, uchar *buffer_start, uchar *buffer_end, read_stream file, ulong file_bytes);
+void bs_open_write (Bitstream *bs, uchar *buffer_start, uchar *buffer_end);
+ulong bs_close_write (Bitstream *bs);
 
 #define bs_is_open(bs) ((bs)->ptr != NULL)
 
 #define getbit(bs) ( \
     (((bs)->bc) ? \
-        ((bs)->bc--, (bs)->sr & 1) : \
-            (((++((bs)->ptr) != (bs)->end) ? (void) 0 : (bs)->wrap (bs)), (bs)->bc = 7, ((bs)->sr = *((bs)->ptr)) & 1) \
+        ((bs)->bc--, (bs)->sr & 1) : \
+            (((++((bs)->ptr) != (bs)->end) ? (void) 0 : (bs)->wrap (bs)), (bs)->bc = 7, ((bs)->sr = *((bs)->ptr)) & 1) \
     ) ? \
-        ((bs)->sr >>= 1, 1) : \
-        ((bs)->sr >>= 1, 0) \
+        ((bs)->sr >>= 1, 1) : \
+        ((bs)->sr >>= 1, 0) \
 )
 
 #define getbits(value, nbits, bs) { \
     while ((nbits) > (bs)->bc) { \
-        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
-        (bs)->sr |= (long)*((bs)->ptr) << (bs)->bc; \
-        (bs)->bc += 8; \
+        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+        (bs)->sr |= (long)*((bs)->ptr) << (bs)->bc; \
+        (bs)->bc += 8; \
     } \
     *(value) = (bs)->sr; \
     (bs)->sr >>= (nbits); \
     (bs)->bc -= (nbits); \
 }
 
+#define putbit(bit, bs) { if (bit) (bs)->sr |= (1 << (bs)->bc); \
+    if (++((bs)->bc) == 8) { \
+        *((bs)->ptr) = (bs)->sr; \
+        (bs)->sr = (bs)->bc = 0; \
+        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+    }}
+
+#define putbit_0(bs) { \
+    if (++((bs)->bc) == 8) { \
+        *((bs)->ptr) = (bs)->sr; \
+        (bs)->sr = (bs)->bc = 0; \
+        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+    }}
+
+#define putbit_1(bs) { (bs)->sr |= (1 << (bs)->bc); \
+    if (++((bs)->bc) == 8) { \
+        *((bs)->ptr) = (bs)->sr; \
+        (bs)->sr = (bs)->bc = 0; \
+        if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+    }}
+
+#define putbits(value, nbits, bs) { \
+    (bs)->sr |= (long)(value) << (bs)->bc; \
+    if (((bs)->bc += (nbits)) >= 8) \
+        do { \
+            *((bs)->ptr) = (bs)->sr; \
+            (bs)->sr >>= 8; \
+            if (++((bs)->ptr) == (bs)->end) (bs)->wrap (bs); \
+        } while (((bs)->bc -= 8) >= 8); \
+}
+
 void little_endian_to_native (void *data, char *format);
 void native_to_little_endian (void *data, char *format);
 
+// these macros implement the weight application and update operations
+// that are at the heart of the decorrelation loops
+
+#if 0   // PERFCOND
+#define apply_weight_i(weight, sample) ((weight * sample + 512) >> 10)
+#else
+#define apply_weight_i(weight, sample) ((((weight * sample) >> 8) + 2) >> 2)
+#endif
+
+#define apply_weight_f(weight, sample) (((((sample & 0xffff) * weight) >> 9) + \
+    (((sample & ~0xffff) >> 9) * weight) + 1) >> 1)
+
+#if 1   // PERFCOND
+#define apply_weight(weight, sample) (sample != (short) sample ? \
+    apply_weight_f (weight, sample) : apply_weight_i (weight, sample))
+#else
+#define apply_weight(weight, sample) ((int32_t)((weight * (int64_t) sample + 512) >> 10))
+#endif
+
+#if 0   // PERFCOND
+#define update_weight(weight, delta, source, result) \
+    if (source && result) weight -= ((((source ^ result) >> 30) & 2) - 1) * delta;
+#else
+#define update_weight(weight, delta, source, result) \
+    if (source && result) (source ^ result) < 0 ? (weight -= delta) : (weight += delta);
+#endif
+
+#define update_weight_clip(weight, delta, source, result) \
+    if (source && result && ((source ^ result) < 0 ? (weight -= delta) < -1024 : (weight += delta) > 1024)) \
+        weight = weight < 0 ? -1024 : 1024;
+
 // unpack.c
 
 int unpack_init (WavpackContext *wpc);
@@ -287,17 +361,31 @@ int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd);
 long unpack_samples (WavpackContext *wpc, long *buffer, ulong sample_count);
 int check_crc_error (WavpackContext *wpc);
 
+// pack.c
+
+void pack_init (WavpackContext *wpc);
+int pack_block (WavpackContext *wpc, long *buffer);
+
 // metadata.c stuff
 
 int read_metadata_buff (WavpackContext *wpc, WavpackMetadata *wpmd);
 int process_metadata (WavpackContext *wpc, WavpackMetadata *wpmd);
+int copy_metadata (WavpackMetadata *wpmd, uchar *buffer_start, uchar *buffer_end);
+void free_metadata (WavpackMetadata *wpmd);
 
 // words.c stuff
 
+void init_words (WavpackStream *wps);
 int read_entropy_vars (WavpackStream *wps, WavpackMetadata *wpmd);
+void write_entropy_vars (WavpackStream *wps, WavpackMetadata *wpmd);
 int read_hybrid_profile (WavpackStream *wps, WavpackMetadata *wpmd);
-long get_words (WavpackStream *wps, int nchans, int nsamples, long *buffer);
+long get_words (long *buffer, int nsamples, ulong flags,
+                struct words_data *w, Bitstream *bs);
+void send_word_lossless (WavpackStream *wps, long value, int chan);
+void flush_word (WavpackStream *wps);
+int log2s (long value);
 long exp2s (int log);
+char store_weight (int weight);
 int restore_weight (char weight);
 
 #define WORD_EOF (1L << 31)
@@ -314,13 +402,13 @@ WavpackContext *WavpackOpenFileInput (read_stream infile, char *error);
 
 int WavpackGetMode (WavpackContext *wpc);
 
-#define MODE_WVC        0x1
-#define MODE_LOSSLESS   0x2
-#define MODE_HYBRID     0x4
-#define MODE_FLOAT      0x8
-#define MODE_VALID_TAG  0x10
-#define MODE_HIGH       0x20
-#define MODE_FAST       0x40
+#define MODE_WVC        0x1
+#define MODE_LOSSLESS   0x2
+#define MODE_HYBRID     0x4
+#define MODE_FLOAT      0x8
+#define MODE_VALID_TAG  0x10
+#define MODE_HIGH       0x20
+#define MODE_FAST       0x40
 
 ulong WavpackUnpackSamples (WavpackContext *wpc, long *buffer, ulong samples);
 ulong WavpackGetNumSamples (WavpackContext *wpc);
@@ -332,3 +420,10 @@ int WavpackGetBitsPerSample (WavpackContext *wpc);
 int WavpackGetBytesPerSample (WavpackContext *wpc);
 int WavpackGetNumChannels (WavpackContext *wpc);
 int WavpackGetReducedChannels (WavpackContext *wpc);
+WavpackContext *WavpackOpenFileOutput (void);
+void WavpackSetOutputBuffer (WavpackContext *wpc, uchar *begin, uchar *end);
+int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, ulong total_samples);
+void WavpackAddWrapper (WavpackContext *wpc, void *data, ulong bcount);
+ulong WavpackPackSamples (WavpackContext *wpc, long *sample_buffer, ulong sample_count);
+
+