CVS: main/libvo mga_common.c,1.54,1.55 vo_mga.c,1.35,1.36
Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv18673/libvo Modified Files: mga_common.c vo_mga.c Log Message: fix panscan font resizing with vo_mga Index: mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- mga_common.c 29 Mar 2003 19:56:31 -0000 1.54 +++ mga_common.c 26 Apr 2003 16:56:21 -0000 1.55 @@ -27,7 +27,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31; -// x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); + x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); switch(mga_vid_config.format){ case MGA_VID_FORMAT_YV12: case MGA_VID_FORMAT_IYUV: @@ -45,8 +45,8 @@ static void draw_osd(void) { - vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha); -// vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha); +// vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha); + vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha); } Index: vo_mga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vo_mga.c 11 Nov 2002 15:20:26 -0000 1.35 +++ vo_mga.c 26 Apr 2003 16:56:21 -0000 1.36 @@ -70,6 +70,7 @@ printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height); } + vo_dwidth=d_width; vo_dheight=d_height; mga_vid_config.dest_width = d_width; mga_vid_config.dest_height= d_height; mga_vid_config.x_org= 0; // (720-mga_vid_config.dest_width)/2;
Richard Felker CVS wrote:
Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv18673/libvo
Modified Files: mga_common.c vo_mga.c Log Message: fix panscan font resizing with vo_mga gcc -c -O4 -march=i486 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I. -I.. -I/usr/include/freetype2 -I/usr/include/SDL -D_REENTRANT -I/usr/X11R6/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/directfb -DMPG12PLAY -DVIDIX_PATH='"/usr/lib/mplayer/vidix/"' -o vo_dfbmga.o vo_dfbmga.c vo_dfbmga.c: In function `blit_to_screen': vo_dfbmga.c:921: structure has no member named `waitForSync' vo_dfbmga.c:929: structure has no member named `waitForSync' make[1]: *** [vo_dfbmga.o] Error 1
Do you know something about it? :) -- Gabucino MPlayer Core Team - Debian? - "This is our project and we can do whatever we want with it." Michael Stone <mstone#debian.org>
gabucino wrote:
make[1]: *** [vo_dfbmga.o] Error 1 Do you know something about it? :) Sorry, it's al3x's patch...
-- Gabucino MPlayer Core Team - Debian? - "This is our project and we can do whatever we want with it." Michael Stone <mstone#debian.org>
On Sat, Apr 26, 2003 at 07:48:20PM +0200, gabucino@mplayerhq.hu wrote:
Richard Felker CVS wrote:
Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv18673/libvo
Modified Files: mga_common.c vo_mga.c Log Message: fix panscan font resizing with vo_mga gcc -c -O4 -march=i486 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I. -I.. -I/usr/include/freetype2 -I/usr/include/SDL -D_REENTRANT -I/usr/X11R6/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/directfb -DMPG12PLAY -DVIDIX_PATH='"/usr/lib/mplayer/vidix/"' -o vo_dfbmga.o vo_dfbmga.c vo_dfbmga.c: In function `blit_to_screen': vo_dfbmga.c:921: structure has no member named `waitForSync' vo_dfbmga.c:929: structure has no member named `waitForSync' make[1]: *** [vo_dfbmga.o] Error 1
Do you know something about it? :)
Nope, maybe your dfb is outdated or something. Last time I tried dfb it hard locked my system, and it senselessly required root, so I decided it sucked and gave up on it. That was about a year ago, so maybe it's better now, but I haven't bothered to mess with it since, so I can't really help with dfb problems at this time. Rich
Richard Felker CVS wrote:
Log Message: fix panscan font resizing with vo_mga Thanks, works, except vo_mga now doesn't detect the fb size automagically: displays unscaled video instead.
-- Gabucino MPlayer Core Team - Debian? - "This is our project and we can do whatever we want with it." Michael Stone <mstone#debian.org>
On Sat, Apr 26, 2003 at 08:11:09PM +0200, gabucino@mplayerhq.hu wrote:
Richard Felker CVS wrote:
Log Message: fix panscan font resizing with vo_mga Thanks, works, except vo_mga now doesn't detect the fb size automagically: displays unscaled video instead.
What do you mean?? It works fine for me, with and without -fs... Rich
D Richard Felker III wrote:
fix panscan font resizing with vo_mga Thanks, works, except vo_mga now doesn't detect the fb size automagically: displays unscaled video instead. What do you mean?? It works fine for me, with and without -fs... Ehh 10l for me again :( Sorry, I'm not really myself these days :(
(didn't have permissions on /dev/fb0) -- Gabucino MPlayer Core Team - Debian? - "This is our project and we can do whatever we want with it." Michael Stone <mstone#debian.org>
On Sun, Apr 27, 2003 at 11:10:24AM +0200, Winner of tha face compo wrote:
D Richard Felker III wrote:
fix panscan font resizing with vo_mga Thanks, works, except vo_mga now doesn't detect the fb size automagically: displays unscaled video instead. What do you mean?? It works fine for me, with and without -fs... Ehh 10l for me again :( Sorry, I'm not really myself these days :(
(didn't have permissions on /dev/fb0)
Haha, ok. :) Glad there was nothing wrong with my mga code....I've already had enough cola from this vf_crop stuff. :( Rich
Hi,
On Sun, Apr 27, 2003 at 11:10:24AM +0200, Winner of tha face compo wrote:
D Richard Felker III wrote:
fix panscan font resizing with vo_mga Thanks, works, except vo_mga now doesn't detect the fb size automagically: displays unscaled video instead. What do you mean?? It works fine for me, with and without -fs... Ehh 10l for me again :( Sorry, I'm not really myself these days :(
(didn't have permissions on /dev/fb0)
Haha, ok. :) Glad there was nothing wrong with my mga code....I've already had enough cola from this vf_crop stuff. :(
btw, what about the slice fix "patch" i sent for testing? A'rpi / Astral & ESP-team -- Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu
participants (5)
-
Arpi -
D Richard Felker III -
gabucino＠mplayerhq.hu -
Richard Felker CVS -
Winner of tha face compo