refactor pcm reader framework

[fdkaac.git] / src / pcm_reader.h

diff --git a/src/pcm_reader.h b/src/pcm_reader.h
index 61debad4f2cae503848e55be678fbb8e7b15a725..c1150024f751390bda49cfb09fe246b7d5cead1f 100644 (file)
--- a/src/pcm_reader.h
+++ b/src/pcm_reader.h
@@ -1,7 +1,12 @@
+/* 
+ * Copyright (C) 2013 nu774
+ * For conditions of distribution and use, see copyright notice in COPYING
+ */
 #ifndef PCM_READER_H
 #define PCM_READER_H
 
 #include "lpcm.h"
+#include "metadata.h"
 
 typedef struct pcm_reader_t pcm_reader_t;
 
@@ -50,11 +55,7 @@ int64_t pcm_get_position(pcm_reader_t *r)
     return r->vtbl->get_position(r);
 }
 
-static inline
-int64_t pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes)
-{
-    return r->vtbl->read_frames(r, data, nframes);
-}
+int pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes);
 
 static inline
 void pcm_teardown(pcm_reader_t **r)
@@ -62,17 +63,30 @@ void pcm_teardown(pcm_reader_t **r)
     (*r)->vtbl->teardown(r);
 }
 
-pcm_reader_t *pcm_open_sint16_converter(pcm_reader_t *reader);
+static inline
+uint32_t bitcount(uint32_t bits)
+{
+    bits = (bits & 0x55555555) + (bits >> 1 & 0x55555555);
+    bits = (bits & 0x33333333) + (bits >> 2 & 0x33333333);
+    bits = (bits & 0x0f0f0f0f) + (bits >> 4 & 0x0f0f0f0f);
+    bits = (bits & 0x00ff00ff) + (bits >> 8 & 0x00ff00ff);
+    return (bits & 0x0000ffff) + (bits >>16 & 0x0000ffff);
+}
 
 #define TRY_IO(expr) \
     do { \
         if ((expr)) goto FAIL; \
     } while (0)
 
+#define ENSURE(expr) \
+    do { \
+        if (!(expr)) goto FAIL;\
+    } while (0)
+
 int pcm_read(pcm_io_context_t *io, void *buffer, uint32_t size);
 int pcm_skip(pcm_io_context_t *io, int64_t count);
 
-static int pcm_seek(pcm_io_context_t *io, int64_t off, int whence)
+static inline int pcm_seek(pcm_io_context_t *io, int64_t off, int whence)
 {
     return io->vtbl->seek ? io->vtbl->seek(io->cookie, off, whence) : -1;
 }
@@ -91,4 +105,19 @@ int pcm_read64be(pcm_io_context_t *io, uint64_t *value);
 int pcm_scanl(pcm_io_context_t *io, const char *fmt, ...);
 int pcm_scanb(pcm_io_context_t *io, const char *fmt, ...);
 
+int apple_chan_chunk(pcm_io_context_t *io, uint32_t chunk_size,
+                     pcm_sample_description_t *fmt, uint8_t *mapping);
+
+pcm_reader_t *wav_open(pcm_io_context_t *io, int ignore_length);
+pcm_reader_t *raw_open(pcm_io_context_t *io,
+                       const pcm_sample_description_t *desc);
+pcm_reader_t *caf_open(pcm_io_context_t *io,
+                       aacenc_tag_callback_t tag_callback, void *tag_ctx);
+
+pcm_reader_t *pcm_open_native_converter(pcm_reader_t *reader);
+pcm_reader_t *pcm_open_float_converter(pcm_reader_t *reader);
+pcm_reader_t *pcm_open_sint16_converter(pcm_reader_t *reader);
+
+pcm_reader_t *extrapolater_open(pcm_reader_t *reader);
+
 #endif