Remove duplicated dot product code. Use dsputil's

[ffmpeg] / libavcodec / mlp.h

diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
index 43c3b272a5225d4721fe0609c6a667b8802c0293..b81c735d1fc1b4596753b789b39f97b7f6206dc2 100644 (file)
--- a/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MLP_H
-#define FFMPEG_MLP_H
+#ifndef AVCODEC_MLP_H
+#define AVCODEC_MLP_H
 
 #include <stdint.h>
 
@@ -32,11 +32,11 @@
 /** 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
 
 /** Maximum number of substreams that can be decoded. This could also be set
- *  higher, but I haven't seen any examples with more than two. */
+ *  higher, but I haven't seen any examples with more than two.
+ */
 #define MAX_SUBSTREAMS      2
 
 /** maximum sample frequency seen in files */
@@ -52,9 +52,13 @@
 
 /** 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. */
+ *  and that the sum of the orders of both filters must be <= 8.
+*/
 #define MAX_FILTER_ORDER    8
 
+/** Code that signals end of a stream. */
+#define END_OF_STREAM       0xd234d234
+
 #define FIR 0
 #define IIR 1
 
@@ -80,30 +84,36 @@ typedef struct {
 /** Tables defining the Huffman codes.
  *  There are three entropy coding methods used in MLP (four if you count
  *  "none" as a method). These use the same sequences for codes starting with
- *  00 or 01, but have different codes starting with 1. */
-
+ *  00 or 01, but have different codes starting with 1.
+ */
 extern const uint8_t ff_mlp_huffman_tables[3][18][2];
 
 /** MLP uses checksums that seem to be based on the standard CRC algorithm, but
  *  are not (in implementation terms, the table lookup and XOR are reversed).
  *  We can implement this behavior using a standard av_crc on all but the
- *  last element, then XOR that with the last element. */
-
+ *  last element, then XOR that with the last element.
+ */
 uint8_t  ff_mlp_checksum8 (const uint8_t *buf, unsigned int buf_size);
 uint16_t ff_mlp_checksum16(const uint8_t *buf, unsigned int buf_size);
 
 /** Calculate an 8-bit checksum over a restart header -- a non-multiple-of-8
- *  number of bits, starting two bits into the first byte of buf. */
-
+ *  number of bits, starting two bits into the first byte of buf.
+ */
 uint8_t ff_mlp_restart_checksum(const uint8_t *buf, unsigned int bit_size);
 
 /** XOR together all the bytes of a buffer.
- *  Does this belong in dspcontext? */
-
+ *  Does this belong in dspcontext?
+ */
 uint8_t ff_mlp_calculate_parity(const uint8_t *buf, unsigned int buf_size);
 
-int ff_mlp_init_crc2D(AVCodecParserContext *s);
-
 void ff_mlp_init_crc();
 
-#endif /* FFMPEG_MLP_H */
+/** XOR four bytes into one. */
+static inline uint8_t xor_32_to_8(uint32_t value)
+{
+    value ^= value >> 16;
+    value ^= value >>  8;
+    return value;
+}
+
+#endif /* AVCODEC_MLP_H */