January 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libvo osd.c,1.16,1.17 osd_template.c,1.16,1.17
by Atmosfear 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv27014/libvo Modified Files: osd.c osd_template.c Log Message: mangling in libvo Index: osd.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- osd.c 27 Nov 2001 01:54:13 -0000 1.16 +++ osd.c 19 Jan 2002 04:44:49 -0000 1.17 @@ -11,6 +11,7 @@ #include "../my_profile.h" #include <inttypes.h> #include "../cpudetect.h" +#include "../mangle.h" extern int verbose; // defined in mplayer.c Index: osd_template.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd_template.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- osd_template.c 10 Dec 2001 13:14:28 -0000 1.16 +++ osd_template.c 19 Jan 2002 04:44:49 -0000 1.17 @@ -59,7 +59,7 @@ "pand %%mm4, %%mm0\n\t" //0Y0Y0Y0Y "psrlw $8, %%mm1\n\t" //0Y0Y0Y0Y "movq %1, %%mm2\n\t" //srca HGFEDCBA - "paddb bFF, %%mm2\n\t" + "paddb "MANGLE(bFF)", %%mm2\n\t" "movq %%mm2, %%mm3\n\t" "pand %%mm4, %%mm2\n\t" //0G0E0C0A "psrlw $8, %%mm3\n\t" //0H0F0D0B @@ -126,7 +126,7 @@ "movq %%mm0, %%mm1\n\t" "pand %%mm4, %%mm0\n\t" //0Y0Y0Y0Y "movd %%eax, %%mm2\n\t" //srca 0000DCBA - "paddb bFF, %%mm2\n\t" + "paddb "MANGLE(bFF)", %%mm2\n\t" "punpcklbw %%mm7, %%mm2\n\t" //srca 0D0C0B0A "pmullw %%mm2, %%mm0\n\t" "psrlw $8, %%mm0\n\t" @@ -334,7 +334,7 @@ "pand %%mm4, %%mm0\n\t" //0R0B0R0B "psrlw $8, %%mm1\n\t" //0?0G0?0G "movd %%eax, %%mm2\n\t" //srca 0000DCBA - "paddb bFF, %%mm2\n\t" + "paddb "MANGLE(bFF)", %%mm2\n\t" "punpcklbw %%mm2, %%mm2\n\t" //srca DDCCBBAA "movq %%mm2, %%mm3\n\t" "punpcklbw %%mm7, %%mm2\n\t" //srca 0B0B0A0A

1 0

CVS: main/mp3lib mp3lib_objfix.sh,NONE,1.1 Makefile,1.22,1.23
by Atmosfear 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/mp3lib In directory mplayer:/var/tmp.root/cvs-serv26462/mp3lib Modified Files: Makefile Added Files: mp3lib_objfix.sh Log Message: rewrites symbols in d_cpu.s on cygwin --- NEW FILE --- #!/bin/sh # This script fixes up symbol mangling in GNU as code of mp3lib. # (c)2001-2002 by Felix Buenemann <atmosfear at users.sourceforge.net>A # This file is licensed under the GPL, more info at http://www.fsf.org/ for i in \ "CpuDetect" \ "ipentium" \ "a3dnow" \ "isse" do echo "fixing: $i=_$i" objcopy --redefine-sym "$i=_$i" libMP3.a done Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile 15 Jan 2002 21:00:20 -0000 1.22 +++ Makefile 19 Jan 2002 04:42:09 -0000 1.23 @@ -42,6 +42,9 @@ libMP3.a: $(OBJS) $(AR) r libMP3.a $(OBJS) +ifeq ($(TARGET_OS),CYGWIN) + ./mp3lib_objfix.sh +endif test1: libMP3.a test.c $(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. -L. -lMP3 -lm

1 0

CVS: main/libmpdemux tv.c,1.22,1.23
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv18670 Modified Files: tv.c Log Message: fixed channel changing with frequencies.c Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tv.c 27 Dec 2001 23:52:48 -0000 1.22 +++ tv.c 18 Jan 2002 19:37:12 -0000 1.23 @@ -470,7 +470,7 @@ if (direction == TV_CHANNEL_HIGHER) { - if (tvh->channel+1 <= chanlists[tvh->chanlist].count) + if (tvh->channel+1 < chanlists[tvh->chanlist].count) { cl = tvh->chanlist_s[tvh->channel++]; mp_msg(MSGT_TV, MSGL_INFO, "Selected channel: %s (freq: %.3f)\n",

1 0

CVS: main cfg-mplayer.h,1.123,1.124
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25359/main Modified Files: cfg-mplayer.h Log Message: gamma correction support Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- cfg-mplayer.h 17 Jan 2002 01:28:20 -0000 1.123 +++ cfg-mplayer.h 18 Jan 2002 09:11:07 -0000 1.124 @@ -39,6 +39,14 @@ extern int vo_doublebuffering; extern int vo_fsmode; extern int vo_dbpp; +/* gamma correction */ +extern int vo_gamma_brightness; +extern int vo_gamma_saturation; +extern int vo_gamma_contrast; +extern int vo_gamma_hue; +extern int vo_gamma_red_intense; +extern int vo_gamma_green_intense; +extern int vo_gamma_blue_intense; #endif #ifdef USE_SUB @@ -237,6 +245,13 @@ {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL}, {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"brightness",&vo_gamma_brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"constrast",&vo_gamma_contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"hue",&vo_gamma_hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"red_instense",&vo_gamma_red_intense, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"green_intense",&vo_gamma_green_intense, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, + {"blue_intense",&vo_gamma_blue_intense, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL}, #endif #ifdef HAVE_AA

2 1

CVS: main/libvo vosub_vidix.c,1.12,1.13 vosub_vidix.h,1.4,1.5
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv25789 Modified Files: vosub_vidix.c vosub_vidix.h Log Message: added colorkey handling Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vosub_vidix.c 18 Jan 2002 10:41:31 -0000 1.12 +++ vosub_vidix.c 18 Jan 2002 18:14:44 -0000 1.13 @@ -45,8 +45,6 @@ #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) ) #define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size)) -extern vo_functions_t video_out_vesa; - int vidix_preinit(const char *drvname,void *server) { int err; @@ -147,6 +145,8 @@ } next_frame = 0; + if(vo_doublebuffering) + vdlPlaybackFrameSelect(vidix_handler,next_frame); vidix_mem =vidix_play.dga_addr; /*clear the buffer*/ @@ -162,7 +162,7 @@ extern int vo_gamma_green_intense; extern int vo_gamma_blue_intense; -vidix_video_eq_t vid_eq; +static vidix_video_eq_t vid_eq; int vidix_start(void) { @@ -216,7 +216,6 @@ void vidix_term( void ) { if(verbose > 1) printf("vosub_vidix: vidix_term() was called\n"); -// vdlPlaybackOff(vidix_handler); vidix_stop(); vdlClose(vidix_handler); } @@ -279,6 +278,8 @@ src+=stride[0]; dest += bespitch; } + + return 0; } @@ -298,7 +299,7 @@ /* Note it's very strange but sometime for YUY2 draw_frame is called */ if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) { - printf("vosub_vidix: draw_frame for i420 is called\nExiting...\n"); + printf("vosub_vidix: draw_frame for YUV420 called\nExiting...\n"); vidix_term(); exit( EXIT_FAILURE ); } @@ -370,4 +371,14 @@ vidix_fourcc.fourcc = format; vdlQueryFourcc(vidix_handler,&vidix_fourcc); return vidix_fourcc.depth != VID_DEPTH_NONE; +} + +int vidix_grkey_get(vidix_grkey_t *gr_key) +{ + return(vdlGetGrKeys(vidix_handler, gr_key)); +} + +int vidix_grkey_set(const vidix_grkey_t *gr_key) +{ + return(vdlSetGrKeys(vidix_handler, gr_key)); } Index: vosub_vidix.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vosub_vidix.h 18 Jan 2002 10:41:31 -0000 1.4 +++ vosub_vidix.h 18 Jan 2002 18:14:44 -0000 1.5 @@ -27,5 +27,10 @@ uint32_t vidix_draw_frame(uint8_t *src[]); void vidix_flip_page(void); void vidix_draw_osd(void); + +#include "../vidix/vidix.h" +/* graphic keys */ +int vidix_grkey_get(vidix_grkey_t *gr_key); +int vidix_grkey_set(const vidix_grkey_t *gr_key); #endif

1 0

CVS: main/vidix/drivers mga_vid.c,1.5,1.6 mga_vid.h,1.1,NONE
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv25712 Modified Files: mga_vid.c Removed Files: mga_vid.h Log Message: updated, colorkey support, pontscho reported it's working fine, only faulting with very-very-very big resolution Index: mga_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/mga_vid.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mga_vid.c 18 Jan 2002 15:37:52 -0000 1.5 +++ mga_vid.c 18 Jan 2002 18:14:10 -0000 1.6 @@ -5,13 +5,10 @@ YUY2 support (see config.format) added by A'rpi/ESP-team double buffering added by A'rpi/ESP-team - - - DONT USE THIS! IT'S UNDER DEVELOPEMENT! USE MGA_VID KERNELDRIVER! */ /* - * Original comment: + * Original copyright: * * mga_vid.c * @@ -28,19 +25,17 @@ * license. See http://www.gnu.org/copyleft/gpl.html for details. */ - //#define CRTC2 // Set this value, if autodetection fails! (video ram size in megabytes) // #define MGA_MEMORY_SIZE 16 -//#define MGA_VIDMEM_SIZE mga_ram_size - -//#define MGA_ALLOW_IRQ +/* disable irq */ #undef MGA_ALLOW_IRQ #define MGA_VSYNC_POS 2 + #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -48,41 +43,16 @@ #include <math.h> #include <inttypes.h> -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" - #include "../vidix.h" #include "../fourcc.h" #include "../../libdha/libdha.h" -#include "mga_vid.h" +#include "../../libdha/pci_ids.h" +#include "../../libdha/pci_names.h" #if !defined(ENOTSUP) && defined(EOPNOTSUPP) #define ENOTSUP EOPNOTSUPP #endif -#define TRUE 1 -#define FALSE 0 - -#ifndef PCI_VENDOR_ID_MATROX -#define PCI_VENDOR_ID_MATROX 0x102b -#endif - -#ifndef PCI_DEVICE_ID_MATROX_G200_PCI -#define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 -#endif - -#ifndef PCI_DEVICE_ID_MATROX_G200_AGP -#define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 -#endif - -#ifndef PCI_DEVICE_ID_MATROX_G400 -#define PCI_DEVICE_ID_MATROX_G400 0x0525 -#endif - -#ifndef PCI_DEVICE_ID_MATROX_G550 -#define PCI_DEVICE_ID_MATROX_G550 0x2527 -#endif - /* from radeon_vid */ #define GETREG(TYPE,PTR,OFFZ) (*((volatile TYPE*)((PTR)+(OFFZ)))) #define SETREG(TYPE,PTR,OFFZ,VAL) (*((volatile TYPE*)((PTR)+(OFFZ))))=VAL @@ -92,11 +62,56 @@ #define readl(addr) GETREG(uint32_t,(uint32_t)(addr),0) #define writel(val,addr) SETREG(uint32_t,(uint32_t)(addr),0,val) -static pciinfo_t pci_info; +int mga_verbose = 0; + +/* for device detection */ static int probed = 0; +static pciinfo_t pci_info; + +/* internal booleans */ +static uint32_t mga_vid_in_use = 0; +static uint32_t is_g400 = 0; +static uint32_t vid_src_ready = 0; +static uint32_t vid_overlay_on = 0; + +/* mapped physical addresses */ +static uint8_t *mga_mmio_base = 0; +static uint32_t mga_mem_base = 0; + +static int mga_src_base = 0; /* YUV buffer position in video memory */ -static vidix_ckey_t colorkey; +static uint32_t mga_ram_size = 0; /* how much megabytes videoram we have */ +/* Graphic keys */ +static vidix_grkey_t mga_grkey; + +static int colkey_saved=0; +static int colkey_on=0; +static unsigned char colkey_color[4]; +static unsigned char colkey_mask[4]; + +/* for IRQ */ +static int mga_irq = -1; + +static int mga_next_frame = 0; + +static vidix_capability_t mga_cap = +{ + "Matrox MGA G200/G400 YUV Video", + TYPE_OUTPUT, + { 0, 0, 0, 0 }, + 1024, /* 2048x2048 is supported if Pontscho is right */ + 768, + 4, + 4, + -1, + FLAG_UPSCALER | FLAG_DOWNSCALER, + VENDOR_MATROX, + 0, + { 0, 0, 0, 0} +}; + +/* MATROX BES registers */ typedef struct bes_registers_s { //BES Control @@ -190,46 +205,6 @@ static crtc2_registers_t cregs; #endif -static uint32_t mga_vid_in_use = 0; -static uint32_t is_g400 = 0; -static uint32_t vid_src_ready = 0; -static uint32_t vid_overlay_on = 0; - -static uint8_t *mga_mmio_base = 0; -static uint32_t mga_mem_base = 0; - -static int mga_src_base = 0; // YUV buffer position in video memory - -static uint32_t mga_ram_size = 0; // how much megabytes videoram we have - -//static int mga_force_memsize = 0; - -int mga_verbose = 0; - -static mga_vid_config_t mga_config; - -static int colkey_saved=0; -static int colkey_on=0; -static unsigned char colkey_color[4]; -static unsigned char colkey_mask[4]; - -static int mga_irq = -1; - -static vidix_capability_t mga_cap = -{ - "Matrox MGA G200/G400 YUV Video", - TYPE_OUTPUT, - { 0, 0, 0, 0 }, - 1024, - 768, - 4, - 4, - -1, - FLAG_UPSCALER | FLAG_DOWNSCALER, - VENDOR_MATROX, - 0, - { 0, 0, 0, 0} -}; //All register offsets are converted to word aligned offsets (32 bit) //because we want all our register accesses to be 32 bits @@ -323,7 +298,6 @@ #define ICLEAR 0x1e18 #define STATUS 0x1e14 -static int mga_next_frame=0; #ifdef CRTC2 static void crtc2_frame_sel(int frame) @@ -358,10 +332,14 @@ int vixPlaybackFrameSelect(unsigned int frame) { - if ( mga_irq != -1 ) { - mga_next_frame=frame; - } else { - +#if MGA_ALLOW_IRQ + if (mga_irq != -1) + { + mga_next_frame = frame; + } + else +#endif + { //we don't need the vcount protection as we're only hitting //one register (and it doesn't seem to be double buffered) regs.besctl = (regs.besctl & ~0x07000000) + (frame << 25); @@ -373,7 +351,6 @@ #ifdef CRTC2 crtc2_frame_sel(frame); #endif - } return(0); @@ -449,8 +426,8 @@ if(!restore){ writeb( XKEYOPMODE, mga_mmio_base + PALWTADD); - writeb( mga_config.colkey_on, mga_mmio_base + X_DATAREG); - if ( mga_config.colkey_on ) + writeb( mga_grkey.ckey.op == CKEY_TRUE, mga_mmio_base + X_DATAREG); + if ( mga_grkey.ckey.op == CKEY_TRUE ) { uint32_t r=0, g=0, b=0; @@ -463,23 +440,23 @@ break; case BPP_15: - r = mga_config.colkey_red >> 3; - g = mga_config.colkey_green >> 3; - b = mga_config.colkey_blue >> 3; + r = mga_grkey.ckey.red >> 3; + g = mga_grkey.ckey.green >> 3; + b = mga_grkey.ckey.blue >> 3; break; case BPP_16: - r = mga_config.colkey_red >> 3; - g = mga_config.colkey_green >> 2; - b = mga_config.colkey_blue >> 3; + r = mga_grkey.ckey.red >> 3; + g = mga_grkey.ckey.green >> 2; + b = mga_grkey.ckey.blue >> 3; break; case BPP_24: case BPP_32_DIR: case BPP_32_PAL: - r = mga_config.colkey_red; - g = mga_config.colkey_green; - b = mga_config.colkey_blue; + r = mga_grkey.ckey.red; + g = mga_grkey.ckey.green; + b = mga_grkey.ckey.blue; break; } @@ -602,7 +579,6 @@ } #ifdef MGA_ALLOW_IRQ - static void enable_irq(){ long int cc; @@ -616,14 +592,16 @@ writeb(0x10, mga_mmio_base + CRTCD ); /* clear = 1 */ writel( regs.besglobctl , mga_mmio_base + BESGLOBCTL); - + + return; } -static void disable_irq(){ - +static void disable_irq() +{ writeb( 0x11, mga_mmio_base + CRTCX); writeb(0x20, mga_mmio_base + CRTCD ); /* clear 0, enable off */ + return; } void mga_handle_irq(int irq, void *dev_id/*, struct pt_regs *pregs*/) { @@ -695,14 +673,13 @@ return; } - -#endif +#endif /* MGA_ALLOW_IRQ */ int vixConfigPlayback(vidix_playback_t *config) { int x, y, sw, sh, dw, dh; int besleft, bestop, ifactor, ofsleft, ofstop, baseadrofs, weight, weights; - int frame_size=config->frame_size; + int frame_size; #ifdef CRTC2 #define right_margin 0 #define left_margin 18 @@ -722,30 +699,6 @@ #endif int frame; -#if 0 - switch(config->fourcc) - { - case IMGFMT_YV12: - mga_config.format = MGA_VID_FORMAT_YV12; - break; - case IMGFMT_IYUV: - mga_config.format = MGA_VID_FORMAT_IYUV; - break; - case IMGFMT_I420: - mga_config.format = MGA_VID_FORMAT_I420; - break; - case IMGFMT_YUY2: - mga_config.format = MGA_VID_FORMAT_YUY2; - break; - case IMGFMT_UYVY: - mga_config.format = MGA_VID_FORMAT_UYVY; - break; - default: - printf("[mga] unsupported video format: %x\n", - config->fourcc); - return(ENOTSUP); - } -#endif if ((config->num_frames < 1) || (config->num_frames > 4)) { printf("[mga] illegal num_frames: %d, setting to 2\n", config->num_frames); @@ -820,13 +773,6 @@ // config->offset.u = config->offset.y+config->frame_size; // config->offset.v = config->offset.u+2*config->frame_size; - if (is_g400) - mga_config.card_type = MGA_G400; - else - mga_config.card_type = MGA_G200; - - mga_config.ram_size = mga_ram_size; - //FIXME figure out a better way to allocate memory on card //allocate 2 megs //mga_src_base = mga_mem_base + (MGA_VIDMEM_SIZE-2) * 0x100000; @@ -1482,8 +1428,10 @@ return(ENOTSUP); } - to->depth = VID_DEPTH_12BPP | VID_DEPTH_16BPP | VID_DEPTH_32BPP; - to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK; + to->depth = VID_DEPTH_12BPP | + VID_DEPTH_15BPP | VID_DEPTH_16BPP | + VID_DEPTH_24BPP | VID_DEPTH_32BPP; + to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return(0); } @@ -1498,3 +1446,14 @@ return(0); } +int vixGetGrKeys(vidix_grkey_t *grkey) +{ + memcpy(grkey, &mga_grkey, sizeof(vidix_grkey_t)); + return(0); +} + +int vixSetGrKeys(const vidix_grkey_t *grkey) +{ + memcpy(&mga_grkey, grkey, sizeof(vidix_grkey_t)); + return(0); +} --- mga_vid.h DELETED ---

1 0

CVS: main/vidix/drivers mga_vid.c,1.4,1.5
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/vidix/drivers In directory mplayer:/var/tmp.root/cvs-serv6249 Modified Files: mga_vid.c Log Message: i think, it's better [playback->offsets and offset implemented/corrected] Index: mga_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/mga_vid.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mga_vid.c 16 Jan 2002 08:33:17 -0000 1.4 +++ mga_vid.c 18 Jan 2002 15:37:52 -0000 1.5 @@ -601,409 +601,6 @@ #endif } -#if 0 -static int mga_vid_set_config(mga_vid_config_t *config) -{ - int x, y, sw, sh, dw, dh; - int besleft, bestop, ifactor, ofsleft, ofstop, baseadrofs, weight, weights; - int frame_size=config->frame_size; -#ifdef CRTC2 -#define right_margin 0 -#define left_margin 18 -#define hsync_len 46 -#define lower_margin 10 -#define vsync_len 4 -#define upper_margin 39 - - unsigned int hdispend = (config->src_width + 31) & ~31; - unsigned int hsyncstart = hdispend + (right_margin & ~7); - unsigned int hsyncend = hsyncstart + (hsync_len & ~7); - unsigned int htotal = hsyncend + (left_margin & ~7); - unsigned int vdispend = config->src_height; - unsigned int vsyncstart = vdispend + lower_margin; - unsigned int vsyncend = vsyncstart + vsync_len; - unsigned int vtotal = vsyncend + upper_margin; -#endif - x = config->dest.x; - y = config->dest.y; - sw = config->src.width; - sh = config->src.height; - dw = config->dest.width; - dh = config->dest.height; - - printf("[mga] Setting up a %dx%d+%d+%d video window (src %dx%d) format %X\n", - dw, dh, x, y, sw, sh, config->fourcc); - - if((sw < 4) || (sh < 4) || (dw < 4) || (dh < 4)) - { - printf("[mga] Invalid src/dest dimenstions\n"); - return(EINVAL); - } - - //FIXME check that window is valid and inside desktop - - //FIXME figure out a better way to allocate memory on card - //allocate 2 megs - //mga_src_base = mga_mem_base + (MGA_VIDMEM_SIZE-2) * 0x100000; - //mga_src_base = (MGA_VIDMEM_SIZE-3) * 0x100000; - - //Setup the BES registers for a three plane 4:2:0 video source - - regs.besglobctl = 0; - -switch(config->fourcc){ - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - regs.besctl = 1 // BES enabled - + (0<<6) // even start polarity - + (1<<10) // x filtering enabled - + (1<<11) // y filtering enabled - + (1<<16) // chroma upsampling - + (1<<17) // 4:2:0 mode - + (1<<18); // dither enabled -#if 0 - if(is_g400) - { - //zoom disabled, zoom filter disabled, 420 3 plane format, proc amp - //disabled, rgb mode disabled - regs.besglobctl = (1<<5); - } - else - { - //zoom disabled, zoom filter disabled, Cb samples in 0246, Cr - //in 1357, BES register update on besvcnt - regs.besglobctl = 0; - } -#endif - break; - - case IMGFMT_YUY2: - 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 = 0; // YUY2 format selected - break; - - case IMGFMT_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: - printf("[mga] Unsupported pixel format: %x\n",config->fourcc); - return(ENOTSUP); -} - - - //Disable contrast and brightness control - regs.besglobctl |= (1<<5) + (1<<7); - regs.beslumactl = (0x7f << 16) + (0x80<<0); - regs.beslumactl = 0x80<<0; - - //Setup destination window boundaries - besleft = x > 0 ? x : 0; - bestop = y > 0 ? y : 0; - regs.beshcoord = (besleft<<16) + (x + dw-1); - regs.besvcoord = (bestop<<16) + (y + dh-1); - - //Setup source dimensions - regs.beshsrclst = (sw - 1) << 16; - regs.bespitch = (sw + 31) & ~31 ; - - //Setup horizontal scaling - ifactor = ((sw-1)<<14)/(dw-1); - ofsleft = besleft - x; - - regs.beshiscal = ifactor<<2; - regs.beshsrcst = (ofsleft*ifactor)<<2; - regs.beshsrcend = regs.beshsrcst + (((dw - ofsleft - 1) * ifactor) << 2); - - //Setup vertical scaling - ifactor = ((sh-1)<<14)/(dh-1); - ofstop = bestop - y; - - regs.besviscal = ifactor<<2; - - baseadrofs = ((ofstop*regs.besviscal)>>16)*regs.bespitch; - //frame_size = ((sw + 31) & ~31) * sh + (((sw + 31) & ~31) * sh) / 2; - regs.besa1org = (uint32_t) mga_src_base + baseadrofs; - regs.besa2org = (uint32_t) mga_src_base + baseadrofs + 1*frame_size; - regs.besb1org = (uint32_t) mga_src_base + baseadrofs + 2*frame_size; - regs.besb2org = (uint32_t) mga_src_base + baseadrofs + 3*frame_size; - -if(config->format==MGA_VID_FORMAT_YV12 - ||config->format==MGA_VID_FORMAT_IYUV - ||config->format==MGA_VID_FORMAT_I420 - ){ - // planar YUV frames: - if (is_g400) - baseadrofs = (((ofstop*regs.besviscal)/4)>>16)*regs.bespitch; - else - baseadrofs = (((ofstop*regs.besviscal)/2)>>16)*regs.bespitch; - - if(config->format==MGA_VID_FORMAT_YV12){ - regs.besa1corg = (uint32_t) mga_src_base + baseadrofs + regs.bespitch * sh ; - regs.besa2corg = (uint32_t) mga_src_base + baseadrofs + 1*frame_size + regs.bespitch * sh; - regs.besb1corg = (uint32_t) mga_src_base + baseadrofs + 2*frame_size + regs.bespitch * sh; - regs.besb2corg = (uint32_t) mga_src_base + baseadrofs + 3*frame_size + regs.bespitch * sh; - regs.besa1c3org = regs.besa1corg + ((regs.bespitch * sh) / 4); - regs.besa2c3org = regs.besa2corg + ((regs.bespitch * sh) / 4); - regs.besb1c3org = regs.besb1corg + ((regs.bespitch * sh) / 4); - regs.besb2c3org = regs.besb2corg + ((regs.bespitch * sh) / 4); - } else { - regs.besa1c3org = (uint32_t) mga_src_base + baseadrofs + regs.bespitch * sh ; - regs.besa2c3org = (uint32_t) mga_src_base + baseadrofs + 1*frame_size + regs.bespitch * sh; - regs.besb1c3org = (uint32_t) mga_src_base + baseadrofs + 2*frame_size + regs.bespitch * sh; - regs.besb2c3org = (uint32_t) mga_src_base + baseadrofs + 3*frame_size + regs.bespitch * sh; - regs.besa1corg = regs.besa1c3org + ((regs.bespitch * sh) / 4); - regs.besa2corg = regs.besa2c3org + ((regs.bespitch * sh) / 4); - regs.besb1corg = regs.besb1c3org + ((regs.bespitch * sh) / 4); - regs.besb2corg = regs.besb2c3org + ((regs.bespitch * sh) / 4); - } - -} - - weight = ofstop * (regs.besviscal >> 2); - weights = weight < 0 ? 1 : 0; - regs.besv2wght = regs.besv1wght = (weights << 16) + ((weight & 0x3FFF) << 2); - regs.besv2srclst = regs.besv1srclst = sh - 1 - (((ofstop * regs.besviscal) >> 16) & 0x03FF); - -#ifdef CRTC2 - // pridat hlavni registry - tj. casovani ... - - -switch(config->format){ - case MGA_VID_FORMAT_YV12: - case MGA_VID_FORMAT_I420: - case MGA_VID_FORMAT_IYUV: - cregs.c2ctl = 1 // CRTC2 enabled - + (1<<1) // external clock - + (0<<2) // external clock - + (1<<3) // pixel clock enable - not needed ??? - + (0<<4) // high prioryty req - + (1<<5) // high prioryty req - + (0<<6) // high prioryty req - + (1<<8) // high prioryty req max - + (0<<9) // high prioryty req max - + (0<<10) // high prioryty req max - + (0<<20) // CRTC1 to DAC - + (1<<21) // 420 mode - + (1<<22) // 420 mode - + (1<<23) // 420 mode - + (0<<24) // single chroma line for 420 mode - need to be corrected - + (0<<25) /*/ interlace mode - need to be corrected*/ - + (0<<26) // field legth polariry - + (0<<27) // field identification polariry - + (1<<28) // VIDRST detection mode - + (0<<29) // VIDRST detection mode - + (1<<30) // Horizontal counter preload - + (1<<31) // Vertical counter preload - ; - cregs.c2datactl = 1 // disable dither - propably not needed, we are already in YUV mode - + (1<<1) // Y filter enable - + (1<<2) // CbCr filter enable - + (0<<3) // subpicture enable (disabled) - + (0<<4) // NTSC enable (disabled - PAL) - + (0<<5) // C2 static subpicture enable (disabled) - + (0<<6) // C2 subpicture offset division (disabled) - + (0<<7) // 422 subformat selection ! -/* + (0<<8) // 15 bpp high alpha - + (0<<9) // 15 bpp high alpha - + (0<<10) // 15 bpp high alpha - + (0<<11) // 15 bpp high alpha - + (0<<12) // 15 bpp high alpha - + (0<<13) // 15 bpp high alpha - + (0<<14) // 15 bpp high alpha - + (0<<15) // 15 bpp high alpha - + (0<<16) // 15 bpp low alpha - + (0<<17) // 15 bpp low alpha - + (0<<18) // 15 bpp low alpha - + (0<<19) // 15 bpp low alpha - + (0<<20) // 15 bpp low alpha - + (0<<21) // 15 bpp low alpha - + (0<<22) // 15 bpp low alpha - + (0<<23) // 15 bpp low alpha - + (0<<24) // static subpicture key - + (0<<25) // static subpicture key - + (0<<26) // static subpicture key - + (0<<27) // static subpicture key - + (0<<28) // static subpicture key -*/ ; - break; - - case MGA_VID_FORMAT_YUY2: - cregs.c2ctl = 1 // CRTC2 enabled - + (1<<1) // external clock - + (0<<2) // external clock - + (1<<3) // pixel clock enable - not needed ??? - + (0<<4) // high prioryty req - acc to spec - + (1<<5) // high prioryty req - + (0<<6) // high prioryty req - // 7 reserved - + (1<<8) // high prioryty req max - + (0<<9) // high prioryty req max - + (0<<10) // high prioryty req max - // 11-19 reserved - + (0<<20) // CRTC1 to DAC - + (1<<21) // 422 mode - + (0<<22) // 422 mode - + (1<<23) // 422 mode - + (0<<24) // single chroma line for 420 mode - need to be corrected - + (0<<25) /*/ interlace mode - need to be corrected*/ - + (0<<26) // field legth polariry - + (0<<27) // field identification polariry - + (1<<28) // VIDRST detection mode - + (0<<29) // VIDRST detection mode - + (1<<30) // Horizontal counter preload - + (1<<31) // Vertical counter preload - ; - cregs.c2datactl = 1 // disable dither - propably not needed, we are already in YUV mode - + (1<<1) // Y filter enable - + (1<<2) // CbCr filter enable - + (0<<3) // subpicture enable (disabled) - + (0<<4) // NTSC enable (disabled - PAL) - + (0<<5) // C2 static subpicture enable (disabled) - + (0<<6) // C2 subpicture offset division (disabled) - + (0<<7) // 422 subformat selection ! -/* + (0<<8) // 15 bpp high alpha - + (0<<9) // 15 bpp high alpha - + (0<<10) // 15 bpp high alpha - + (0<<11) // 15 bpp high alpha - + (0<<12) // 15 bpp high alpha - + (0<<13) // 15 bpp high alpha - + (0<<14) // 15 bpp high alpha - + (0<<15) // 15 bpp high alpha - + (0<<16) // 15 bpp low alpha - + (0<<17) // 15 bpp low alpha - + (0<<18) // 15 bpp low alpha - + (0<<19) // 15 bpp low alpha - + (0<<20) // 15 bpp low alpha - + (0<<21) // 15 bpp low alpha - + (0<<22) // 15 bpp low alpha - + (0<<23) // 15 bpp low alpha - + (0<<24) // static subpicture key - + (0<<25) // static subpicture key - + (0<<26) // static subpicture key - + (0<<27) // static subpicture key - + (0<<28) // static subpicture key -*/ ; - break; - - case MGA_VID_FORMAT_UYVY: - cregs.c2ctl = 1 // CRTC2 enabled - + (1<<1) // external clock - + (0<<2) // external clock - + (1<<3) // pixel clock enable - not needed ??? - + (0<<4) // high prioryty req - + (1<<5) // high prioryty req - + (0<<6) // high prioryty req - + (1<<8) // high prioryty req max - + (0<<9) // high prioryty req max - + (0<<10) // high prioryty req max - + (0<<20) // CRTC1 to DAC - + (1<<21) // 422 mode - + (0<<22) // 422 mode - + (1<<23) // 422 mode - + (1<<24) // single chroma line for 420 mode - need to be corrected - + (1<<25) /*/ interlace mode - need to be corrected*/ - + (0<<26) // field legth polariry - + (0<<27) // field identification polariry - + (1<<28) // VIDRST detection mode - + (0<<29) // VIDRST detection mode - + (1<<30) // Horizontal counter preload - + (1<<31) // Vertical counter preload - ; - cregs.c2datactl = 0 // enable dither - propably not needed, we are already in YUV mode - + (1<<1) // Y filter enable - + (1<<2) // CbCr filter enable - + (0<<3) // subpicture enable (disabled) - + (0<<4) // NTSC enable (disabled - PAL) - + (0<<5) // C2 static subpicture enable (disabled) - + (0<<6) // C2 subpicture offset division (disabled) - + (1<<7) // 422 subformat selection ! -/* + (0<<8) // 15 bpp high alpha - + (0<<9) // 15 bpp high alpha - + (0<<10) // 15 bpp high alpha - + (0<<11) // 15 bpp high alpha - + (0<<12) // 15 bpp high alpha - + (0<<13) // 15 bpp high alpha - + (0<<14) // 15 bpp high alpha - + (0<<15) // 15 bpp high alpha - + (0<<16) // 15 bpp low alpha - + (0<<17) // 15 bpp low alpha - + (0<<18) // 15 bpp low alpha - + (0<<19) // 15 bpp low alpha - + (0<<20) // 15 bpp low alpha - + (0<<21) // 15 bpp low alpha - + (0<<22) // 15 bpp low alpha - + (0<<23) // 15 bpp low alpha - + (0<<24) // static subpicture key - + (0<<25) // static subpicture key - + (0<<26) // static subpicture key - + (0<<27) // static subpicture key - + (0<<28) // static subpicture key -*/ ; - break; - - default: - printf("[mga] Unsupported pixel format: 0x%X\n",config->format); - return -1; - } - - cregs.c2hparam=((hdispend - 8) << 16) | (htotal - 8); - cregs.c2hsync=((hsyncend - 8) << 16) | (hsyncstart - 8); - - cregs.c2misc=0 // CRTCV2 656 togg f0 - +(0<<1) // CRTCV2 656 togg f0 - +(0<<2) // CRTCV2 656 togg f0 - +(0<<4) // CRTCV2 656 togg f1 - +(0<<5) // CRTCV2 656 togg f1 - +(0<<6) // CRTCV2 656 togg f1 - +(0<<8) // Hsync active high - +(0<<9) // Vsync active high - // 16-27 c2vlinecomp - nevim co tam dat - ; - cregs.c2offset=(regs.bespitch << 1); - - cregs.c2pl2startadd0=regs.besa1corg; -// cregs.c2pl2startadd1=regs.besa2corg; - cregs.c2pl3startadd0=regs.besa1c3org; -// cregs.c2pl3startadd1=regs.besa2c3org; - - cregs.c2preload=(vsyncstart << 16) | (hsyncstart); // from - - cregs.c2spicstartadd0=0; // not used -// cregs.c2spicstartadd1=0; // not used - - cregs.c2startadd0=regs.besa1org; -// cregs.c2startadd1=regs.besa2org; - - cregs.c2subpiclut=0; //not used - - cregs.c2vparam=((vdispend - 1) << 16) | (vtotal - 1); - cregs.c2vsync=((vsyncend - 1) << 16) | (vsyncstart - 1); - - -#endif - - mga_vid_write_regs(0); - return 0; -} -#endif - #ifdef MGA_ALLOW_IRQ static void enable_irq(){ @@ -1155,6 +752,8 @@ config->num_frames = 2; // return(EINVAL); } + + config->num_frames = 2; /* let it be for now */ x = config->dest.x; y = config->dest.y; @@ -1199,6 +798,9 @@ frame_size = config->frame_size; + config->offsets[0] = 0; + config->offsets[1] = config->frame_size; /* ?? */ + config->offset.y=0; config->offset.v=((sw + 31) & ~31) * sh; config->offset.u=config->offset.v+((sw + 31) & ~31) * sh /4; @@ -1213,6 +815,10 @@ printf("[mga] YUV buffer base: %p\n", mga_src_base); config->dga_addr = mga_mem_base + mga_src_base; + +// config->offset.y = config->dga_addr; +// config->offset.u = config->offset.y+config->frame_size; +// config->offset.v = config->offset.u+2*config->frame_size; if (is_g400) mga_config.card_type = MGA_G400; @@ -1730,7 +1336,7 @@ /* from linux/pci.h */ #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) - pciconfig_read(pci_info.bus, PCI_DEVFN(pci_info.card, pci_info.func), + pci_config_read(pci_info.bus, PCI_DEVFN(pci_info.card, pci_info.func), 0x40, 4, &card_option); // pci_read_config_dword(dev, 0x40, &card_option); printf("[mga] OPTION word: 0x%08X mem: 0x%02X %s\n", card_option,

1 0

CVS: main/Gui/bitmap/png png.c,1.1,1.2
by Zoltan Ponekker 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/Gui/bitmap/png In directory mplayer:/var/tmp.root/cvs-serv13681 Modified Files: png.c Log Message: '40bit' - es png nincs is :) Index: png.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/bitmap/png/png.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- png.c 25 Aug 2001 21:04:27 -0000 1.1 +++ png.c 18 Jan 2002 12:26:57 -0000 1.2 @@ -113,7 +113,7 @@ } bf->Width=raw.Width; bf->Height=raw.Height; - bf->BPP=( raw.Depth * raw.Components ) + raw.Alpha; + bf->BPP=( raw.Depth * raw.Components ); bf->ImageSize=bf->Width * bf->Height * ( bf->BPP / 8 ); if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL ) {

1 0

CVS: main/libvo vosub_vidix.c,1.10,1.11
by Nick Kurshev 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv28978/main/libvo Modified Files: vosub_vidix.c Log Message: Suppress return values for 'void'. 10L to Alex Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vosub_vidix.c 18 Jan 2002 09:11:09 -0000 1.10 +++ vosub_vidix.c 18 Jan 2002 09:25:56 -0000 1.11 @@ -188,7 +188,7 @@ if((err=vdlPlaybackOn(vidix_handler))!=0) { printf("vosub_vidix: Can't start playback: %s\n",strerror(err)); - return -1; + return; } vid_eq.brightness = vo_gamma_brightness; vid_eq.saturation = vo_gamma_saturation; @@ -199,19 +199,16 @@ vid_eq.blue_intense = vo_gamma_blue_intense; vid_eq.flags = VEQ_FLG_ITU_R_BT_601; vdlPlaybackSetEq(vidix_handler,&vid_eq); - return 0; + return; } void vidix_stop(void) { int err; - if((err=vdlPlaybackOff(vidix_handler))!=0) { printf("vosub_vidix: Can't stop playback: %s\n",strerror(err)); - return -1; } - return 0; } void vidix_term( void )

3 3

CVS: main/libmpdemux network.c,1.26,1.27
by Alex Beregszaszi 18 Jan '02

18 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv26368 Modified Files: network.c Log Message: added .rm (real) and .y4m (yuv4mpeg) Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- network.c 14 Jan 2002 06:44:30 -0000 1.26 +++ network.c 18 Jan 2002 11:05:29 -0000 1.27 @@ -64,6 +64,8 @@ { "wmv", DEMUXER_TYPE_ASF }, { "wma", DEMUXER_TYPE_ASF }, { "viv", DEMUXER_TYPE_VIVO }, + { "rm", DEMUXER_TYPE_REAL }, + { "y4m", DEMUXER_TYPE_Y4M }, }; streaming_ctrl_t *

1 0