# HG changeset patch # User diego # Date 1234631935 0 # Node ID fee39b6b62ea0d84dfea01246605fbb4b6a9d85a # Parent 3bc8263972a3600d98fbd9c92ea69d85e2ee274d Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg. Also adapt MPlayer to definition name changes in libavcodec/xvmc.h. diff -r 3bc8263972a3 -r fee39b6b62ea libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Sat Feb 14 16:39:15 2009 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Sat Feb 14 17:18:55 2009 +0000 @@ -27,7 +27,7 @@ #include "libavcodec/avcodec.h" #if CONFIG_XVMC -#include "xvmc_render.h" +#include "libavcodec/xvmc.h" #endif int avcodec_initialized=0; @@ -985,8 +985,8 @@ if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_get_buffer (render=%p)\n",render); assert(render != 0); - assert(render->magic == MP_XVMC_RENDER_MAGIC); - render->state |= MP_XVMC_STATE_PREDICTION; + assert(render->magic == AV_XVMC_RENDER_MAGIC); + render->state |= AV_XVMC_STATE_PREDICTION; return 0; } @@ -1012,8 +1012,8 @@ if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) ) mp_msg(MSGT_DECVIDEO, MSGL_DBG5, "vd_ffmpeg::mc_release_buffer (render=%p)\n",render); assert(render!=NULL); - assert(render->magic==MP_XVMC_RENDER_MAGIC); - render->state&=~MP_XVMC_STATE_PREDICTION; + assert(render->magic==AV_XVMC_RENDER_MAGIC); + render->state&=~AV_XVMC_STATE_PREDICTION; for(i=0; i<4; i++){ pic->data[i]= NULL; } diff -r 3bc8263972a3 -r fee39b6b62ea libvo/vo_xvmc.c --- a/libvo/vo_xvmc.c Sat Feb 14 16:39:15 2009 +0000 +++ b/libvo/vo_xvmc.c Sat Feb 14 17:18:55 2009 +0000 @@ -42,7 +42,7 @@ #include #include "x11_common.h" -#include "xvmc_render.h" +#include "libavcodec/xvmc.h" #include "sub.h" #include "aspect.h" @@ -371,11 +371,11 @@ rndr = (struct xvmc_render_state*)mpi->priv;//there is copy in plane[2] assert( rndr != NULL ); - assert( rndr->magic == MP_XVMC_RENDER_MAGIC ); + assert( rndr->magic == AV_XVMC_RENDER_MAGIC ); if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) printf("vo_xvmc: draw_image(show rndr=%p)\n",rndr); // the surface have passed vf system without been skiped, it will be displayed - rndr->state |= MP_XVMC_STATE_DISPLAY_PENDING; + rndr->state |= AV_XVMC_STATE_DISPLAY_PENDING; p_render_surface_to_show = rndr; top_field_first = mpi->fields & MP_IMGFIELD_TOP_FIRST; return VO_TRUE; @@ -528,7 +528,7 @@ rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]); if( rez != Success ) break; - surface_render[i].magic = MP_XVMC_RENDER_MAGIC; + surface_render[i].magic = AV_XVMC_RENDER_MAGIC; surface_render[i].data_blocks = data_blocks.blocks; surface_render[i].mv_blocks = mv_blocks.macro_blocks; surface_render[i].total_number_of_mv_blocks = numblocks; @@ -899,12 +899,12 @@ osd_rndr->display_flags = p_render_surface_to_show->display_flags; //add more if needed osd_rndr-> = p_render_surface_to_show->; - p_render_surface_to_show->state &= ~MP_XVMC_STATE_DISPLAY_PENDING; - p_render_surface_to_show->state |= MP_XVMC_STATE_OSD_SOURCE; + p_render_surface_to_show->state &= ~AV_XVMC_STATE_DISPLAY_PENDING; + p_render_surface_to_show->state |= AV_XVMC_STATE_OSD_SOURCE; p_render_surface_to_show->p_osd_target_surface_render = osd_rndr; p_render_surface_to_show = osd_rndr; - p_render_surface_to_show->state = MP_XVMC_STATE_DISPLAY_PENDING; + p_render_surface_to_show->state = AV_XVMC_STATE_DISPLAY_PENDING; if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) printf("vo_xvmc:draw_osd: surface_to_show changed to %p\n",osd_rndr); @@ -982,7 +982,7 @@ printf("vo_xvmc: flip_page show(rndr=%p)\n\n",p_render_surface_to_show); if(p_render_surface_to_show == NULL) return; - assert( p_render_surface_to_show->magic == MP_XVMC_RENDER_MAGIC ); + assert( p_render_surface_to_show->magic == AV_XVMC_RENDER_MAGIC ); //fixme assert( p_render_surface_to_show != p_render_surface_visible); if(use_queue){ @@ -1010,9 +1010,9 @@ //the visible surface won't be displayed anymore, mark it as free if(p_render_surface_visible != NULL) - p_render_surface_visible->state &= ~MP_XVMC_STATE_DISPLAY_PENDING; + p_render_surface_visible->state &= ~AV_XVMC_STATE_DISPLAY_PENDING; -//!!fixme assert(p_render_surface_to_show->state & MP_XVMC_STATE_DISPLAY_PENDING); +//!!fixme assert(p_render_surface_to_show->state & AV_XVMC_STATE_DISPLAY_PENDING); //show it, displaying is always vsynced, so skip it for benchmark put_xvmc_image(p_render_surface_to_show,first_frame); @@ -1127,7 +1127,7 @@ rndr = (struct xvmc_render_state*)image[2];//this is copy of priv-ate assert( rndr != NULL ); - assert( rndr->magic == MP_XVMC_RENDER_MAGIC ); + assert( rndr->magic == AV_XVMC_RENDER_MAGIC ); rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure, rndr->p_surface, @@ -1183,13 +1183,13 @@ 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){ + if(src_rndr->state & AV_XVMC_STATE_OSD_SOURCE){ if( mp_msg_test(MSGT_VO,MSGL_DBG4) ) printf("vo_xvmc: OSD surface=%p quering\n",src_rndr); osd_rndr = src_rndr->p_osd_target_surface_render; XvMCGetSurfaceStatus(mDisplay, osd_rndr->p_surface, &stat); if(!(stat & XVMC_RENDERING)) - src_rndr->state &= ~MP_XVMC_STATE_OSD_SOURCE; + src_rndr->state &= ~AV_XVMC_STATE_OSD_SOURCE; } } static int count_free_surfaces(void) { @@ -1243,8 +1243,8 @@ for(i=0; i -#include -#include -#include -#include -#include - - -//the surface should be shown, the video driver manipulates this -#define MP_XVMC_STATE_DISPLAY_PENDING 1 -//the surface is needed for prediction, the codec manipulates this -#define MP_XVMC_STATE_PREDICTION 2 -//this surface is needed for subpicture rendering -#define MP_XVMC_STATE_OSD_SOURCE 4 -// 1337 IDCT MCo -#define MP_XVMC_RENDER_MAGIC 0x1DC711C0 - -struct xvmc_render_state { - //these are not changed by the decoder! - int magic; - - short * data_blocks; - XvMCMacroBlock * mv_blocks; - int total_number_of_mv_blocks; - int total_number_of_data_blocks; - int mc_type; //XVMC_MPEG1/2/4,XVMC_H263 without XVMC_IDCT - int idct; //Do we use IDCT acceleration? - int chroma_format; //420, 422, 444 - int unsigned_intra; //+-128 for intra pictures after clipping - XvMCSurface* p_surface; //pointer to rendered surface, never changed - - //these are changed by the decoder - //used by the XvMCRenderSurface function - XvMCSurface* p_past_surface; //pointer to the past surface - XvMCSurface* p_future_surface; //pointer to the future prediction surface - - unsigned int picture_structure; //top/bottom fields or frame! - unsigned int flags; //XVMC_SECOND_FIELD - 1st or 2nd field in the sequence - unsigned int display_flags; //1,2 or 1+2 fields for XvMCPutSurface - - //these are for internal communication - 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 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 - //extensions - void * p_osd_target_surface_render; //pointer to the surface where subpicture is rendered - -}; - -#endif /* AVCODEC_XVMC_RENDER_H */