Started implementation of "correct" O_DIRECT handling

[frescor/ffmpeg.git] / libavcodec / mlp.h

diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
index c19b69915e95142ffbacd88474729b11e7b6c7e9..c1c0abd7c21d2aa3d7e633bcfb313efea86a4893 100644 (file)
--- a/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@@ -26,13 +26,21 @@
 
 #include "avcodec.h"
 
-/** Maximum number of channels that can be decoded. */
-#define MAX_CHANNELS        16
+/** Last possible matrix channel for each codec */
+#define MAX_MATRIX_CHANNEL_MLP      5
+#define MAX_MATRIX_CHANNEL_TRUEHD   7
+/** Maximum number of channels in a valid stream.
+ *  MLP   : 5.1 + 2 noise channels -> 8 channels
+ *  TrueHD: 7.1                    -> 8 channels
+ */
+#define MAX_CHANNELS                8
 
 /** Maximum number of matrices used in decoding; most streams have one matrix
  *  per output channel, but some rematrix a channel (usually 0) more than once.
  */
-#define MAX_MATRICES        15
+#define MAX_MATRICES_MLP            6
+#define MAX_MATRICES_TRUEHD         8
+#define MAX_MATRICES                8
 
 /** Maximum number of substreams that can be decoded.
  *  MLP's limit is 2. TrueHD supports at least up to 3.
@@ -50,11 +58,9 @@
 /** number of allowed filters */
 #define NUM_FILTERS         2
 
-/** The maximum number of taps in either the IIR or FIR filter;
- *  I believe MLP actually specifies the maximum order for IIR filters as four,
- *  and that the sum of the orders of both filters must be <= 8.
-*/
-#define MAX_FILTER_ORDER    8
+/** The maximum number of taps in IIR and FIR filters. */
+#define MAX_FIR_ORDER       8
+#define MAX_IIR_ORDER       4
 
 /** Code that signals end of a stream. */
 #define END_OF_STREAM       0xd234d234
@@ -67,8 +73,8 @@ typedef struct {
     uint8_t     order; ///< number of taps in filter
     uint8_t     shift; ///< Right shift to apply to output of filter.
 
-    int32_t     coeff[MAX_FILTER_ORDER];
-    int32_t     state[MAX_FILTER_ORDER];
+    int32_t     coeff[MAX_FIR_ORDER];
+    int32_t     state[MAX_FIR_ORDER];
 } FilterParams;
 
 /** sample data coding information */