audioconvert: Port to the new multichannel caps

[platform/upstream/gstreamer.git] / gst / audioconvert / audioconvert.h

diff --git a/gst/audioconvert/audioconvert.h b/gst/audioconvert/audioconvert.h
index 736745e..638a42a 100644 (file)
--- a/gst/audioconvert/audioconvert.h
+++ b/gst/audioconvert/audioconvert.h
@@ -23,9 +23,49 @@
 #define __AUDIO_CONVERT_H__
 
 #include <gst/gst.h>
-#include <gst/audio/multichannel.h>
+#include <gst/audio/audio.h>
+
+GST_DEBUG_CATEGORY_EXTERN (audio_convert_debug);
+#define GST_CAT_DEFAULT (audio_convert_debug)
+
+/**
+ * GstAudioConvertDithering:
+ * @DITHER_NONE: No dithering
+ * @DITHER_RPDF: Rectangular dithering
+ * @DITHER_TPDF: Triangular dithering (default)
+ * @DITHER_TPDF_HF: High frequency triangular dithering
+ *
+ * Set of available dithering methods when converting audio.
+ */
+typedef enum
+{
+  DITHER_NONE = 0,
+  DITHER_RPDF,
+  DITHER_TPDF,
+  DITHER_TPDF_HF
+} GstAudioConvertDithering;
+
+/**
+ * GstAudioConvertNoiseShaping:
+ * @NOISE_SHAPING_NONE: No noise shaping (default)
+ * @NOISE_SHAPING_ERROR_FEEDBACK: Error feedback
+ * @NOISE_SHAPING_SIMPLE: Simple 2-pole noise shaping
+ * @NOISE_SHAPING_MEDIUM: Medium 5-pole noise shaping
+ * @NOISE_SHAPING_HIGH: High 8-pole noise shaping
+ *
+ * Set of available noise shaping methods
+ */
+typedef enum
+{
+  NOISE_SHAPING_NONE = 0,
+  NOISE_SHAPING_ERROR_FEEDBACK,
+  NOISE_SHAPING_SIMPLE,
+  NOISE_SHAPING_MEDIUM,
+  NOISE_SHAPING_HIGH
+} GstAudioConvertNoiseShaping;
 
 typedef struct _AudioConvertCtx AudioConvertCtx;
+#if 0
 typedef struct _AudioConvertFmt AudioConvertFmt;
 
 struct _AudioConvertFmt
@@ -37,24 +77,29 @@ struct _AudioConvertFmt
   gint rate;
   gint channels;
   GstAudioChannelPosition *pos;
+  gboolean unpositioned_layout;
 
   /* int audio caps */
   gboolean sign;
   gint depth;
 
-  /* float audio caps */
-  gint buffer_frames;
-
   gint unit_size;
 };
+#endif
+
+typedef void (*AudioConvertUnpack) (gpointer src, gpointer dst, gint scale,
+    gint count);
+typedef void (*AudioConvertPack) (gpointer src, gpointer dst, gint scale,
+    gint count);
 
-typedef void (*AudioConvertUnpack) (gpointer src, gint32 *dst, gint64 scale, gint count);
-typedef void (*AudioConvertPack) (gint32 *src, gpointer dst, gint depth, gint count);
+typedef void (*AudioConvertMix) (AudioConvertCtx *, gpointer, gpointer, gint);
+typedef void (*AudioConvertQuantize) (AudioConvertCtx * ctx, gpointer src,
+    gpointer dst, gint count);
 
 struct _AudioConvertCtx
 {
-  AudioConvertFmt in;
-  AudioConvertFmt out;
+  GstAudioInfo in;
+  GstAudioInfo out;
 
   AudioConvertUnpack unpack;
   AudioConvertPack pack;
@@ -62,6 +107,8 @@ struct _AudioConvertCtx
   /* channel conversion matrix, m[in_channels][out_channels].
    * If identity matrix, passthrough applies. */
   gfloat **matrix;
+  /* temp storage for channelmix */
+  gpointer tmp;
 
   gboolean in_default;
   gboolean mix_passthrough;
@@ -70,20 +117,30 @@ struct _AudioConvertCtx
   gpointer tmpbuf;
   gint tmpbufsize;
 
-  gint64 scale;
-  gint depth;
-};
+  gint in_scale;
+  gint out_scale;
 
-gboolean       audio_convert_clean_fmt         (AudioConvertFmt *fmt); 
+  AudioConvertMix channel_mix;
+
+  AudioConvertQuantize quantize;
+
+  GstAudioConvertDithering dither;
+  GstAudioConvertNoiseShaping ns;
+  /* last random number generated per channel for hifreq TPDF dither */
+  gpointer last_random;
+  /* contains the past quantization errors, error[out_channels][count] */
+  gdouble *error_buf;
+};
 
-gboolean       audio_convert_prepare_context   (AudioConvertCtx *ctx, AudioConvertFmt *in, 
-                                                AudioConvertFmt *out);
-gboolean       audio_convert_get_sizes         (AudioConvertCtx *ctx, gint samples, gint *srcsize,
-                                                gint *dstsize);
+gboolean audio_convert_prepare_context (AudioConvertCtx * ctx,
+    GstAudioInfo * in, GstAudioInfo * out,
+    GstAudioConvertDithering dither, GstAudioConvertNoiseShaping ns);
+gboolean audio_convert_get_sizes (AudioConvertCtx * ctx, gint samples,
+    gint * srcsize, gint * dstsize);
 
-gboolean       audio_convert_clean_context     (AudioConvertCtx *ctx);
+gboolean audio_convert_clean_context (AudioConvertCtx * ctx);
 
-gboolean       audio_convert_convert           (AudioConvertCtx *ctx, gpointer src, 
-                                                gpointer dst, gint samples, gboolean src_writable);
+gboolean audio_convert_convert (AudioConvertCtx * ctx, gpointer src,
+    gpointer dst, gint samples, gboolean src_writable);
 
 #endif /* __AUDIO_CONVERT_H__ */