diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 17:06:09 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-02 17:06:09 +0000 |
commit | 339746a776f83e0d8bff0aeb7cc8939aad1c7921 (patch) | |
tree | 6966f56404d76a1f89b71c052c610e7e10e7697b /libvo | |
parent | eec12427d706063ed58c5580e54a78647c4878ca (diff) | |
download | mpv-339746a776f83e0d8bff0aeb7cc8939aad1c7921.tar.bz2 mpv-339746a776f83e0d8bff0aeb7cc8939aad1c7921.tar.xz |
Sync with latest round of xvmc changes in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_xvmc.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 1eead7bf94..6e63868942 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -84,13 +84,13 @@ static XvMCMacroBlockArray mv_blocks; #define MAX_SURFACES 8 static int number_of_surfaces=0; static XvMCSurface surface_array[MAX_SURFACES]; -static xvmc_render_state_t * surface_render; +static struct xvmc_render_state * surface_render; -static xvmc_render_state_t * p_render_surface_to_show=NULL; -static xvmc_render_state_t * p_render_surface_visible=NULL; +static struct xvmc_render_state * p_render_surface_to_show=NULL; +static struct xvmc_render_state * p_render_surface_visible=NULL; //display queue, kinda render ahead -static xvmc_render_state_t * show_queue[MAX_SURFACES]; +static struct xvmc_render_state * show_queue[MAX_SURFACES]; static int free_element; @@ -118,7 +118,7 @@ static const struct{ static void xvmc_free(void); static void xvmc_clean_surfaces(void); static int count_free_surfaces(); -static xvmc_render_state_t * find_free_surface(); +static struct xvmc_render_state * find_free_surface(); static const vo_info_t info = { "XVideo Motion Compensation", @@ -346,13 +346,13 @@ surface_found: } static uint32_t xvmc_draw_image(mp_image_t *mpi){ -xvmc_render_state_t * rndr; + struct xvmc_render_state * rndr; assert(mpi!=NULL); assert(mpi->flags &MP_IMGFLAG_DIRECT); // assert(mpi->flags &MP_IMGFLAGS_DRAWBACK); - rndr = (xvmc_render_state_t*)mpi->priv;//there is copy in plane[2] + rndr = (struct xvmc_render_state*)mpi->priv;//there is copy in plane[2] assert( rndr != NULL ); assert( rndr->magic == MP_XVMC_RENDER_MAGIC ); if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) @@ -520,8 +520,8 @@ int vm = flags & VOFLAG_MODESWITCHING; printf("vo_xvmc: mv_blocks allocated\n"); if(surface_render==NULL) - surface_render=malloc(MAX_SURFACES*sizeof(xvmc_render_state_t));//easy mem debug - memset(surface_render,0,MAX_SURFACES*sizeof(xvmc_render_state_t)); + surface_render=malloc(MAX_SURFACES*sizeof(struct xvmc_render_state));//easy mem debug + memset(surface_render,0,MAX_SURFACES*sizeof(struct xvmc_render_state)); for(i=0; i<MAX_SURFACES; i++){ rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]); @@ -850,7 +850,7 @@ int rez; } static void draw_osd(void){ -xvmc_render_state_t * osd_rndr; +struct xvmc_render_state * osd_rndr; int osd_has_changed; int have_osd_to_draw; int rez; @@ -945,7 +945,8 @@ int status,rez; XvMCSyncSurface(mDisplay, srf); } -static void put_xvmc_image(xvmc_render_state_t * p_render_surface, int draw_ck){ +static void put_xvmc_image(struct xvmc_render_state * p_render_surface, + int draw_ck){ int rez; int clipX,clipY,clipW,clipH; int i; @@ -1071,7 +1072,7 @@ int i; surface_render[i].state); } - memset(surface_render,0,MAX_SURFACES*sizeof(xvmc_render_state_t));//for debuging + memset(surface_render,0,MAX_SURFACES*sizeof(struct xvmc_render_state));//for debuging free(surface_render);surface_render=NULL; XvMCDestroyContext(mDisplay,&ctx); @@ -1127,13 +1128,13 @@ int mode_id; static int draw_slice(uint8_t *image[], int stride[], int w, int h, int x, int y){ -xvmc_render_state_t * rndr; +struct xvmc_render_state * rndr; int rez; if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) printf("vo_xvmc: draw_slice y=%d\n",y); - rndr = (xvmc_render_state_t*)image[2];//this is copy of priv-ate + rndr = (struct xvmc_render_state*)image[2];//this is copy of priv-ate assert( rndr != NULL ); assert( rndr->magic == MP_XVMC_RENDER_MAGIC ); @@ -1187,8 +1188,8 @@ int rez; //XvMCHide hides the surface on next retrace, so //check if the surface is not still displaying -static void check_osd_source(xvmc_render_state_t * src_rndr){ -xvmc_render_state_t * osd_rndr; +static void check_osd_source(struct xvmc_render_state * src_rndr){ +struct xvmc_render_state * osd_rndr; int stat; //If this is source surface, check does the OSD rendering is compleate if(src_rndr->state & MP_XVMC_STATE_OSD_SOURCE){ @@ -1211,10 +1212,10 @@ int i,num; return num; } -static xvmc_render_state_t * find_free_surface(){ +static struct xvmc_render_state * find_free_surface(){ int i,t; int stat; -xvmc_render_state_t * visible_rndr; +struct xvmc_render_state * visible_rndr; visible_rndr = NULL; for(i=0; i<number_of_surfaces; i++){ @@ -1264,7 +1265,7 @@ int i; } static uint32_t get_image(mp_image_t *mpi){ -xvmc_render_state_t * rndr; + struct xvmc_render_state * rndr; rndr = find_free_surface(); |