RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 12:55:16 +00:00
Code Issues Releases Wiki Activity

more cleanup, some -vo mga fullscreen fixes

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7681 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-10-09 13:40:23 +00:00
parent 96bda1810f
commit 49d1ae31e4
3 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libvo/mga_common.c
View File

@ -31,6 +31,12 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
}
}
static void draw_osd(void)
{
vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
}
//static void
//write_slice_g200(uint8_t *y,uint8_t *cr, uint8_t *cb,uint32_t slice_num)
@ -200,13 +206,8 @@ static void mga_fullscreen()
}
mga_vid_config.dest_width = w;
mga_vid_config.dest_height= h;
if (vo_screenwidth && vo_screenheight) {
mga_vid_config.x_org=(vo_screenwidth-w)/2;
mga_vid_config.y_org=(vo_screenheight-h)/2;
} else {
mga_vid_config.x_org= 0;
mga_vid_config.y_org= 0;
}
mga_vid_config.x_org=(vo_screenwidth-w)/2;
mga_vid_config.y_org=(vo_screenheight-h)/2;
if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) )
printf( "Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
}
@ -287,7 +288,10 @@ static uint32_t control(uint32_t request, void *data, ...)
#ifndef VO_XMGA
case VOCTRL_FULLSCREEN:
mga_fullscreen();
if (vo_screenwidth && vo_screenheight)
mga_fullscreen();
else
printf("Screen width/height unknown!\n");
return VO_TRUE;
#endif
@ -344,9 +348,13 @@ static int mga_init(int width,int height,unsigned int format){
mga_vid_config.src_width = width;
mga_vid_config.src_height= height;
mga_vid_config.dest_width = width;
mga_vid_config.dest_height= height;
if(!mga_vid_config.dest_width)
mga_vid_config.dest_width = width;
if(!mga_vid_config.dest_height)
mga_vid_config.dest_height= height;
mga_vid_config.colkey_on=0;
mga_vid_config.num_frames=(vo_directrendering && !vo_doublebuffering)?1:3;
mga_vid_config.version=MGA_VID_VERSION;
if (ioctl(f,MGA_VID_CONFIG,&mga_vid_config))

7
libvo/vo_mga.c
View File

@ -71,8 +71,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height);
}
mga_vid_config.colkey_on=0;
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;
@ -96,11 +94,6 @@ static void uninit(void)
mga_uninit();
}
static void draw_osd(void)
{
vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
}
static void flip_page(void)
{
vo_mga_flip_page();

23
libvo/vo_xmga.c
View File

@ -2,26 +2,10 @@
//#define SHOW_TIME
/*
* video_out_xmga.c
* vo_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>
@ -67,7 +51,7 @@ static unsigned int timerd=0;
static vo_info_t vo_info =
{
"X11 (Matrox G200/G4x0/G550 overlay in window using /dev/mga_vid)",
"Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)",
"xmga",
"Zoltan Ponekker <pontscho@makacs.poliod.hu>",
""
@ -186,9 +170,6 @@ static void check_events(void)
if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) mp_msg(MSGT_VO,MSGL_WARN,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" );
}
static void draw_osd(void)
{ vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);}
static void flip_page(void){
#ifdef SHOW_TIME
unsigned int t;