mirror of https://github.com/mpv-player/mpv
Port typo fixes from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25572 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6da8e4a81d
commit
e34bdcc26a
|
@ -6,9 +6,9 @@
|
||||||
#include <X11/extensions/XvMClib.h>
|
#include <X11/extensions/XvMClib.h>
|
||||||
|
|
||||||
|
|
||||||
//the surface should be shown, video driver manipulate this
|
//the surface should be shown, video driver manipulates this
|
||||||
#define MP_XVMC_STATE_DISPLAY_PENDING 1
|
#define MP_XVMC_STATE_DISPLAY_PENDING 1
|
||||||
//the surface is needed for prediction, codec manipulate this
|
//the surface is needed for prediction, codec manipulates this
|
||||||
#define MP_XVMC_STATE_PREDICTION 2
|
#define MP_XVMC_STATE_PREDICTION 2
|
||||||
//this surface is needed for subpicture rendering
|
//this surface is needed for subpicture rendering
|
||||||
#define MP_XVMC_STATE_OSD_SOURCE 4
|
#define MP_XVMC_STATE_OSD_SOURCE 4
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
#define MP_XVMC_RENDER_MAGIC 0x1DC711C0
|
#define MP_XVMC_RENDER_MAGIC 0x1DC711C0
|
||||||
|
|
||||||
typedef struct{
|
typedef struct{
|
||||||
//these are not changed by decoder!
|
//these are not changed by the decoder!
|
||||||
int magic;
|
int magic;
|
||||||
|
|
||||||
short * data_blocks;
|
short * data_blocks;
|
||||||
|
@ -24,7 +24,7 @@ typedef struct{
|
||||||
int total_number_of_mv_blocks;
|
int total_number_of_mv_blocks;
|
||||||
int total_number_of_data_blocks;
|
int total_number_of_data_blocks;
|
||||||
int mc_type;//XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT
|
int mc_type;//XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT
|
||||||
int idct;//does we use IDCT acceleration?
|
int idct;//Do we use IDCT acceleration?
|
||||||
int chroma_format;//420,422,444
|
int chroma_format;//420,422,444
|
||||||
int unsigned_intra;//+-128 for intra pictures after clip
|
int unsigned_intra;//+-128 for intra pictures after clip
|
||||||
XvMCSurface* p_surface;//pointer to rendered surface, never changed
|
XvMCSurface* p_surface;//pointer to rendered surface, never changed
|
||||||
|
@ -34,14 +34,14 @@ typedef struct{
|
||||||
XvMCSurface* p_past_surface;//pointer to the past surface
|
XvMCSurface* p_past_surface;//pointer to the past surface
|
||||||
XvMCSurface* p_future_surface;//pointer to the future prediction surface
|
XvMCSurface* p_future_surface;//pointer to the future prediction surface
|
||||||
|
|
||||||
unsigned int picture_structure;//top/bottom fields or frame !
|
unsigned int picture_structure;//top/bottom fields or frame!
|
||||||
unsigned int flags;//XVMC_SECOND_FIELD - 1'st or 2'd field in the sequence
|
unsigned int flags;//XVMC_SECOND_FIELD - 1'st or 2'd field in the sequence
|
||||||
unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface,
|
unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface,
|
||||||
|
|
||||||
//these are internal communication one
|
//these are internal communication ones
|
||||||
int state;//0-free,1 Waiting to Display,2 Waiting for prediction
|
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 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,change by decoder
|
int filled_mv_blocks_num;//processed mv block in this slice, changed by decoder
|
||||||
|
|
||||||
int next_free_data_block_num;//used in add_mv_block, pointer to next free block
|
int next_free_data_block_num;//used in add_mv_block, pointer to next free block
|
||||||
//extensions
|
//extensions
|
||||||
|
|
Loading…
Reference in New Issue