comparison libvo/vo_vesa.c @ 2308:ce35271bdb10

Best fix of slice drawing with libmpeg2

2307:1dcf06bfad9b

static uint32_t image_width, image_height; /* source image dimension */
static uint32_t x_offset,y_offset; /* to center image on screen */
static unsigned init_mode; /* mode before run of mplayer */
static void *init_state = NULL; /* state before run of mplayer */
static struct win_frame win; /* real-mode window to video memory */
static void *yuv_buffer = NULL; /* for yuv2rgb and sw_scaling */
static unsigned video_mode; /* selected video mode for playback */
static struct VesaModeInfoBlock video_mode_info;

#define MOVIE_MODE (MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS)
#define FRAME_MODE (MODE_WIN_RELOCATABLE | MODE_WIN_READABLE | MODE_WIN_WRITEABLE)

  Copies frame to video memory. Data should be in the same format as video
  memory.
*/
static void __vbeCopyData(uint8_t *image)
{
   unsigned long i,j,image_offset,offset,limit;
   unsigned pixel_size,image_line_size,screen_line_size,x_shift;
   pixel_size = (video_mode_info.BitsPerPixel+7)/8;
   screen_line_size = video_mode_info.XResolution*pixel_size;
   image_line_size = image_width*pixel_size;
   if(image_width == video_mode_info.XResolution)

     __vbeCopyBlock(y_offset*screen_line_size,image,image_line_size*image_height);
   }
   else
   {
     x_shift = x_offset*pixel_size;
     limit = image_height+y_offset;
     for(j=0,i=y_offset;i<limit;i++,j++)
     {
       offset = i*screen_line_size+x_shift;
       image_offset = j*image_line_size;
       __vbeCopyBlock(offset,&image[image_offset],image_line_size);
     }
   }
}
/* is called for yuv only */
static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
{
    if(vesa_zoom)
    {
	 SwScale_YV12slice_brg24(image,stride,y,h,
	                     yuv_buffer,
			     image_width*((video_mode_info.BitsPerPixel+7)/8),
			     image_width, video_mode_info.BitsPerPixel,
	    		     scale_xinc, scale_yinc);
    }
    else
    {
	uint8_t *yuv_slice;
	yuv_slice=yuv_buffer+(image_width*y+x)*(video_mode_info.BitsPerPixel+7)/8;
	yuv2rgb(yuv_slice, image[0], image[1], image[2], w, h,
		image_width * ((video_mode_info.BitsPerPixel+7)/8),
		stride[0], stride[1]);
    }
    __vbeCopyData((uint8_t *)yuv_buffer);
    return 0;
}

static void draw_osd(void)
{

  unsigned short *mode_ptr,win_seg;
  unsigned bpp,best_x = UINT_MAX,best_y=UINT_MAX,best_mode_idx = UINT_MAX;
  int err;
	image_width = width;
	image_height = height;
printf("subdevice: %s\n",vo_subdevice);
	if(fullscreen & (0x1|0x8))
	{
	  printf("vo_vesa: switches: -fs, -flip are not supported\n");
	}
	if(fullscreen & 0x04) vesa_zoom = 1;

2308:ce35271bdb10

static uint32_t image_width, image_height; /* source image dimension */
static uint32_t x_offset,y_offset; /* to center image on screen */
static unsigned init_mode; /* mode before run of mplayer */
static void *init_state = NULL; /* state before run of mplayer */
static struct win_frame win; /* real-mode window to video memory */
static uint8_t *yuv_buffer = NULL; /* for yuv2rgb and sw_scaling */
static unsigned video_mode; /* selected video mode for playback */
static struct VesaModeInfoBlock video_mode_info;

#define MOVIE_MODE (MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS)
#define FRAME_MODE (MODE_WIN_RELOCATABLE | MODE_WIN_READABLE | MODE_WIN_WRITEABLE)

  Copies frame to video memory. Data should be in the same format as video
  memory.
*/
static void __vbeCopyData(uint8_t *image)
{
   unsigned long i,j,image_offset,offset;
   unsigned pixel_size,image_line_size,screen_line_size,x_shift;
   pixel_size = (video_mode_info.BitsPerPixel+7)/8;
   screen_line_size = video_mode_info.XResolution*pixel_size;
   image_line_size = image_width*pixel_size;
   if(image_width == video_mode_info.XResolution)

     __vbeCopyBlock(y_offset*screen_line_size,image,image_line_size*image_height);
   }
   else
   {
     x_shift = x_offset*pixel_size;
     for(j=0,i=y_offset;j<image_height;i++,j++)
     {
       offset = i*screen_line_size+x_shift;
       image_offset = j*image_line_size;
       __vbeCopyBlock(offset,&image[image_offset],image_line_size);
     }
   }
}
/* is called for yuv only */
static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
{
    uint8_t *yuv_slice;
    if(vesa_zoom)
    {
	 SwScale_YV12slice_brg24(image,stride,y,h,
	                     yuv_buffer,
			     image_width*((video_mode_info.BitsPerPixel+7)/8),
			     image_width, video_mode_info.BitsPerPixel,
	    		     scale_xinc, scale_yinc);
    }
    else
    {
	yuv_slice=yuv_buffer+(image_width*y+x)*(video_mode_info.BitsPerPixel+7)/8;
	yuv2rgb(yuv_slice, image[0], image[1], image[2], w, h,
		image_width * ((video_mode_info.BitsPerPixel+7)/8),
		stride[0], stride[1]);
    }
    if(y || x || w != image_width || h != image_height)
    {
	unsigned long i,j,image_offset,offset;
	unsigned pixel_size,image_line_size,screen_line_size,x_shift;
	pixel_size = (video_mode_info.BitsPerPixel+7)/8;
	screen_line_size = video_mode_info.XResolution*pixel_size;
	image_line_size = w*pixel_size;
	x_shift = (x_offset+x)*pixel_size;
	for(j=0,i=(y_offset+y);j<h;i++,j++)
	{
	    offset = i*screen_line_size+x_shift;
	    image_offset = j*image_line_size;
	    __vbeCopyBlock(offset,&yuv_slice[image_offset],image_line_size);
	}
    }
    else __vbeCopyData((uint8_t *)yuv_buffer);
    return 0;
}

static void draw_osd(void)
{

  unsigned short *mode_ptr,win_seg;
  unsigned bpp,best_x = UINT_MAX,best_y=UINT_MAX,best_mode_idx = UINT_MAX;
  int err;
	image_width = width;
	image_height = height;
	if(fullscreen & (0x1|0x8))
	{
	  printf("vo_vesa: switches: -fs, -flip are not supported\n");
	}
	if(fullscreen & 0x04) vesa_zoom = 1;