Mercurial > libavcodec.hg

comparison xvmc.h @ 8850:73b84757dc05 libavcodec

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