Update of /cvsroot/mplayer/main/drivers In directory usw-pr-cvs1:/tmp/cvs-serv8881 Modified Files: mga_vid.c Log Message: UYVY support Index: mga_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/mga_vid.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** mga_vid.c 2001/03/14 16:41:26 1.18 --- mga_vid.c 2001/04/16 01:26:08 1.19 *************** *** 392,395 **** --- 392,397 ---- //Setup the BES registers for a three plane 4:2:0 video source + regs.besglobctl = 0; + switch(config->format){ case MGA_VID_FORMAT_YV12: *************** *** 401,405 **** + (1<<17) // 4:2:0 mode + (1<<18); // dither enabled ! if(is_g400) { --- 403,407 ---- + (1<<17) // 4:2:0 mode + (1<<18); // dither enabled ! #if 0 if(is_g400) { *************** *** 412,417 **** //zoom disabled, zoom filter disabled, Cb samples in 0246, Cr //in 1357, BES register update on besvcnt ! regs.besglobctl = 0; } break; --- 414,420 ---- //zoom disabled, zoom filter disabled, Cb samples in 0246, Cr //in 1357, BES register update on besvcnt ! regs.besglobctl = 0; } + #endif break; *************** *** 427,430 **** --- 430,446 ---- regs.besglobctl = 0; // YUY2 format selected break; + + case MGA_VID_FORMAT_UYVY: + regs.besctl = 1 // BES enabled + + (0<<6) // even start polarity + + (1<<10) // x filtering enabled + + (1<<11) // y filtering enabled + + (1<<16) // chroma upsampling + + (0<<17) // 4:2:2 mode + + (1<<18); // dither enabled + + regs.besglobctl = 1<<6; // UYVY format selected + break; + default: printk(KERN_ERR "mga_vid: Unsupported pixel format: 0x%X\n",config->format); *************** *** 434,438 **** //Disable contrast and brightness control ! regs.besglobctl = (1<<5) + (1<<7); regs.beslumactl = (0x7f << 16) + (0x80<<0); regs.beslumactl = 0x80<<0; --- 450,454 ---- //Disable contrast and brightness control ! regs.besglobctl |= (1<<5) + (1<<7); regs.beslumactl = (0x7f << 16) + (0x80<<0); regs.beslumactl = 0x80<<0; *************** *** 666,669 **** --- 682,686 ---- #endif regs.besctl &= ~1; + regs.besglobctl &= ~(1<<6); // UYVY format selected mga_vid_write_regs(); break; *************** *** 760,764 **** }else{ switch((card_option>>11)&1){ ! case 0: mga_ram_size = 8; break; default: mga_ram_size = 16; } --- 777,782 ---- }else{ switch((card_option>>11)&1){ ! case 0: ! case 3: mga_ram_size = 8; break; default: mga_ram_size = 16; } *************** *** 835,838 **** --- 853,857 ---- vid_src_ready = 0; regs.besctl &= ~1; + regs.besglobctl &= ~(1<<6); // UYVY format selected mga_vid_write_regs(); mga_vid_in_use = 0; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog