X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxvmc.h;h=950ed1827646da31ccdb73b83b5713fc20f55e26;hb=bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e;hp=8a46cb97721906368634c7cbd367707b636b2518;hpb=6785e509d45a7ccb15fd9485b93932e077c7aaee;p=ffmpeg

diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 8a46cb97721..950ed182764 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -1,87 +1,174 @@
 /*
  * Copyright (C) 2003 Ivan Kalvachev
  *
- * 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
  */
 
 #ifndef AVCODEC_XVMC_H
 #define AVCODEC_XVMC_H
 
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_xvmc
+ * Public libavcodec XvMC header.
+ */
+
 #include <X11/extensions/XvMC.h>
 
+#include "libavutil/attributes.h"
+#include "version.h"
 #include "avcodec.h"
 
-/**the surface should be shown, the video driver manipulates this*/
-#define AV_XVMC_STATE_DISPLAY_PENDING 1
-/**the surface is needed for prediction, the codec manipulates this*/
-#define AV_XVMC_STATE_PREDICTION      2
-/**this surface is needed for subpicture rendering*/
-#define AV_XVMC_STATE_OSD_SOURCE      4
-/**<magic value to ensure that regular pixel routines haven't corrupted the struct*/
-//                              1337    IDCT MCo
-#define AV_XVMC_RENDER_MAGIC          0x1DC711C0
-
-#if LIBAVCODEC_VERSION_MAJOR < 53
-#define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
-#define MP_XVMC_STATE_PREDICTION      AV_XVMC_STATE_PREDICTION
-#define MP_XVMC_STATE_OSD_SOURCE      AV_XVMC_STATE_OSD_SOURCE
-#define MP_XVMC_RENDER_MAGIC          AV_XVMC_RENDER_MAGIC
-#endif
-
-struct xvmc_render_state {
-/**  these are not changed by the decoder! */
-//@{
-    int             magic;              ///< used as check for memory corruption by regular pixel routines
+#if FF_API_XVMC
+
+/**
+ * @defgroup lavc_codec_hwaccel_xvmc XvMC
+ * @ingroup lavc_codec_hwaccel
+ *
+ * @{
+ */
 
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
+                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
+
+attribute_deprecated struct xvmc_pix_fmt {
+    /** The field contains the special constant value AV_XVMC_ID.
+        It is used as a test that the application correctly uses the API,
+        and that there is no corruption caused by pixel routines.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             xvmc_id;
+
+    /** Pointer to the block array allocated by XvMCCreateBlocks().
+        The array has to be freed by XvMCDestroyBlocks().
+        Each group of 64 values represents one data block of differential
+        pixel information (in MoCo mode) or coefficients for IDCT.
+        - application - set the pointer during initialization
+        - libavcodec  - fills coefficients/pixel data into the array
+    */
     short*          data_blocks;
+
+    /** Pointer to the macroblock description array allocated by
+        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
+        - application - set the pointer during initialization
+        - libavcodec  - fills description data into the array
+    */
     XvMCMacroBlock* mv_blocks;
-    int             total_number_of_mv_blocks;
-    int             total_number_of_data_blocks;
-    int             mc_type;            ///<XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT
-    int             idct;               ///< indicate that IDCT acceleration level is used
-    int             chroma_format;      ///< XVMC_CHROMA_FORMAT_420/422/444
-    int             unsigned_intra;     ///<+-128 for intra pictures after clipping
-    XvMCSurface*    p_surface;          ///<pointer to rendered surface, never changed
-//}@
 
-/** these are changed by the decoder
-    //used by the XvMCRenderSurface function */
-//@{
-    XvMCSurface* p_past_surface;    ///<pointer to the past surface
-    XvMCSurface* p_future_surface;  ///<pointer to the future prediction surface
+    /** Number of macroblock descriptions that can be stored in the mv_blocks
+        array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_mv_blocks;
 
-    unsigned int picture_structure; ///<top/bottom fields or frame!
-    unsigned int flags;             ///<XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-    unsigned int display_flags;     ///<1,2 or 1+2 fields for XvMCPutSurface
-//}@
+    /** Number of blocks that can be stored at once in the data_blocks array.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             allocated_data_blocks;
 
-/** these are for internal communication */
-//@{
-    int state;                      ///<0 - free, 1 - waiting to display, 2 - waiting for prediction
-    int start_mv_blocks_num;        ///<offset in the array for the current slice, updated by vo
-    int filled_mv_blocks_num;       ///<processed mv block in this slice, changed by decoder
+    /** Indicate that the hardware would interpret data_blocks as IDCT
+        coefficients and perform IDCT on them.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             idct;
 
-    int next_free_data_block_num;   ///<used in add_mv_block, pointer to next free block
-//}@
-/**extensions*/
+    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
+        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    int             unsigned_intra;
+
+    /** Pointer to the surface allocated by XvMCCreateSurface().
+        It has to be freed by XvMCDestroySurface() on application exit.
+        It identifies the frame and its state on the video hardware.
+        - application - set during initialization
+        - libavcodec  - unchanged
+    */
+    XvMCSurface*    p_surface;
+
+/** Set by the decoder before calling ff_draw_horiz_band(),
+    needed by the XvMCRenderSurface function. */
 //@{
-    void * p_osd_target_surface_render; ///<pointer to the surface where subpicture is rendered
+    /** Pointer to the surface used as past reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_past_surface;
+
+    /** Pointer to the surface used as future reference
+        - application - unchanged
+        - libavcodec  - set
+    */
+    XvMCSurface*    p_future_surface;
+
+    /** top/bottom field or frame
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    picture_structure;
+
+    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
+        - application - unchanged
+        - libavcodec  - set
+    */
+    unsigned int    flags;
 //}@
 
+    /** Number of macroblock descriptions in the mv_blocks array
+        that have already been passed to the hardware.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may increment it
+                        with filled_mb_block_num or zero both.
+        - libavcodec  - unchanged
+    */
+    int             start_mv_blocks_num;
+
+    /** Number of new macroblock descriptions in the mv_blocks array (after
+        start_mv_blocks_num) that are filled by libavcodec and have to be
+        passed to the hardware.
+        - application - zeroes it on get_buffer() or after successful
+                        ff_draw_horiz_band().
+        - libavcodec  - increment with one of each stored MB
+    */
+    int             filled_mv_blocks_num;
+
+    /** Number of the next free data block; one data block consists of
+        64 short values in the data_blocks array.
+        All blocks before this one have already been claimed by placing their
+        position into the corresponding block description structure field,
+        that are part of the mv_blocks array.
+        - application - zeroes it on get_buffer().
+                        A successful ff_draw_horiz_band() may zero it together
+                        with start_mb_blocks_num.
+        - libavcodec  - each decoded macroblock increases it by the number
+                        of coded blocks it contains.
+    */
+    int             next_free_data_block_num;
 };
 
+/**
+ * @}
+ */
+
+#endif /* FF_API_XVMC */
+
 #endif /* AVCODEC_XVMC_H */