[Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.6,1.7 vo_xv.c,1.2,1.3
Zoltan Ponekker
pontscho at users.sourceforge.net
Wed Mar 21 20:10:57 CET 2001
Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv28658/libvo
Modified Files:
vo_xmga.c vo_xv.c
Log Message:
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** vo_xmga.c 2001/03/17 19:19:18 1.6
--- vo_xmga.c 2001/03/21 19:10:55 1.7
***************
*** 1,289 ****
!
! //#define SHOW_TIME
!
! /*
! * video_out_xmga.c
! *
! * Copyright (C) Zoltan Ponekker - Jan 2001
! *
! * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
! *
! * mpeg2dec is free software; you can redistribute it and/or modify
! * it under the terms of the GNU General Public License as published by
! * the Free Software Foundation; either version 2, or (at your option)
! * any later version.
! *
! * mpeg2dec is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
! *
! * You should have received a copy of the GNU General Public License
! * along with GNU Make; see the file COPYING. If not, write to
! * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
! *
! */
!
! #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
!
! #include "config.h"
! #include "video_out.h"
! #include "video_out_internal.h"
!
! LIBVO_EXTERN( xmga )
!
! #include <sys/ioctl.h>
! #include <unistd.h>
! #include <fcntl.h>
! #include <sys/mman.h>
!
! #include "drivers/mga_vid.h"
!
! #include <X11/Xlib.h>
! #include <X11/Xutil.h>
! #include <errno.h>
!
! #include "x11_common.h"
!
! #ifdef SHOW_TIME
! #include "../linux/timer.h"
! static unsigned int timer=0;
! static unsigned int timerd=0;
! #endif
!
! static vo_info_t vo_info =
! {
! "X11 (Matrox G200/G400 overlay in window using /dev/mga_vid)",
! "xmga",
! "Zoltan Ponekker <pontscho at makacs.poliod.hu>",
! ""
! };
!
! static Display * mDisplay;
! static Window mWindow;
! static GC mGC;
! static XGCValues wGCV;
!
! static XImage * myximage;
!
! static uint32_t mDepth, bpp, mode;
! static XWindowAttributes attribs;
! static uint32_t X_already_started=0;
!
! static uint32_t wndHeight;
! static uint32_t wndWidth;
! static uint32_t wndX;
! static uint32_t wndY;
!
! static uint32_t fgColor;
!
! static uint32_t mvHeight;
! static uint32_t mvWidth;
!
! static Window mRoot;
! static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
! static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen;
!
! static XSetWindowAttributes xWAttribs;
!
! #include "mga_common.c"
!
!
!
! static void mDrawColorKey( void )
! {
! XClearWindow( mDisplay,mWindow );
! XSetForeground( mDisplay,mGC,fgColor );
! XFillRectangle( mDisplay,mWindow,mGC,drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight) );
! XFlush( mDisplay );
! }
!
! static void set_window(){
!
! XGetGeometry( mDisplay,mWindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
! drwX=0; drwY=0; // drwWidth=wndWidth; drwHeight=wndHeight;
! XTranslateCoordinates( mDisplay,mWindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
! fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
!
! if ( mFullscreen )
! {
! drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
! drwcX+=drwX;
! drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
! drwcY+=drwY;
! drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
! drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
! fprintf( stderr,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
! }
!
! mDrawColorKey();
!
! mga_vid_config.x_org=drwcX;
! mga_vid_config.y_org=drwcY;
! mga_vid_config.dest_width=drwWidth;
! mga_vid_config.dest_height=drwHeight;
!
! }
!
! static void check_events(void)
! {
! int e=vo_x11_check_events(mDisplay);
!
! if(e&VO_EVENT_RESIZE){
! set_window();
! if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
! {
! fprintf( stderr,"Error in mga_vid_config ioctl" );
! // exit( 0 );
! }
!
! } else
! if(e&VO_EVENT_EXPOSE) mDrawColorKey();
!
! }
!
! static void flip_page(void){
! #ifdef SHOW_TIME
! unsigned int t;
! t=GetTimer();
! printf(" [timer: %08X diff: %6d dd: %6d ] \n",t,t-timer,(t-timer)-timerd);
! timerd=t-timer;
! timer=t;
! #endif
!
! check_events();
! vo_mga_flip_page();
! }
!
! static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format )
! {
! char * frame_mem;
! // uint32_t frame_size;
! int mScreen;
! unsigned int fg, bg;
! char * mTitle=(title == NULL) ? "XMGA render" : title;
! char * name=":0.0";
! XSizeHints hint;
! XVisualInfo vinfo;
! XEvent xev;
!
! XGCValues xgcv;
! unsigned long xswamask;
!
! f=open( "/dev/mga_vid",O_RDWR );
! if ( f == -1 )
! {
! fprintf(stderr,"Couldn't open /dev/mga_vid\n");
! return(-1);
! }
!
! switch(format)
! {
! case IMGFMT_YV12:
! mga_vid_config.format=MGA_VID_FORMAT_YV12;
! mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2;
! break;
! case IMGFMT_YUY2:
! mga_vid_config.format=MGA_VID_FORMAT_YUY2;
! mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
! break;
! default: fprintf(stderr,"mga: invalid output format %0X\n",format); return (-1);
! }
!
! if ( X_already_started ) return -1;
!
! vo_init();
!
! if ( getenv( "DISPLAY" ) ) name=getenv( "DISPLAY" );
! mDisplay=XOpenDisplay(name);
! if ( mDisplay == NULL )
! {
! fprintf( stderr,"Can not open display\n" );
! return -1;
! }
!
! mScreen=DefaultScreen( mDisplay );
!
! mvWidth=width; mvHeight=height;
!
! wndX=0; wndY=0;
! wndWidth=d_width; wndHeight=d_height;
! dwidth=d_width; dheight=d_height;
! mFullscreen=fullscreen;
!
! if ( fullscreen )
! {
! wndWidth=vo_screenwidth;
! wndHeight=vo_screenheight;
! }
!
! XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
! mDepth=attribs.depth;
! if ( mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32 ) mDepth=24;
! XMatchVisualInfo( mDisplay,mScreen,mDepth,TrueColor,&vinfo );
! xWAttribs.colormap=XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),vinfo.visual,AllocNone );
! switch ( vo_depthonscreen )
! {
! case 32:
! case 24: fgColor=0x00ff00ffL; break;
! case 16: fgColor=0xf81fL; break;
! case 15: fgColor=0x7c1fL; break;
! default: fprintf( stderr,"Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
! }
! xWAttribs.background_pixel=0;
! xWAttribs.border_pixel=0;
! xWAttribs.event_mask=StructureNotifyMask | ExposureMask | KeyPressMask;
! xswamask=CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
!
! mWindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
! wndX,wndY,
! wndWidth,wndHeight,
! xWAttribs.border_pixel,
! mDepth,
! InputOutput,
! vinfo.visual,xswamask,&xWAttribs );
!
! if ( fullscreen ) vo_x11_decoration( mDisplay,mWindow,0 );
!
! XGetNormalHints( mDisplay,mWindow,&hint );
! hint.x=wndX; hint.y=wndY;
! hint.width=wndWidth; hint.height=wndHeight;
! hint.base_width=wndWidth; hint.base_height=wndHeight;
! hint.flags=USPosition | USSize;
! XSetNormalHints( mDisplay,mWindow,&hint );
! XStoreName( mDisplay,mWindow,mTitle );
!
! mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
!
! XMapWindow( mDisplay,mWindow );
!
! set_window();
!
! mga_vid_config.src_width=width;
! mga_vid_config.src_height=height;
!
! mga_vid_config.colkey_on=1;
! mga_vid_config.colkey_red=255;
! mga_vid_config.colkey_green=0;
! mga_vid_config.colkey_blue=255;
!
! if(mga_init()) return -1;
!
! XFlush( mDisplay );
! XSync( mDisplay,False );
!
! return 0;
! }
!
! static const vo_info_t* get_info( void )
! { return &vo_info; }
!
!
! static void
! uninit(void)
! {
! ioctl( f,MGA_VID_OFF,0 );
! printf("vo: uninit!\n");
! }
--- 1,287 ----
!
! //#define SHOW_TIME
!
! /*
! * video_out_xmga.c
! *
! * Copyright (C) Zoltan Ponekker - Jan 2001
! *
! * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
! *
! * mpeg2dec is free software; you can redistribute it and/or modify
! * it under the terms of the GNU General Public License as published by
! * the Free Software Foundation; either version 2, or (at your option)
! * any later version.
! *
! * mpeg2dec is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! * GNU General Public License for more details.
! *
! * You should have received a copy of the GNU General Public License
! * along with GNU Make; see the file COPYING. If not, write to
! * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
! *
! */
!
! #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
!
! #include "config.h"
! #include "video_out.h"
! #include "video_out_internal.h"
!
! LIBVO_EXTERN( xmga )
!
! #include <sys/ioctl.h>
! #include <unistd.h>
! #include <fcntl.h>
! #include <sys/mman.h>
!
! #include "drivers/mga_vid.h"
!
! #include <X11/Xlib.h>
! #include <X11/Xutil.h>
! #include <errno.h>
!
! #include "x11_common.h"
!
! #ifdef SHOW_TIME
! #include "../linux/timer.h"
! static unsigned int timer=0;
! static unsigned int timerd=0;
! #endif
!
! static vo_info_t vo_info =
! {
! "X11 (Matrox G200/G400 overlay in window using /dev/mga_vid)",
! "xmga",
! "Zoltan Ponekker <pontscho at makacs.poliod.hu>",
! ""
! };
!
! static Display * mDisplay;
! static Window mWindow;
! static GC mGC;
! static XGCValues wGCV;
!
! static XImage * myximage;
!
! static uint32_t mDepth, bpp, mode;
! static XWindowAttributes attribs;
! static uint32_t X_already_started=0;
!
! static uint32_t wndHeight;
! static uint32_t wndWidth;
! static uint32_t wndX;
! static uint32_t wndY;
!
! static uint32_t fgColor;
!
! static uint32_t mvHeight;
! static uint32_t mvWidth;
!
! static Window mRoot;
! static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
! static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen;
!
! static XSetWindowAttributes xWAttribs;
!
! #include "mga_common.c"
!
! static void mDrawColorKey( void )
! {
! XClearWindow( mDisplay,mWindow );
! XSetForeground( mDisplay,mGC,fgColor );
! XFillRectangle( mDisplay,mWindow,mGC,drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight) );
! XFlush( mDisplay );
! }
!
! static void set_window(){
!
! XGetGeometry( mDisplay,mWindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
! drwX=0; drwY=0; // drwWidth=wndWidth; drwHeight=wndHeight;
! XTranslateCoordinates( mDisplay,mWindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
! fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
!
! if ( mFullscreen )
! {
! drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
! drwcX+=drwX;
! drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
! drwcY+=drwY;
! drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
! drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
! fprintf( stderr,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
! }
!
! mDrawColorKey();
!
! mga_vid_config.x_org=drwcX;
! mga_vid_config.y_org=drwcY;
! mga_vid_config.dest_width=drwWidth;
! mga_vid_config.dest_height=drwHeight;
!
! }
!
! static void check_events(void)
! {
! int e=vo_x11_check_events(mDisplay);
!
! if(e&VO_EVENT_RESIZE){
! set_window();
! if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
! {
! fprintf( stderr,"Error in mga_vid_config ioctl" );
! // exit( 0 );
! }
!
! } else
! if(e&VO_EVENT_EXPOSE) mDrawColorKey();
!
! }
!
! static void flip_page(void){
! #ifdef SHOW_TIME
! unsigned int t;
! t=GetTimer();
! printf(" [timer: %08X diff: %6d dd: %6d ] \n",t,t-timer,(t-timer)-timerd);
! timerd=t-timer;
! timer=t;
! #endif
!
! check_events();
! vo_mga_flip_page();
! }
!
! static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format )
! {
! char * frame_mem;
! // uint32_t frame_size;
! int mScreen;
! unsigned int fg, bg;
! char * mTitle=(title == NULL) ? "XMGA render" : title;
! char * name=":0.0";
! XSizeHints hint;
! XVisualInfo vinfo;
! XEvent xev;
!
! XGCValues xgcv;
! unsigned long xswamask;
!
! f=open( "/dev/mga_vid",O_RDWR );
! if ( f == -1 )
! {
! fprintf(stderr,"Couldn't open /dev/mga_vid\n");
! return(-1);
! }
!
! switch(format)
! {
! case IMGFMT_YV12:
! mga_vid_config.format=MGA_VID_FORMAT_YV12;
! mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height + ( ( ( width + 31 ) & ~31 ) * height ) / 2;
! break;
! case IMGFMT_YUY2:
! mga_vid_config.format=MGA_VID_FORMAT_YUY2;
! mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
! break;
! default: fprintf(stderr,"mga: invalid output format %0X\n",format); return (-1);
! }
!
! if ( X_already_started ) return -1;
!
! vo_init();
!
! if ( getenv( "DISPLAY" ) ) name=getenv( "DISPLAY" );
! mDisplay=XOpenDisplay(name);
! if ( mDisplay == NULL )
! {
! fprintf( stderr,"Can not open display\n" );
! return -1;
! }
!
! mScreen=DefaultScreen( mDisplay );
!
! mvWidth=width; mvHeight=height;
!
! wndX=0; wndY=0;
! wndWidth=d_width; wndHeight=d_height;
! dwidth=d_width; dheight=d_height;
! mFullscreen=fullscreen;
!
! if ( fullscreen )
! {
! wndWidth=vo_screenwidth;
! wndHeight=vo_screenheight;
! }
!
! XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
! mDepth=attribs.depth;
! if ( mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32 ) mDepth=24;
! XMatchVisualInfo( mDisplay,mScreen,mDepth,TrueColor,&vinfo );
! xWAttribs.colormap=XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ),vinfo.visual,AllocNone );
! switch ( vo_depthonscreen )
! {
! case 32:
! case 24: fgColor=0x00ff00ffL; break;
! case 16: fgColor=0xf81fL; break;
! case 15: fgColor=0x7c1fL; break;
! default: fprintf( stderr,"Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
! }
! xWAttribs.background_pixel=0;
! xWAttribs.border_pixel=0;
! xWAttribs.event_mask=StructureNotifyMask | ExposureMask | KeyPressMask;
! xswamask=CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
!
! mWindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
! wndX,wndY,
! wndWidth,wndHeight,
! xWAttribs.border_pixel,
! mDepth,
! InputOutput,
! vinfo.visual,xswamask,&xWAttribs );
!
! if ( fullscreen ) vo_x11_decoration( mDisplay,mWindow,0 );
!
! XGetNormalHints( mDisplay,mWindow,&hint );
! hint.x=wndX; hint.y=wndY;
! hint.width=wndWidth; hint.height=wndHeight;
! hint.base_width=wndWidth; hint.base_height=wndHeight;
! hint.flags=USPosition | USSize;
! XSetNormalHints( mDisplay,mWindow,&hint );
! XStoreName( mDisplay,mWindow,mTitle );
!
! mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
!
! XMapWindow( mDisplay,mWindow );
!
! set_window();
!
! mga_vid_config.src_width=width;
! mga_vid_config.src_height=height;
!
! mga_vid_config.colkey_on=1;
! mga_vid_config.colkey_red=255;
! mga_vid_config.colkey_green=0;
! mga_vid_config.colkey_blue=255;
!
! if(mga_init()) return -1;
!
! XFlush( mDisplay );
! XSync( mDisplay,False );
!
! return 0;
! }
!
! static const vo_info_t* get_info( void )
! { return &vo_info; }
!
!
! static void
! uninit(void)
! {
! ioctl( f,MGA_VID_OFF,0 );
! printf("vo: uninit!\n");
! }
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** vo_xv.c 2001/03/03 21:46:39 1.2
--- vo_xv.c 2001/03/21 19:10:55 1.3
***************
*** 1,15 ****
- #define DISP
! /*
! * video_out_x11.c, X11 interface
*
*
- * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
- *
* Hacked into mpeg2dec by
- *
- * Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
*
! * 15 & 16 bpp support added by Franck Sicard <Franck.Sicard at solsoft.fr>
*
* Xv image suuport by Gerd Knorr <kraxel at goldbach.in-berlin.de>
--- 1,11 ----
! /*
! * vo_xv.c, X11 Xv interface
*
+ * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
*
* Hacked into mpeg2dec by
*
! * Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
*
* Xv image suuport by Gerd Knorr <kraxel at goldbach.in-berlin.de>
***************
*** 30,43 ****
#include <X11/extensions/XShm.h>
#include <errno.h>
- #include "yuv2rgb.h"
#include "x11_common.h"
! static vo_info_t vo_info =
{
! "X11/Xv",
! "xv",
! "Gerd Knorr <kraxel at goldbach.in-berlin.de>",
! ""
};
--- 26,38 ----
#include <X11/extensions/XShm.h>
#include <errno.h>
#include "x11_common.h"
! static vo_info_t vo_info =
{
! "X11/Xv",
! "xv",
! "Gerd Knorr <kraxel at goldbach.in-berlin.de>",
! ""
};
***************
*** 62,66 ****
static unsigned int ver,rel,req,ev,err;
static unsigned int formats, adaptors,i,xv_port,xv_format;
- //static int vo_dwidth,vo_dheight;
static XvAdaptorInfo *ai;
static XvImageFormatValues *fo;
--- 57,60 ----
***************
*** 81,417 ****
static uint32_t image_format;
! static int get_depth(){
! char *name = ":0.0";
! if(getenv("DISPLAY")) name = getenv("DISPLAY");
! mydisplay = XOpenDisplay(name);
! if (mydisplay == NULL) return 0;
! XGetWindowAttributes(mydisplay, DefaultRootWindow(mydisplay), &attribs);
! depth = attribs.depth;
! XCloseDisplay(mydisplay);
!
! if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24;
! printf("X11 Display color depth = %d\n",depth);
! return depth;
! }
! /* connect to server, create and map window,
* allocate colors and (shared) memory
*/
! static uint32_t
! init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
! int screen;
! // unsigned int fg, bg;
! char *hello = (title == NULL) ? "Xv rulez" : title;
! char *name = ":0.0";
! XSizeHints hint;
! XVisualInfo vinfo;
! XEvent xev;
!
! XGCValues xgcv;
! Colormap theCmap;
! XSetWindowAttributes xswa;
! unsigned long xswamask;
!
! image_height = height;
! image_width = width;
! image_format=format;
!
! if(getenv("DISPLAY"))
! name = getenv("DISPLAY");
!
! mydisplay = XOpenDisplay(name);
!
! if (mydisplay == NULL)
! {
! fprintf(stderr,"Can't open display\n");
! return -1;
! }
!
! screen = DefaultScreen(mydisplay);
!
! hint.x = 0;
! hint.y = 0;
! hint.width = image_width;
! hint.height = image_height;
! hint.flags = PPosition | PSize;
!
! /* Get some colors */
!
! // bg = WhitePixel(mydisplay, screen);
! // fg = BlackPixel(mydisplay, screen);
!
! /* Make the window */
!
! XGetWindowAttributes(mydisplay, DefaultRootWindow(mydisplay), &attribs);
!
! /*
! *
! * depth in X11 terminology land is the number of bits used to
! * actually represent the colour.
! *
! * bpp in X11 land means how many bits in the frame buffer per
! * pixel.
! *
! * ex. 15 bit color is 15 bit depth and 16 bpp. Also 24 bit
! * color is 24 bit depth, but can be 24 bpp or 32 bpp.
! */
!
! depth = attribs.depth;
!
! if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
! {
! /* The root window may be 8bit but there might still be
! * visuals with other bit depths. For example this is the
! * case on Sun/Solaris machines.
! */
! depth = 24;
! }
! //BEGIN HACK
! //mywindow = XCreateSimpleWindow(mydisplay, DefaultRootWindow(mydisplay),
! //hint.x, hint.y, hint.width, hint.height, 4, fg, bg);
! //
! XMatchVisualInfo(mydisplay, screen, depth, TrueColor, &vinfo);
!
! theCmap = XCreateColormap(mydisplay, RootWindow(mydisplay,screen),
! vinfo.visual, AllocNone);
!
! xswa.background_pixel = 0;
! xswa.border_pixel = 1;
! xswa.colormap = theCmap;
! xswamask = CWBackPixel | CWBorderPixel |CWColormap;
!
!
! mywindow = XCreateWindow(mydisplay, RootWindow(mydisplay,screen),
! hint.x, hint.y, hint.width, hint.height, 4, depth,CopyFromParent,vinfo.visual,xswamask,&xswa);
!
! XSelectInput(mydisplay, mywindow, StructureNotifyMask);
!
! /* Tell other applications about this window */
!
! XSetStandardProperties(mydisplay, mywindow, hello, hello, None, NULL, 0, &hint);
!
! if ( fullscreen ) vo_x11_decoration( mydisplay,mywindow,0 );
!
! /* Map window. */
!
! XMapWindow(mydisplay, mywindow);
!
! /* Wait for map. */
! do
! {
! XNextEvent(mydisplay, &xev);
! }
! while (xev.type != MapNotify || xev.xmap.event != mywindow);
!
! XSelectInput(mydisplay, mywindow, NoEventMask);
!
! XFlush(mydisplay);
! XSync(mydisplay, False);
!
! mygc = XCreateGC(mydisplay, mywindow, 0L, &xgcv);
!
! xv_port = 0;
! if (Success == XvQueryExtension(mydisplay,&ver,&rel,&req,&ev,&err))
! {
! /* check for Xvideo support */
! if (Success != XvQueryAdaptors(mydisplay,DefaultRootWindow(mydisplay), &adaptors,&ai))
! {
! fprintf(stderr,"Xv: XvQueryAdaptors failed");
! return -1;
! }
! /* check adaptors */
! for (i = 0; i < adaptors; i++)
! {
! if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask) && (xv_port == 0))
! xv_port = ai[i].base_id;
! }
! /* check image formats */
! if (xv_port != 0)
! {
! fo = XvListImageFormats(mydisplay, xv_port, (int*)&formats);
! xv_format=0;
! for(i = 0; i < formats; i++)
! {
! fprintf(stderr, "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,
! (char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
!
! if (fo[i].id == format)
! {
! xv_format = fo[i].id;
! // break;
! }
! }
! if (!xv_format) /* no matching image format not */
! xv_port = 0;
! }
!
! if (xv_port != 0)
! {
! fprintf(stderr,"using Xvideo port %d for hw scaling\n",
! xv_port);
!
! allocate_xvimage(0);
!
! /* catch window resizes */
! XSelectInput(mydisplay, mywindow, StructureNotifyMask | KeyPressMask);
! // XSelectInput(mydisplay, mywindow, StructureNotifyMask);
! vo_dwidth = image_width;
! vo_dheight = image_height;
! // resize:
! XMoveResizeWindow(mydisplay,mywindow,0,0,d_width,d_height);
!
! return 0;
! }
! }
!
! printf("Sorry, Xv not supported by this X11 version/driver\n");
! printf("******** Try with -vo x11 or -vo sdl *********\n");
! return 1;
! }
! static const vo_info_t*
! get_info(void)
! {
! return &vo_info;
}
! static void
! allocate_xvimage(int foo)
! {
! /* allocate XvImages. FIXME: no error checking, without
! * mit-shm this will bomb... */
! xvimage[foo] = XvShmCreateImage(mydisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
!
! Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
! Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
! Shminfo[foo].readOnly = False;
!
! xvimage[foo]->data = Shminfo[foo].shmaddr;
! XShmAttach(mydisplay, &Shminfo[foo]);
! XSync(mydisplay, False);
! shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
! /* so we can do grayscale while testing... */
! memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
!
! return;
}
static void check_events(void)
{
! int e=vo_x11_check_events(mydisplay);
!
}
! static void
! flip_page(void)
{
! check_events();
! #ifdef DISP
! XvShmPutImage(mydisplay, xv_port, mywindow, mygc, xvimage[0],
! 0, 0, image_width, image_height,
! 0, 0, vo_dwidth, vo_dheight,
! False);
! XFlush(mydisplay);
! #endif
! return;
}
! //draw_slice(uint8_t *src[], uint32_t slice_num)
! static uint32_t
! draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
{
! uint8_t *src;
! uint8_t *dst;
! int i;
!
! dst = xvimage[0]->data + image_width * y + x;
! src = image[0];
! if(w==stride[0] && w==image_width)
! memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++){
! memcpy(dst,src,w);
! src+=stride[0];
! dst+=image_width;
! }
!
! x/=2;y/=2;w/=2;h/=2;
!
! dst = xvimage[0]->data + image_width * image_height + image_width/2 * y + x;
! src = image[2];
! if(w==stride[2] && w==image_width/2)
! memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++){
! memcpy(dst,src,w);
! src+=stride[2];
! dst+=image_width/2;
! }
!
! dst = xvimage[0]->data + image_width * image_height * 5 / 4 + image_width/2 * y + x;
! src = image[1];
! if(w==stride[1] && w==image_width/2)
! memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++){
! memcpy(dst,src,w);
! src+=stride[1];
! dst+=image_width/2;
! }
!
! return 0;
}
-
! static uint32_t
! draw_frame(uint8_t *src[])
{
! int foo;
! if(xv_format==IMGFMT_YUY2){
! // YUY2 packed, flipped
#if 0
! int i;
! unsigned short *s=(unsigned short *)src[0];
! unsigned short *d=(unsigned short *)xvimage[0]->data;
! s+=image_width*image_height;
! for(i=0;i<image_height;i++){
! s-=image_width;
! memcpy(d,s,image_width*2);
! d+=image_width;
! }
#else
! memcpy(xvimage[0]->data,src[0],image_width*image_height*2);
#endif
! } else {
! // YV12 planar
! memcpy(xvimage[0]->data,src[0],image_width*image_height);
! memcpy(xvimage[0]->data+image_width*image_height,src[2],image_width*image_height/4);
! memcpy(xvimage[0]->data+image_width*image_height*5/4,src[1],image_width*image_height/4);
! }
!
! return 0;
! }
!
! static uint32_t
! query_format(uint32_t format)
! {
! switch(format){
! case IMGFMT_YV12:
! case IMGFMT_YUY2:
! // case IMGFMT_RGB|24:
! // case IMGFMT_BGR|32:
! return 1;
}
! return 0;
}
! static void
! uninit(void)
{
}
--- 75,354 ----
static uint32_t image_format;
! static Window mRoot;
! static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth;
! static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen;
! /*
! * connect to server, create and map window,
* allocate colors and (shared) memory
*/
! static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
{
! int screen;
! char *hello = (title == NULL) ? "Xv render" : title;
! char *name = ":0.0";
! XSizeHints hint;
! XVisualInfo vinfo;
! XEvent xev;
!
! XGCValues xgcv;
! XSetWindowAttributes xswa;
! unsigned long xswamask;
!
! image_height = height;
! image_width = width;
! image_format=format;
!
! mFullscreen=fullscreen;
! dwidth=d_width; dheight=d_height;
!
! if(getenv("DISPLAY")) name = getenv("DISPLAY");
!
! mydisplay = XOpenDisplay(name);
!
! if (mydisplay == NULL)
! {
! fprintf(stderr,"Can't open display\n");
! return -1;
! }
!
! screen = DefaultScreen(mydisplay);
!
! hint.x = 0;
! hint.y = 0;
! hint.width = image_width;
! hint.height = image_height;
! if ( fullscreen )
! {
! hint.width=vo_screenwidth;
! hint.height=vo_screenheight;
! }
! hint.flags = PPosition | PSize;
! XGetWindowAttributes(mydisplay, DefaultRootWindow(mydisplay), &attribs);
! depth=attribs.depth;
! if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24;
! XMatchVisualInfo(mydisplay, screen, depth, TrueColor, &vinfo);
!
! xswa.background_pixel = 0;
! xswa.border_pixel = 0;
! xswamask = CWBackPixel | CWBorderPixel;
!
! mywindow = XCreateWindow(mydisplay, RootWindow(mydisplay,screen),
! hint.x, hint.y, hint.width, hint.height,
! 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa);
!
! XSelectInput(mydisplay, mywindow, StructureNotifyMask | KeyPressMask );
! XSetStandardProperties(mydisplay, mywindow, hello, hello, None, NULL, 0, &hint);
! if ( fullscreen ) vo_x11_decoration( mydisplay,mywindow,0 );
! XMapWindow(mydisplay, mywindow);
! XFlush(mydisplay);
! XSync(mydisplay, False);
!
! mygc = XCreateGC(mydisplay, mywindow, 0L, &xgcv);
!
! xv_port = 0;
! if (Success == XvQueryExtension(mydisplay,&ver,&rel,&req,&ev,&err))
! {
! /* check for Xvideo support */
! if (Success != XvQueryAdaptors(mydisplay,DefaultRootWindow(mydisplay), &adaptors,&ai))
! {
! fprintf(stderr,"Xv: XvQueryAdaptors failed");
! return -1;
! }
! /* check adaptors */
! for (i = 0; i < adaptors; i++)
! {
! if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask) && (xv_port == 0)) xv_port = ai[i].base_id;
! }
! /* check image formats */
! if (xv_port != 0)
! {
! fo = XvListImageFormats(mydisplay, xv_port, (int*)&formats);
! xv_format=0;
! for(i = 0; i < formats; i++)
! {
! fprintf(stderr, "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
!
! if (fo[i].id == format)
! {
! xv_format = fo[i].id;
! }
! }
! if (!xv_format) xv_port = 0;
! }
! if (xv_port != 0)
! {
! fprintf( stderr,"using Xvideo port %d for hw scaling\n",xv_port );
!
! allocate_xvimage(0);
!
! XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
! drwX=0; drwY=0;
! XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
! fprintf( stderr,"[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
!
! if ( mFullscreen )
! {
! drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
! drwcX+=drwX;
! drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
! drwcY+=drwY;
! drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
! drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
! fprintf( stderr,"[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
! }
! return 0;
! }
! }
! printf("Sorry, Xv not supported by this X11 version/driver\n");
! printf("******** Try with -vo x11 or -vo sdl *********\n");
! return 1;
}
! static const vo_info_t * get_info(void)
! { return &vo_info; }
! static void allocate_xvimage(int foo)
! {
! /*
! * allocate XvImages. FIXME: no error checking, without
! * mit-shm this will bomb...
! */
! xvimage[foo] = XvShmCreateImage(mydisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]);
!
! Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
! Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
! Shminfo[foo].readOnly = False;
!
! xvimage[foo]->data = Shminfo[foo].shmaddr;
! XShmAttach(mydisplay, &Shminfo[foo]);
! XSync(mydisplay, False);
! shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
! memset(xvimage[foo]->data,128,xvimage[foo]->data_size);
! return;
}
static void check_events(void)
{
! int e=vo_x11_check_events(mydisplay);
! if(e&VO_EVENT_RESIZE)
! {
! XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
! drwX=0; drwY=0;
! XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
! fprintf( stderr,"[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
!
! if ( mFullscreen )
! {
! drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2;
! drwcX+=drwX;
! drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2;
! drwcY+=drwY;
! drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth);
! drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
! fprintf( stderr,"[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
! }
! }
}
! static void flip_page(void)
{
! check_events();
! XvShmPutImage(mydisplay, xv_port, mywindow, mygc, xvimage[0],
! 0, 0, image_width, image_height,
! drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight),
! False);
! XFlush(mydisplay);
! return;
}
! static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
{
! uint8_t *src;
! uint8_t *dst;
! int i;
!
! dst = xvimage[0]->data + image_width * y + x;
! src = image[0];
! if(w==stride[0] && w==image_width) memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++)
! {
! memcpy(dst,src,w);
! src+=stride[0];
! dst+=image_width;
! }
!
! x/=2;y/=2;w/=2;h/=2;
!
! dst = xvimage[0]->data + image_width * image_height + image_width/2 * y + x;
! src = image[2];
! if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++)
! {
! memcpy(dst,src,w);
! src+=stride[2];
! dst+=image_width/2;
! }
! dst = xvimage[0]->data + image_width * image_height * 5 / 4 + image_width/2 * y + x;
! src = image[1];
! if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h);
! else
! for(i=0;i<h;i++)
! {
! memcpy(dst,src,w);
! src+=stride[1];
! dst+=image_width/2;
! }
! return 0;
}
! static uint32_t draw_frame(uint8_t *src[])
{
! int foo;
! if(xv_format==IMGFMT_YUY2)
! {
! // YUY2 packed, flipped
#if 0
! int i;
! unsigned short *s=(unsigned short *)src[0];
! unsigned short *d=(unsigned short *)xvimage[0]->data;
! s+=image_width*image_height;
! for(i=0;i<image_height;i++)
! {
! s-=image_width;
! memcpy(d,s,image_width*2);
! d+=image_width;
! }
#else
! memcpy(xvimage[0]->data,src[0],image_width*image_height*2);
#endif
! }
! else
! {
! // YV12 planar
! memcpy(xvimage[0]->data,src[0],image_width*image_height);
! memcpy(xvimage[0]->data+image_width*image_height,src[2],image_width*image_height/4);
! memcpy(xvimage[0]->data+image_width*image_height*5/4,src[1],image_width*image_height/4);
}
!
! return 0;
}
! static uint32_t query_format(uint32_t format)
{
+ switch(format)
+ {
+ case IMGFMT_YV12:
+ case IMGFMT_YUY2: return 1;
+ }
+ return 0;
}
+
+ static void uninit(void) { }
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list