[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.16,1.17

[Felix Buenemann]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv5994

Modified Files:
	vo_sdl.c 
Log Message:
fixes osd/subtitle for UYVY image format and steps back to 1.15 changes


Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** vo_sdl.c	2001/04/15 20:31:58	1.16
--- vo_sdl.c	2001/04/15 21:08:11	1.17
***************
*** 157,164 ****
  		break;
  		case IMGFMT_YUY2:
-         	case IMGFMT_UYVY:
          	case IMGFMT_YVYU:		
      			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0),2*priv->width);
  		break;	
    	}	
  }
--- 157,166 ----
  		break;
  		case IMGFMT_YUY2:
          	case IMGFMT_YVYU:		
      			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0),2*priv->width);
  		break;	
+         	case IMGFMT_UYVY:
+     			vo_draw_alpha_yuy2(w,h,src,srca,stride,((uint8_t *) *(priv->overlay->pixels))+2*(priv->width*y0+x0)+1,2*priv->width);
+ 		break;	
    	}	
  }
***************
*** 377,399 ****
  	struct sdl_priv_s *priv = &sdl_priv;
          unsigned int sdl_format;
- 
  
          switch(format){
!           case IMGFMT_YV12:
! 	  	sdl_format=SDL_YV12_OVERLAY;
! 		printf("SDL: Using YV12 image format\n");
! 	  break;
!           case IMGFMT_YUY2:
! 	  	sdl_format=SDL_YUY2_OVERLAY;
! 		printf("SDL: Using YUY2 image format\n");
! 	  break;
!           case IMGFMT_UYVY:
! 	  	sdl_format=SDL_UYVY_OVERLAY;
! 		printf("SDL: Using UYVY image format\n");
! 	  break;
!           default:
!             printf("SDL: Unsupported image format (0x%X)\n",format);
!             return -1;
!         }
  
  	sdl_open (NULL, NULL);
--- 379,404 ----
  	struct sdl_priv_s *priv = &sdl_priv;
          unsigned int sdl_format;
  
+ 	sdl_format = format;
          switch(format){
! 		case IMGFMT_YV12:
! 			printf("\nSDL: Using 0x%X (YV12) image format\n", format); break;
! 		case IMGFMT_IYUV:
! 			printf("\nSDL: Using 0x%X (IYUV) image format\n", format); break;
! 		case IMGFMT_YUY2:
! 			printf("\nSDL: Using 0x%X (YUY2) image format\n", format); break;
! 		case IMGFMT_UYVY:
! 			printf("\nSDL: Using 0x%X (UYVY) image format\n", format); break;
! 		case IMGFMT_YVYU:
! 			printf("\nSDL: Using 0x%X (YVYU) image format\n", format); break;
! 		case IMGFMT_I420:
! 			printf("\nSDL: Using 0x%X (I420) image format\n", format);
! 			printf("SDL: Mapping I420 to IYUV (untested please report if it works)\n");
! 			sdl_format = SDL_IYUV_OVERLAY;
! 		break;	
! 		default:
! 			printf("\nSDL: Unsupported image format (0x%X)\n",format);
! 			return -1;
! 	}
  
  	sdl_open (NULL, NULL);


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog