libilbc: set channel layout

[ffmpeg] / libavcodec / ivi_dsp.h

diff --git a/libavcodec/ivi_dsp.h b/libavcodec/ivi_dsp.h
index 9632966a9a16e16936a80511f4e8c620e5e1ef2f..c46f8b2d8daa1e2aaf6728c4ae8f03efdc42566d 100644 (file)
--- a/libavcodec/ivi_dsp.h
+++ b/libavcodec/ivi_dsp.h
@@ -1,7 +1,7 @@
 /*
  * DSP functions for Indeo Video Interactive codecs (Indeo4 and Indeo5)
  *
- * Copyright (c) 2009 Maxim Poliakovski
+ * Copyright (c) 2009-2011 Maxim Poliakovski
  *
  * This file is part of Libav.
  *
@@ -38,10 +38,45 @@
  *  @param[in]   plane        pointer to the descriptor of the plane being processed
  *  @param[out]  dst          pointer to the destination buffer
  *  @param[in]   dst_pitch    pitch of the destination buffer
- *  @param[in]   num_bands    number of wavelet bands to be processed
  */
 void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
-                        const int dst_pitch, const int num_bands);
+                        const int dst_pitch);
+
+/**
+ *  Haar wavelet recomposition filter for Indeo 4
+ *
+ *  @param[in]  plane        pointer to the descriptor of the plane being processed
+ *  @param[out] dst          pointer to the destination buffer
+ *  @param[in]  dst_pitch    pitch of the destination buffer
+ */
+void ff_ivi_recompose_haar(const IVIPlaneDesc *plane, uint8_t *dst,
+                           const int dst_pitch);
+
+/**
+ *  two-dimensional inverse Haar 8x8 transform for Indeo 4
+ *
+ *  @param[in]  in        pointer to the vector of transform coefficients
+ *  @param[out] out       pointer to the output buffer (frame)
+ *  @param[in]  pitch     pitch to move to the next y line
+ *  @param[in]  flags     pointer to the array of column flags:
+ *                        != 0 - non_empty column, 0 - empty one
+ *                        (this array must be filled by caller)
+ */
+void ff_ivi_inverse_haar_8x8(const int32_t *in, int16_t *out, uint32_t pitch,
+                             const uint8_t *flags);
+
+/**
+ *  DC-only two-dimensional inverse Haar transform for Indeo 4.
+ *  Performing the inverse transform in this case is equivalent to
+ *  spreading DC_coeff >> 3 over the whole block.
+ *
+ *  @param[in]  in          pointer to the dc coefficient
+ *  @param[out] out         pointer to the output buffer (frame)
+ *  @param[in]  pitch       pitch to move to the next y line
+ *  @param[in]  blk_size    transform block size
+ */
+void ff_ivi_dc_haar_2d(const int32_t *in, int16_t *out, uint32_t pitch,
+                       int blk_size);
 
 /**
  *  two-dimensional inverse slant 8x8 transform