lavc: Remove deprecated XvMC support hacks

[ffmpeg] / libavcodec / intrax8.h

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 69673171a8d9a1857599b0f285f97ed8113a48d5..ad172b16bed4fd643c522ba68fec2c55ccc09e84 100644 (file)
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -19,30 +19,45 @@
 #ifndef AVCODEC_INTRAX8_H
 #define AVCODEC_INTRAX8_H
 
+#include "blockdsp.h"
 #include "get_bits.h"
-#include "mpegvideo.h"
+#include "idctdsp.h"
 #include "intrax8dsp.h"
+#include "mpegpicture.h"
 
 typedef struct IntraX8Context {
-    VLC * j_ac_vlc[4];//they point to the static j_mb_vlc
-    VLC * j_orient_vlc;
-    VLC * j_dc_vlc[3];
+    VLC *j_ac_vlc[4]; // they point to the static j_mb_vlc
+    VLC *j_orient_vlc;
+    VLC *j_dc_vlc[3];
 
     int use_quant_matrix;
-//set by ff_intrax8_common_init
-    uint8_t * prediction_table;//2*(mb_w*2)
+
+    // set by ff_intrax8_common_init
+    uint8_t *prediction_table; // 2 * (mb_w * 2)
     ScanTable scantable[3];
-//set by the caller codec
-    MpegEncContext * s;
+    AVCodecContext *avctx;
+    int *block_last_index;  ///< last nonzero coefficient in block
+    int16_t (*block)[64];
+
+    // set by the caller codec
     IntraX8DSPContext dsp;
+    IDCTDSPContext idsp;
+    BlockDSPContext bdsp;
     int quant;
     int dquant;
     int qsum;
-//calculated per frame
+    int loopfilter;
+    AVFrame *frame;
+    GetBitContext *gb;
+
+    // calculated per frame
     int quant_dc_chroma;
     int divide_quant_dc_luma;
     int divide_quant_dc_chroma;
-//changed per block
+    uint8_t *dest[3];
+    uint8_t scratchpad[42]; // size of the block is fixed (8x8 plus padding)
+
+    // changed per block
     int edges;
     int flat_dc;
     int predicted_dc;
@@ -50,10 +65,49 @@ typedef struct IntraX8Context {
     int chroma_orient;
     int orient;
     int est_run;
+
+    // block props
+    int mb_x, mb_y;
+    int mb_width, mb_height;
 } IntraX8Context;
 
-void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s);
-void ff_intrax8_common_end(IntraX8Context * w);
-int  ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq);
+/**
+ * Initialize IntraX8 frame decoder.
+ * @param avctx pointer to AVCodecContext
+ * @param w pointer to IntraX8Context
+ * @param idsp pointer to IDCTDSPContext
+ * @param block pointer to block array
+ * @param block_last_index pointer to index array
+ * @param mb_width macroblock width
+ * @param mb_height macroblock height
+ * @return 0 on success, a negative AVERROR value on error
+ */
+int ff_intrax8_common_init(AVCodecContext *avctx,
+                           IntraX8Context *w, IDCTDSPContext *idsp,
+                           int16_t (*block)[64],
+                           int block_last_index[12],
+                           int mb_width, int mb_height);
+
+/**
+ * Destroy IntraX8 frame structure.
+ * @param w pointer to IntraX8Context
+ */
+void ff_intrax8_common_end(IntraX8Context *w);
+
+/**
+ * Decode single IntraX8 frame.
+ * @param w pointer to IntraX8Context
+ * @param pict the output Picture containing an AVFrame
+ * @param gb open bitstream reader
+ * @param mb_x pointer to the x coordinate of the current macroblock
+ * @param mb_y pointer to the y coordinate of the current macroblock
+ * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
+ * @param quant_offset offset away from zero
+ * @param loopfilter enable filter after decoding a block
+ */
+int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
+                              GetBitContext *gb, int *mb_x, int *mb_y,
+                              int quant, int halfpq,
+                              int loopfilter, int lowdelay);
 
 #endif /* AVCODEC_INTRAX8_H */