atrac3plus: Convert to the new bitstream reader

[ffmpeg] / libavcodec / wmv2.h

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 4c7be44bfd4a57bdb46a5a8a6534ac9eb390b2a7..b77dd98cd5d8f914a679ddc371d530a0577fec5c 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2002 The FFmpeg Project
+ * Copyright (c) 2002 The Libav Project
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -22,9 +22,9 @@
 #define AVCODEC_WMV2_H
 
 #include "avcodec.h"
-#include "dsputil.h"
-#include "mpegvideo.h"
 #include "intrax8.h"
+#include "mpegvideo.h"
+#include "wmv2dsp.h"
 
 #define SKIP_TYPE_NONE 0
 #define SKIP_TYPE_MPEG 1
@@ -32,9 +32,10 @@
 #define SKIP_TYPE_COL  3
 
 
-typedef struct Wmv2Context{
+typedef struct Wmv2Context {
     MpegEncContext s;
     IntraX8Context x8;
+    WMV2DSPContext wdsp;
     int j_type_bit;
     int j_type;
     int abt_flag;
@@ -50,9 +51,23 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED_16(DCTELEM, abt_block2[6][64]);
-}Wmv2Context;
+    DECLARE_ALIGNED(16, int16_t, abt_block2)[6][64];
+} Wmv2Context;
+
+void ff_wmv2_common_init(Wmv2Context *w);
+
+int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]);
+int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number);
+void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64],
+                       int motion_x, int motion_y);
+int ff_wmv2_decode_picture_header(MpegEncContext * s);
+int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
+void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64],
+                    uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);
 
-void ff_wmv2_common_init(Wmv2Context * w);
+void ff_mspel_motion(MpegEncContext *s,
+                     uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
+                     uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
+                     int motion_x, int motion_y, int h);
 
 #endif /* AVCODEC_WMV2_H */