RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Code Issues Releases Wiki Activity

simplification

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16371 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
faust3 2005-09-03 10:06:08 +00:00
parent 9a684fa55f
commit dea63be70c
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vidix/drivers/nvidia_vid.c
View File

@ -484,6 +484,7 @@ static void nv_getscreenproperties(struct rivatv_info *info){
if(bpp==3)bpp=4; if(bpp==3)bpp=4;
if((bpp == 2) && (info->chip.PVIDEO[0x00000600/4] & 0x00001000) == 0x0)info->depth=15; if((bpp == 2) && (info->chip.PVIDEO[0x00000600/4] & 0x00001000) == 0x0)info->depth=15;
else info->depth = bpp*8; else info->depth = bpp*8;
info->bps=bpp;
/*get screen width*/ /*get screen width*/
VID_WR08(info->chip.PCIO, 0x03D4, 0x1); VID_WR08(info->chip.PCIO, 0x03D4, 0x1);
info->screen_x = (1 + VID_RD08(info->chip.PCIO, 0x3D5)) * 8; info->screen_x = (1 + VID_RD08(info->chip.PCIO, 0x3D5)) * 8;
@ -508,7 +509,6 @@ void rivatv_overlay_start (struct rivatv_info *info,int bufno){
uint32_t value; uint32_t value;
int x=info->wx, y=info->wy; int x=info->wx, y=info->wy;
int lwidth=info->d_width, lheight=info->d_height; int lwidth=info->d_width, lheight=info->d_height;
int bps;
int i; int i;
size = info->buffer_size; size = info->buffer_size;
@ -518,34 +518,13 @@ void rivatv_overlay_start (struct rivatv_info *info,int bufno){
nv_getscreenproperties(info); nv_getscreenproperties(info);
if(info->depth){ if(info->depth){
// bps = info->screen_x * ((info->depth+1)/8);
/* get pan offset of the physical screen */ /* get pan offset of the physical screen */
pan = rivatv_overlay_pan (info); pan = rivatv_overlay_pan (info);
/* adjust window position depending on the pan offset */ /* adjust window position depending on the pan offset */
bps = 0;
info->chip.lock (&info->chip, 0);
for (i = 0; (i < 1024) && (bps == 0); i++)
{
if (info->chip.arch != NV_ARCH_03)
bps = info->chip.PGRAPH[0x00000670/4];
else
bps = info->chip.PGRAPH[0x00000650/4];
}
if (bps == 0)
{
fprintf(stderr, "[nvidia_vid] reading bps returned 0!!!\n");
if (info->bps != 0) if (info->bps != 0)
bps = info->bps;
}
else
{ {
info->bps = bps; x = info->wx - (pan % info->bps) * 8 / info->depth;
} y = info->wy - (pan / info->bps);
if (bps != 0)
{
x = info->wx - (pan % bps) * 8 / info->depth;
y = info->wy - (pan / bps);
} }
} else { } else {
// we can't adjust the window position correctly in textmode // we can't adjust the window position correctly in textmode