OKed parts of the QCELP decoder

[ffmpeg] / libavcodec / mlp_parser.c

diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 8b0dd5f6c6542c7fcc463fe03f4cf71f3040308a..4400d71fc4dbcea69cd0c1514e5653abe72a2d5d 100644 (file)
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -24,10 +24,13 @@
  * MLP parser
  */
 
+#include <stdint.h>
+
 #include "libavutil/crc.h"
 #include "bitstream.h"
 #include "parser.h"
 #include "mlp_parser.h"
+#include "mlp.h"
 
 static const uint8_t mlp_quants[16] = {
     16, 20, 24, 0, 0, 0, 0, 0,
@@ -62,29 +65,6 @@ static int truehd_channels(int chanmap)
     return channels;
 }
 
-static int crc_init = 0;
-static AVCRC crc_2D[1024];
-
-/** MLP uses checksums that seem to be based on the standard CRC algorithm,
- *  but 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.
- */
-
-static uint16_t mlp_checksum16(const uint8_t *buf, unsigned int buf_size)
-{
-    uint16_t crc;
-
-    if (!crc_init) {
-        av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D));
-        crc_init = 1;
-    }
-
-    crc = av_crc(crc_2D, 0, buf, buf_size - 2);
-    crc ^= AV_RL16(buf + buf_size - 2);
-    return crc;
-}
-
 /** Read a major sync info header - contains high level information about
  *  the stream - sample rate, channel arrangement etc. Most of this
  *  information is not actually necessary for decoding, only for playback.
@@ -99,13 +79,13 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
     assert(get_bits_count(gb) == 0);
 
     if (gb->size_in_bits < 28 << 3) {
-        av_log(log, AV_LOG_ERROR, "Packet too short, unable to read major sync\n");
+        av_log(log, AV_LOG_ERROR, "packet too short, unable to read major sync\n");
         return -1;
     }
 
-    checksum = mlp_checksum16(gb->buffer, 26);
+    checksum = ff_mlp_checksum16(gb->buffer, 26);
     if (checksum != AV_RL16(gb->buffer+26)) {
-        av_log(log, AV_LOG_ERROR, "Major sync info header checksum error\n");
+        av_log(log, AV_LOG_ERROR, "major sync info header checksum error\n");
         return -1;
     }
 
@@ -303,7 +283,7 @@ lost_sync:
 AVCodecParser mlp_parser = {
     { CODEC_ID_MLP },
     sizeof(MLPParseContext),
-    NULL,
+    ff_mlp_init_crc2D,
     mlp_parse,
     NULL,
 };