comparison libvo/vo_xvmc.c @ 28568:1a90167d9f0e

The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.

28567:a0374525d6ad

static XvMCMacroBlockArray mv_blocks;

#define MAX_SURFACES 8
static int number_of_surfaces=0;
static XvMCSurface surface_array[MAX_SURFACES];
static struct xvmc_pixfmt_render * surface_render;

static struct xvmc_pixfmt_render * p_render_surface_to_show=NULL;
static struct xvmc_pixfmt_render * p_render_surface_visible=NULL;

//display queue, kinda render ahead
static struct xvmc_pixfmt_render * show_queue[MAX_SURFACES];
static int free_element;


static void (*draw_osd_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
static void (*clear_osd_fnc)(int x0,int y0, int w,int h);

                  };

static void xvmc_free(void);
static void xvmc_clean_surfaces(void);
static int count_free_surfaces(void);
static struct xvmc_pixfmt_render * find_free_surface(void);

static const vo_info_t info = {
  "XVideo Motion Compensation",
  "xvmc",
  "Ivan Kalvachev <[e-mail]>",

             mc_surf_list[s].surface_type_id,p,i);
   return mc_surf_list[s].surface_type_id;
}

static uint32_t xvmc_draw_image(mp_image_t *mpi){
   struct xvmc_pixfmt_render * rndr;

   assert(mpi!=NULL);
   assert(mpi->flags &MP_IMGFLAG_DIRECT);
//   assert(mpi->flags &MP_IMGFLAGS_DRAWBACK);

   rndr = (struct xvmc_pixfmt_render*)mpi->priv;//there is copy in plane[2]
   assert( rndr != NULL );
   assert( rndr->unique_id == 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

      return -1;
   }
   printf("vo_xvmc: mv_blocks allocated\n");

   if(surface_render==NULL)
      surface_render=malloc(MAX_SURFACES*sizeof(struct xvmc_pixfmt_render));//easy mem debug
   memset(surface_render,0,MAX_SURFACES*sizeof(struct xvmc_pixfmt_render));

   for(i=0; i<MAX_SURFACES; i++){
      rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]);
      if( rez != Success )
	 break;

      assert(0);
   }
}

static void draw_osd(void){
struct xvmc_pixfmt_render * osd_rndr;
int osd_has_changed;
int have_osd_to_draw;
int rez;

   if( mp_msg_test(MSGT_VO,MSGL_DBG4) )

   }       

   XvMCSyncSurface(mDisplay, srf);
}

static void put_xvmc_image(struct xvmc_pixfmt_render * p_render_surface,
			   int draw_ck){
int rez;
struct vo_rect src_rect, dst_rect;
int i;

             (p_render_surface_visible != &surface_render[i]) )
            printf("vo_xvmc::uninit surface_render[%d].status=%d\n",i,
                    surface_render[i].state); 
      }

      memset(surface_render,0,MAX_SURFACES*sizeof(struct xvmc_pixfmt_render));//for debuging
      free(surface_render);surface_render=NULL;

      XvMCDestroyContext(mDisplay,&ctx);
      number_of_surfaces = 0;

}


static int draw_slice(uint8_t *image[], int stride[],
			   int w, int h, int x, int y){
struct xvmc_pixfmt_render * rndr;
int rez;

   if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
      printf("vo_xvmc: draw_slice y=%d\n",y);

   rndr = (struct xvmc_pixfmt_render*)image[2];//this is copy of priv-ate
   assert( rndr != NULL );
   assert( rndr->unique_id == AV_XVMC_RENDER_MAGIC );

   rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure,
             		   rndr->p_surface,

   return VO_TRUE;
}

//XvMCHide hides the surface on next retrace, so
//check if the surface is not still displaying
static void check_osd_source(struct xvmc_pixfmt_render * src_rndr){
struct xvmc_pixfmt_render * osd_rndr;
int stat;
      //If this is source surface, check does the OSD rendering is compleate
      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);

        num++;
   }
   return num;
}

static struct xvmc_pixfmt_render * find_free_surface(void) {
int i,t;
int stat;
struct xvmc_pixfmt_render * visible_rndr;

   visible_rndr = NULL;
   for(i=0; i<number_of_surfaces; i++){

      check_osd_source(&surface_render[i]);

   }
   free_element=0;//clean up the queue
}

static uint32_t get_image(mp_image_t *mpi){
   struct xvmc_pixfmt_render * rndr;

   rndr = find_free_surface();

   if(rndr == NULL){
      printf("vo_xvmc: get_image failed\n");

28568:1a90167d9f0e

static XvMCMacroBlockArray mv_blocks;

#define MAX_SURFACES 8
static int number_of_surfaces=0;
static XvMCSurface surface_array[MAX_SURFACES];
static struct xvmc_pix_fmt *surface_render;

static struct xvmc_pix_fmt *p_render_surface_to_show = NULL;
static struct xvmc_pix_fmt *p_render_surface_visible = NULL;

//display queue, kinda render ahead
static struct xvmc_pix_fmt *show_queue[MAX_SURFACES];
static int free_element;


static void (*draw_osd_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
static void (*clear_osd_fnc)(int x0,int y0, int w,int h);

                  };

static void xvmc_free(void);
static void xvmc_clean_surfaces(void);
static int count_free_surfaces(void);
static struct xvmc_pix_fmt *find_free_surface(void);

static const vo_info_t info = {
  "XVideo Motion Compensation",
  "xvmc",
  "Ivan Kalvachev <[e-mail]>",

             mc_surf_list[s].surface_type_id,p,i);
   return mc_surf_list[s].surface_type_id;
}

static uint32_t xvmc_draw_image(mp_image_t *mpi){
   struct xvmc_pix_fmt *rndr;

   assert(mpi!=NULL);
   assert(mpi->flags &MP_IMGFLAG_DIRECT);
//   assert(mpi->flags &MP_IMGFLAGS_DRAWBACK);

   rndr = (struct xvmc_pix_fmt*)mpi->priv; //there is copy in plane[2]
   assert( rndr != NULL );
   assert( rndr->unique_id == 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

      return -1;
   }
   printf("vo_xvmc: mv_blocks allocated\n");

   if(surface_render==NULL)
      surface_render = malloc(MAX_SURFACES * sizeof(struct xvmc_pix_fmt)); //easy mem debug
   memset(surface_render, 0, MAX_SURFACES * sizeof(struct xvmc_pix_fmt));

   for(i=0; i<MAX_SURFACES; i++){
      rez=XvMCCreateSurface(mDisplay,&ctx,&surface_array[i]);
      if( rez != Success )
	 break;

      assert(0);
   }
}

static void draw_osd(void){
struct xvmc_pix_fmt *osd_rndr;
int osd_has_changed;
int have_osd_to_draw;
int rez;

   if( mp_msg_test(MSGT_VO,MSGL_DBG4) )

   }       

   XvMCSyncSurface(mDisplay, srf);
}

static void put_xvmc_image(struct xvmc_pix_fmt *p_render_surface,
			   int draw_ck){
int rez;
struct vo_rect src_rect, dst_rect;
int i;

             (p_render_surface_visible != &surface_render[i]) )
            printf("vo_xvmc::uninit surface_render[%d].status=%d\n",i,
                    surface_render[i].state); 
      }

      memset(surface_render, 0, MAX_SURFACES * sizeof(struct xvmc_pix_fmt)); //for debugging
      free(surface_render);surface_render=NULL;

      XvMCDestroyContext(mDisplay,&ctx);
      number_of_surfaces = 0;

}


static int draw_slice(uint8_t *image[], int stride[],
			   int w, int h, int x, int y){
struct xvmc_pix_fmt *rndr;
int rez;

   if( mp_msg_test(MSGT_VO,MSGL_DBG4) )
      printf("vo_xvmc: draw_slice y=%d\n",y);

   rndr = (struct xvmc_pix_fmt*)image[2]; //this is copy of priv-ate
   assert( rndr != NULL );
   assert( rndr->unique_id == AV_XVMC_RENDER_MAGIC );

   rez = XvMCRenderSurface(mDisplay,&ctx,rndr->picture_structure,
             		   rndr->p_surface,

   return VO_TRUE;
}

//XvMCHide hides the surface on next retrace, so
//check if the surface is not still displaying
static void check_osd_source(struct xvmc_pix_fmt *src_rndr) {
struct xvmc_pix_fmt *osd_rndr;
int stat;
      //If this is source surface, check does the OSD rendering is compleate
      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);

        num++;
   }
   return num;
}

static struct xvmc_pix_fmt *find_free_surface(void) {
int i,t;
int stat;
struct xvmc_pix_fmt *visible_rndr;

   visible_rndr = NULL;
   for(i=0; i<number_of_surfaces; i++){

      check_osd_source(&surface_render[i]);

   }
   free_element=0;//clean up the queue
}

static uint32_t get_image(mp_image_t *mpi){
   struct xvmc_pix_fmt *rndr;

   rndr = find_free_surface();

   if(rndr == NULL){
      printf("vo_xvmc: get_image failed\n");