diff options
Diffstat (limited to 'apps/codecs/libwavpack/wavpack.h')
-rw-r--r-- | apps/codecs/libwavpack/wavpack.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/apps/codecs/libwavpack/wavpack.h b/apps/codecs/libwavpack/wavpack.h index 12212bb0f8..bf9b95424e 100644 --- a/apps/codecs/libwavpack/wavpack.h +++ b/apps/codecs/libwavpack/wavpack.h | |||
@@ -234,10 +234,6 @@ typedef struct { | |||
234 | WavpackStream stream; | 234 | WavpackStream stream; |
235 | WavpackConfig config; | 235 | WavpackConfig config; |
236 | 236 | ||
237 | WavpackMetadata *metadata; | ||
238 | ulong metabytes; | ||
239 | int metacount; | ||
240 | |||
241 | uchar *wrapper_data; | 237 | uchar *wrapper_data; |
242 | int wrapper_bytes; | 238 | int wrapper_bytes; |
243 | 239 | ||
@@ -364,7 +360,9 @@ int check_crc_error (WavpackContext *wpc); | |||
364 | // pack.c | 360 | // pack.c |
365 | 361 | ||
366 | void pack_init (WavpackContext *wpc); | 362 | void pack_init (WavpackContext *wpc); |
367 | int pack_block (WavpackContext *wpc, long *buffer); | 363 | int pack_start_block (WavpackContext *wpc); |
364 | int pack_samples (WavpackContext *wpc, long *buffer, ulong sample_count); | ||
365 | int pack_finish_block (WavpackContext *wpc); | ||
368 | 366 | ||
369 | // metadata.c stuff | 367 | // metadata.c stuff |
370 | 368 | ||
@@ -381,8 +379,11 @@ void write_entropy_vars (WavpackStream *wps, WavpackMetadata *wpmd); | |||
381 | int read_hybrid_profile (WavpackStream *wps, WavpackMetadata *wpmd); | 379 | int read_hybrid_profile (WavpackStream *wps, WavpackMetadata *wpmd); |
382 | long get_words (long *buffer, int nsamples, ulong flags, | 380 | long get_words (long *buffer, int nsamples, ulong flags, |
383 | struct words_data *w, Bitstream *bs); | 381 | struct words_data *w, Bitstream *bs); |
384 | void send_word_lossless (WavpackStream *wps, long value, int chan); | 382 | void send_word_lossless (long value, int chan, |
385 | void flush_word (WavpackStream *wps); | 383 | struct words_data *w, Bitstream *bs); |
384 | void send_words (long *buffer, int nsamples, ulong flags, | ||
385 | struct words_data *w, Bitstream *bs); | ||
386 | void flush_word (struct words_data *w, Bitstream *bs); | ||
386 | int log2s (long value); | 387 | int log2s (long value); |
387 | long exp2s (int log); | 388 | long exp2s (int log); |
388 | char store_weight (int weight); | 389 | char store_weight (int weight); |
@@ -421,9 +422,10 @@ int WavpackGetBytesPerSample (WavpackContext *wpc); | |||
421 | int WavpackGetNumChannels (WavpackContext *wpc); | 422 | int WavpackGetNumChannels (WavpackContext *wpc); |
422 | int WavpackGetReducedChannels (WavpackContext *wpc); | 423 | int WavpackGetReducedChannels (WavpackContext *wpc); |
423 | WavpackContext *WavpackOpenFileOutput (void); | 424 | WavpackContext *WavpackOpenFileOutput (void); |
424 | void WavpackSetOutputBuffer (WavpackContext *wpc, uchar *begin, uchar *end); | ||
425 | int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, ulong total_samples); | 425 | int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, ulong total_samples); |
426 | void WavpackAddWrapper (WavpackContext *wpc, void *data, ulong bcount); | 426 | void WavpackAddWrapper (WavpackContext *wpc, void *data, ulong bcount); |
427 | ulong WavpackPackSamples (WavpackContext *wpc, long *sample_buffer, ulong sample_count); | 427 | int WavpackStartBlock (WavpackContext *wpc, uchar *begin, uchar *end); |
428 | int WavpackPackSamples (WavpackContext *wpc, long *sample_buffer, ulong sample_count); | ||
429 | ulong WavpackFinishBlock (WavpackContext *wpc); | ||
428 | 430 | ||
429 | 431 | ||