comparison xvmc.h @ 8929:44791077431e libavcodec

comment spelling/grammar/wording fixes
author diego
date Sun, 15 Feb 2009 19:06:05 +0000
parents ef4e7c8e322a
children 9f596cd79411
comparison
equal deleted inserted replaced
8928:ef4e7c8e322a 8929:44791077431e
26 #include "avcodec.h" 26 #include "avcodec.h"
27 27
28 #if LIBAVCODEC_VERSION_MAJOR < 53 28 #if LIBAVCODEC_VERSION_MAJOR < 53
29 #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 /** the surface should be shown, the video driver manipulates this */
30 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */ 30 #define AV_XVMC_STATE_PREDICTION 2 /** the surface is needed for prediction, the codec manipulates this */
31 #define AV_XVMC_STATE_OSD_SOURCE 4 /** this surface is needed for subpicture rendering */ 31 #define AV_XVMC_STATE_OSD_SOURCE 4 /** the surface is needed for subpicture rendering */
32 #endif 32 #endif
33 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct 33 #define AV_XVMC_RENDER_MAGIC 0x1DC711C0 /**< magic value to ensure that regular pixel routines haven't corrupted the struct
34 the number is 1337 speak for the letters IDCT MCo (motion compensation) */ 34 the number is 1337 speak for the letters IDCT MCo (motion compensation) */
35 35
36 struct xvmc_pix_fmt { 36 struct xvmc_pix_fmt {
37 /** Set by calling application 37 /** Set by the calling application.
38 Once set these values are not supposed to be modified. 38 Once set these values are not supposed to be modified.
39 */ 39 */
40 //@{ 40 //@{
41 int xvmc_id; ///< used as a check against memory corruption by regular pixel routines or other API structure 41 int xvmc_id; ///< used as a check against memory corruption by regular pixel routines or other API structures
42 42
43 short* data_blocks; 43 short* data_blocks;
44 XvMCMacroBlock* mv_blocks; 44 XvMCMacroBlock* mv_blocks;
45 int total_number_of_mv_blocks; 45 int total_number_of_mv_blocks;
46 int total_number_of_data_blocks; 46 int total_number_of_data_blocks;
47 int idct; ///< indicate that IDCT acceleration level is used 47 int idct; ///< indicate that IDCT acceleration level is used
48 int unsigned_intra; ///< +-128 for intra pictures after clipping 48 int unsigned_intra; ///< +-128 for intra pictures after clipping
49 XvMCSurface* p_surface; ///< pointer to rendered surface, never changed 49 XvMCSurface* p_surface; ///< pointer to rendered surface, never changed
50 //}@ 50 //}@
51 51
52 /** Set by the decoder before calling draw_horiz_band() 52 /** Set by the decoder before calling draw_horiz_band(),
53 need by the XvMCRenderSurface function */ 53 needed by the XvMCRenderSurface function. */
54 //@{ 54 //@{
55 XvMCSurface* p_past_surface; ///< pointer to the past surface 55 XvMCSurface* p_past_surface; ///< pointer to the past surface
56 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface 56 XvMCSurface* p_future_surface; ///< pointer to the future prediction surface
57 57
58 unsigned int picture_structure; ///< top/bottom field or frame 58 unsigned int picture_structure; ///< top/bottom field or frame
59 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence 59 unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
60 //}@ 60 //}@
61 61
62 /** Offset in the mv array for the current slice: 62 /** Offset in the mv array for the current slice:
63 - application - zeros it on get_buffer(). 63 - application - zeros it on get_buffer().
64 successful draw_horiz_band() may increment it 64 A successful draw_horiz_band() may increment it
65 with filled_mb_block_num or zero both. 65 with filled_mb_block_num or zero both.
66 - libavcodec - unchanged 66 - libavcodec - unchanged
67 */ 67 */
68 int start_mv_blocks_num; 68 int start_mv_blocks_num;
69 69
80 int next_free_data_block_num; 80 int next_free_data_block_num;
81 81
82 /** extensions may be placed here */ 82 /** extensions may be placed here */
83 #if LIBAVCODEC_VERSION_MAJOR < 53 83 #if LIBAVCODEC_VERSION_MAJOR < 53
84 //@{ 84 //@{
85 /** State - used to workaround limitations in MPlayer video system. 85 /** State - used to work around limitations in the MPlayer video system.
86 0 - Surface not used 86 0 - Surface is not used.
87 1 - Surface is still hold in application to be displayed or is still visible. 87 1 - Surface is still held in application to be displayed or is still visible.
88 2 - Surface is still hold in libavcodec buffer for prediction 88 2 - Surface is still held in libavcodec buffer for prediction.
89 */ 89 */
90 int state; 90 int state;
91 void* p_osd_target_surface_render; ///< pointer to the surface where subpicture is rendered 91 void* p_osd_target_surface_render; ///< pointer to the surface where the subpicture is rendered
92 //}@ 92 //}@
93 #endif 93 #endif
94 }; 94 };
95 95
96 #endif /* AVCODEC_XVMC_H */ 96 #endif /* AVCODEC_XVMC_H */