RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

- fixed overflow by +-0x80 

- save brightness/contrast values, so they won't be reset at next file


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6799 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-07-25 21:34:24 +00:00
parent d462fc4317
commit 18e083f217
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mga_vid.c
View File

@ -767,10 +767,8 @@ switch(config->format){
//Enable contrast and brightness control //Enable contrast and brightness control
regs.besglobctl |= (1<<5) + (1<<7); regs.besglobctl |= (1<<5) + (1<<7);
// brightness ; default is 0x7f; // brightness (-128..127) && contrast (0..255)
regs.beslumactl = (mga_brightness << 16); regs.beslumactl = (mga_brightness << 16) | ((mga_contrast+0x80)&0xFFFF);
// contrast:
regs.beslumactl|= ((mga_contrast+0x80)<<0);
//Setup destination window boundaries //Setup destination window boundaries
besleft = x > 0 ? x : 0; besleft = x > 0 ? x : 0;
@ -1263,7 +1261,10 @@ static int mga_vid_ioctl(struct inode *inode, struct file *file, unsigned int cm
break; break;
case MGA_VID_GET_LUMA: case MGA_VID_GET_LUMA:
tmp = regs.beslumactl - 0x80; //tmp = regs.beslumactl;
//tmp = (tmp&0xFFFF0000) | (((tmp&0xFFFF) - 0x80)&0xFFFF);
tmp = (mga_brightness << 16) | (mga_contrast&0xFFFF);
if (copy_to_user((uint32_t *) arg, &tmp, sizeof(uint32_t))) if (copy_to_user((uint32_t *) arg, &tmp, sizeof(uint32_t)))
{ {
printk(KERN_ERR "mga_vid: failed copy %p to userspace %p\n", printk(KERN_ERR "mga_vid: failed copy %p to userspace %p\n",
@ -1274,7 +1275,9 @@ static int mga_vid_ioctl(struct inode *inode, struct file *file, unsigned int cm
case MGA_VID_SET_LUMA: case MGA_VID_SET_LUMA:
tmp = arg; tmp = arg;
regs.beslumactl = tmp + 0x80; mga_brightness=tmp>>16; mga_contrast=tmp&0xFFFF;
//regs.beslumactl = (tmp&0xFFFF0000) | ((tmp + 0x80)&0xFFFF);
regs.beslumactl = (mga_brightness << 16) | ((mga_contrast+0x80)&0xFFFF);
mga_vid_write_regs(0); mga_vid_write_regs(0);
break; break;