Mercurial > libavcodec.hg

comparison xvmc.h @ 8854:897a2b1f883e libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
whitespace cosmetics: Restore vertical alignment.
author diego
date Sat, 14 Feb 2009 18:15:59 +0000
parents b0292c878f9d
children 96c91837eb36
comparison
equal deleted inserted replaced
8853:b0292c878f9d 8854:897a2b1f883e
23 23
24 #include <X11/extensions/XvMC.h> 24 #include <X11/extensions/XvMC.h>
25 25
26 #include "avcodec.h" 26 #include "avcodec.h"
27 27
28 /**the surface should be shown, the video driver manipulates this*/ 28 #define AV_XVMC_STATE_DISPLAY_PENDING 1 /** the surface should be shown, the video driver manipulates this */
29 #define AV_XVMC_STATE_DISPLAY_PENDING 1 29 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */
30 /**the surface is needed for prediction, the codec manipulates this*/ 30 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */
31 #define AV_XVMC_STATE_PREDICTION 2 31 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct */
32 /**this surface is needed for subpicture rendering*/ 32 // 1337 IDCT MCo
33 #define AV_XVMC_STATE_OSD_SOURCE 4
34 /**<magic value to ensure that regular pixel routines haven't corrupted the struct*/
35 // 1337 IDCT MCo
36 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0
37 33
38 #if LIBAVCODEC_VERSION_MAJOR < 53 34 #if LIBAVCODEC_VERSION_MAJOR < 53
39 #define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING 35 #define MP_XVMC_STATE_DISPLAY_PENDING AV_XVMC_STATE_DISPLAY_PENDING
40 #define MP_XVMC_STATE_PREDICTION AV_XVMC_STATE_PREDICTION 36 #define MP_XVMC_STATE_PREDICTION AV_XVMC_STATE_PREDICTION
41 #define MP_XVMC_STATE_OSD_SOURCE AV_XVMC_STATE_OSD_SOURCE 37 #define MP_XVMC_STATE_OSD_SOURCE AV_XVMC_STATE_OSD_SOURCE
43 #endif 39 #endif
44 40
45 struct xvmc_render_state { 41 struct xvmc_render_state {
46 /** set by calling application */ 42 /** set by calling application */
47 //@{ 43 //@{
48 int magic; ///< used as check for memory corruption by regular pixel routines 44 int magic; ///< used as check for memory corruption by regular pixel routines
49 45
50 short* data_blocks; 46 short* data_blocks;
51 XvMCMacroBlock* mv_blocks; 47 XvMCMacroBlock* mv_blocks;
52 int total_number_of_mv_blocks; 48 int total_number_of_mv_blocks;
53 int total_number_of_data_blocks; 49 int total_number_of_data_blocks;
54 int mc_type; ///<XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT 50 int mc_type; ///< XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT
55 int idct; ///< indicate that IDCT acceleration level is used 51 int idct; ///< indicate that IDCT acceleration level is used
56 int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444 52 int chroma_format; ///< XVMC_CHROMA_FORMAT_420/422/444
57 int unsigned_intra; ///<+-128 for intra pictures after clipping 53 int unsigned_intra; ///< +-128 for intra pictures after clipping
58 XvMCSurface* p_surface; ///<pointer to rendered surface, never changed 54 XvMCSurface* p_surface; ///< pointer to rendered surface, never changed
59 //}@ 55 //}@
60 56
61 /** set by the decoder 57 /** set by the decoder
62 used by the XvMCRenderSurface function */ 58 used by the XvMCRenderSurface function */
63 //@{ 59 //@{
64 XvMCSurface* p_past_surface; ///<pointer to the past surface 60 XvMCSurface* p_past_surface; ///< pointer to the past surface
65 XvMCSurface* p_future_surface; ///<pointer to the future prediction surface 61 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface
66 62
67 unsigned int picture_structure; ///<top/bottom fields or frame! 63 unsigned int picture_structure; ///< top/bottom fields or frame!
68 unsigned int flags; ///<XVMC_SECOND_FIELD - 1st or 2nd field in the sequence 64 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
69 unsigned int display_flags; ///<1,2 or 1+2 fields for XvMCPutSurface 65 unsigned int display_flags; ///< 1,2 or 1+2 fields for XvMCPutSurface
70 //}@ 66 //}@
71 67
72 /** modified by calling application and the decoder */ 68 /** modified by calling application and the decoder */
73 //@{ 69 //@{
74 int state; ///<0 - free, 1 - waiting to display, 2 - waiting for prediction 70 int state; ///< 0 - free, 1 - waiting to display, 2 - waiting for prediction
75 int start_mv_blocks_num; ///<offset in the array for the current slice, updated by vo 71 int start_mv_blocks_num; ///< offset in the array for the current slice, updated by vo
76 int filled_mv_blocks_num; ///<processed mv block in this slice, changed by decoder 72 int filled_mv_blocks_num; ///< processed mv block in this slice, changed by decoder
77 73
78 int next_free_data_block_num; ///<used in add_mv_block, pointer to next free block 74 int next_free_data_block_num; ///< used in add_mv_block, pointer to next free block
79 //}@ 75 //}@
80 /** extensions */ 76 /** extensions */
81 //@{ 77 //@{
82 void * p_osd_target_surface_render; ///<pointer to the surface where subpicture is rendered 78 void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered
83 //}@ 79 //}@
84 80
85 }; 81 };
86 82
87 #endif /* AVCODEC_XVMC_H */ 83 #endif /* AVCODEC_XVMC_H */