mplayer.hg: libvo/vo_vesa.c comparison

comparison libvo/vo_vesa.c @ 2869:107d9e9e5bd1

New video output technique Linux Video Overlay: -vo vesa:lvo:drv_name (for example -vo vesa:lvo:/dev/radeon_vid or -vo vesa:lvo:/dev/mga_vid) Note: You don't need to have graphics screen before loading xxx_vid driver vo_vesa will switch to graphics mode before using of xxx_vid driver. So you can traditional start it from text-mode.

author	nick
date	Tue, 13 Nov 2001 17:13:33 +0000
parents	8e3875816f6d
children	a70c0054e5fe

comparison

equal deleted inserted replaced

-:4a1802c5bbee
+:107d9e9e5bd1
 /* multibuffering */
 uint8_t*  video_base; /* should be never changed */
 uint32_t  multi_buff[MAX_BUFFERS]; /* contains offsets of buffers */
 uint8_t   multi_size=0; /* total number of buffers */
 uint8_t   multi_idx=0; /* active buffer */
+/* Linux Video Overlay */
+static const char *lvo_name = NULL;
 #define HAS_DGA()  (win.idx == -1)
 #define MOVIE_MODE (MODE_ATTR_COLOR | MODE_ATTR_GRAPHICS)
 #define FRAME_MODE (MODE_WIN_RELOCATABLE | MODE_WIN_WRITEABLE)
 #define PRINT_VBE_ERR(name,err) { printf("vo_vesa: %s returns: %s\n",name,vbeErrToStr(err)); fflush(stdout); }
 static void vesa_term( void )
 {
 int err;
+if(lvo_name) vlvo_term();
 if((err=vbeRestoreState(init_state)) != VBE_OK) PRINT_VBE_ERR("vbeRestoreState",err);
 if((err=vbeSetMode(init_mode,NULL)) != VBE_OK) PRINT_VBE_ERR("vbeSetMode",err);
 if(HAS_DGA()) vbeUnmapVideoBuffer((unsigned long)win.ptr,win.high);
 if(dga_buffer && !HAS_DGA()) free(dga_buffer);
 vbeDestroy();
 /* is called for yuv only */
 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
 if(verbose > 2)
 	printf("vo_vesa: draw_slice was called: w=%u h=%u x=%u y=%u\n",w,h,x,y);
+if(lvo_name) return vlvo_draw_slice(image,stride,w,h,x,y);
+else
 if(vesa_zoom)
 {
 	 uint8_t *dst[3]= {dga_buffer, NULL, NULL};
 	 int dst_stride;
 	 if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE();
 static void draw_osd(void)
 {
 uint32_t w,h;
 if(verbose > 2)
 	printf("vo_vesa: draw_osd was called\n");
-w = HAS_DGA()?video_mode_info.XResolution:image_width;
+if(lvo_name) vlvo_draw_osd();
-h = HAS_DGA()?video_mode_info.YResolution:image_height;
+else
-if(dga_buffer) vo_draw_text(w,h,draw_alpha_fnc);
+{
+w = HAS_DGA()?video_mode_info.XResolution:image_width;
+h = HAS_DGA()?video_mode_info.YResolution:image_height;
+if(dga_buffer) vo_draw_text(w,h,draw_alpha_fnc);
+}
 }
 static void flip_page(void)
 {
 if(verbose > 2)
 	printf("vo_vesa: flip_page was called\n");
+if(lvo_name) vlvo_flip_page();
+else
 if(flip_trigger)
 {
 if(!HAS_DGA()) __vbeCopyData(dga_buffer);
 flip_trigger = 0;
 }
-if(vo_doublebuffering && multi_size > 1)
+if(vo_doublebuffering && multi_size > 1 && !lvo_name)
 {
 int err;
 if((err=vbeSetDisplayStart(multi_buff[multi_idx],1)) != VBE_OK)
 {
 vesa_term();
 static uint32_t draw_frame(uint8_t *src[])
 {
 uint8_t *data = src[0];
 if(verbose > 2)
 printf("vo_vesa: draw_frame was called\n");
+if(lvo_name) return vlvo_draw_frame(src);
+else
 if(rgb2rgb_fnc)
 {
 if(HAS_DGA())
 {
 	size_t i, psize, ssize, dsize;
 	data = dga_buffer;
 }
 if(verbose > 2)
 printf("vo_vesa: rgb2rgb_fnc was called\n");
 }
-if(!rgb2rgb_fnc || !HAS_DGA()) __vbeCopyData(data);
+if((!rgb2rgb_fnc || !HAS_DGA()) && !lvo_name) __vbeCopyData(data);
 return 0;
 }
 static uint32_t query_format(uint32_t format)
 {
 uint32_t flags;
 flags = 0;
 if(strcmp(sd,"nodga") == 0) { flags |= SUBDEV_NODGA; flags &= ~(SUBDEV_FORCEDGA); }
 else
 if(strcmp(sd,"dga") == 0)   { flags &= ~(SUBDEV_NODGA); flags |= SUBDEV_FORCEDGA; }
+else
+if(memcmp(sd,"lvo:",4) == 0) lvo_name = &sd[4]; /* lvo_name will be valid within init() */
 else if(verbose) printf("vo_vesa: Unknown subcommand: %s\n", sd);
 return flags;
 }
 /* fullscreen:
 			image_height = video_mode_info.YResolution;
 			vesa_zoom = 1;
 		      }
 		      scale_xinc=(width << 16) / image_width - 2;  /* needed for proper rounding */
 	    	      scale_yinc=(height << 16) / image_height + 2;
-		      SwScale_Init();
+		      if(!lvo_name) SwScale_Init();
 		      if(verbose) printf("vo_vesa: Using SCALE\n");
 		  }
 		  else
 		  {
 		      printf("vo_vesa: Can't apply zooming to non YV12 formats\n");
 		      return -1;
 		  }
 		}
-		if(format != IMGFMT_YV12 && image_bpp != video_mode_info.BitsPerPixel)
+		if(format != IMGFMT_YV12 && image_bpp != video_mode_info.BitsPerPixel && !lvo_name)
 		{
 		  if(image_bpp == 24 && video_mode_info.BitsPerPixel == 32) rgb2rgb_fnc = rgb24to32;
 		  else
 		  if(image_bpp == 32 && video_mode_info.BitsPerPixel == 24) rgb2rgb_fnc = rgb32to24;
 		  else
 		  cpy_blk_fnc = __vbeCopyBlockFast;
 		}
 		else
 		{
 		  cpy_blk_fnc = __vbeCopyBlock;
-		  if(yuv_fmt || rgb2rgb_fnc)
+		  if((yuv_fmt || rgb2rgb_fnc) && !lvo_name)
 		  {
 		    if(!(dga_buffer = memalign(64,video_mode_info.XResolution*video_mode_info.YResolution*video_mode_info.BitsPerPixel)))
 		    {
 		      printf("vo_vesa: Can't allocate temporary buffer\n");
 		      return -1;
 		if(verbose)
 		{
 		  printf("vo_vesa: Graphics mode was activated\n");
 		  fflush(stdout);
 		}
+		if(lvo_name)
+		{
+		  if(vlvo_init(lvo_name,width,height,x_offset,y_offset,image_width,image_height,format,video_mode_info.BitsPerPixel) != 0)
+		  {
+		    printf("vo_vesa: Can't initialize Linux Video Overlay\n");
+		    vesa_term();
+		    return -1;
+		  }
+		  else printf("vo_vesa: Using video overlay: %s\n",lvo_name);
+		}
 	}
 	else
 	{
 	  printf("vo_vesa: Can't find mode for: %ux%u@%u\n",width,height,bpp);
 	  return -1;

Mercurial > mplayer.hg

comparison libvo/vo_vesa.c @ 2869:107d9e9e5bd1