diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-07 09:28:22 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-07 09:28:22 +0000 |
commit | 75c0b3169b79bfa85c905f87f0c77c07f04f29ad (patch) | |
tree | c2b7106529d50e759883d278bda6744af7318381 /vidix | |
parent | cb6aa3b4a8629a9678b212c51d057171e6a19bd8 (diff) | |
download | mpv-75c0b3169b79bfa85c905f87f0c77c07f04f29ad.tar.bz2 mpv-75c0b3169b79bfa85c905f87f0c77c07f04f29ad.tar.xz |
Embedding vidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4031 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r-- | vidix/Makefile | 13 | ||||
-rw-r--r-- | vidix/drivers/Makefile | 9 | ||||
-rw-r--r-- | vidix/drivers/radeon_vid.c | 25 |
3 files changed, 25 insertions, 22 deletions
diff --git a/vidix/Makefile b/vidix/Makefile index 0e964faa90..bd287b7131 100644 --- a/vidix/Makefile +++ b/vidix/Makefile @@ -1,5 +1,6 @@ - LIBNAME = libvidix.a +SUBDIRS = drivers +DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done include ../config.mak @@ -15,22 +16,30 @@ CFLAGS = $(OPTFLAGS) -W -Wall .c.o: $(CC) -c $(CFLAGS) -o $@ $< +all: $(SUBDIRS) $(LIBNAME) + $(DO_MAKE) + $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) -all: $(LIBNAME) clean: rm -f *.o *.a *~ + $(DO_MAKE) distclean: rm -f test *.o *.a *~ .depend + $(DO_MAKE) dep: depend + $(DO_MAKE) depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend +install: + $(DO_MAKE) + # # include dependency files if they exist # diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile index 63c3da0019..ab2f026fdd 100644 --- a/vidix/drivers/Makefile +++ b/vidix/drivers/Makefile @@ -2,6 +2,8 @@ include ../../config.mak +BINDIR = $(prefix)/lib/mplayer/vidix + RADEON_VID=radeon_vid.so RADEON_SRCS=radeon_vid.c @@ -26,13 +28,13 @@ $(RADEON_OBJS): $(RADEON_SRCS) $(CC) -c $(RADEON_CFLAGS) -o $@ $< $(RADEON_VID): $(RADEON_OBJS) - $(CC) $(RADEON_LIBS) -shared -o $(RADEON_VID) $(RADEON_OBJS) + $(LD) $(RADEON_LIBS) -shared -soname $(RADEON_VID) -o $(RADEON_VID) $(RADEON_OBJS) $(RAGE128_OBJS): $(RAGE128_SRCS) $(CC) -c $(RAGE128_CFLAGS) -o $@ $< $(RAGE128_VID): $(RAGE128_OBJS) - $(CC) $(RAGE128_LIBS) -shared -o $(RAGE128_VID) $(RAGE128_OBJS) + $(LD) $(RAGE128_LIBS) -shared -soname $(RAGE128_VID) -o $(RAGE128_VID) $(RAGE128_OBJS) clean: rm -f *.o *.so *~ @@ -46,7 +48,8 @@ depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend install: - + mkdir -p $(BINDIR) + cp *.so $(BINDIR) # # include dependency files if they exist # diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c index dc10ffa7a7..3ddc69c1ab 100644 --- a/vidix/drivers/radeon_vid.c +++ b/vidix/drivers/radeon_vid.c @@ -1,5 +1,8 @@ /* radeon_vid - VIDIX based video driver for Radeon and Rage128 chips + Copyrights 2002 Nick Kurshev. This file is based on sources from + GATOS (gatos.sf.net) and X11 (www.xfree86.org) + Licence: GPL */ #include <linux/pci_ids.h> @@ -25,7 +28,7 @@ #endif #endif -#define DEBUG 1 +static int __verbose = 0; typedef struct bes_registers_s { @@ -83,9 +86,7 @@ typedef struct bes_registers_s typedef struct video_registers_s { -#ifdef DEBUG const char * sname; -#endif uint32_t name; uint32_t value; }video_registers_t; @@ -94,12 +95,7 @@ static bes_registers_t besr; #ifndef RAGE128 static int IsR200=0; #endif -#ifdef DEBUG #define DECLARE_VREG(name) { #name, name, 0 } -#else -#define DECLARE_VREG(name) { name, 0 } -#endif -#ifdef DEBUG static video_registers_t vregs[] = { DECLARE_VREG(VIDEOMUX_CNTL), @@ -194,7 +190,7 @@ static video_registers_t vregs[] = DECLARE_VREG(IDCT_AUTH), DECLARE_VREG(IDCT_CONTROL) }; -#endif + static void * radeon_mmio_base = 0; static void * radeon_mem_base = 0; static int32_t radeon_overlay_off = 0; @@ -629,6 +625,7 @@ int vixProbe( int verbose ) pciinfo_t lst[MAX_PCI_DEVICES]; unsigned i,num_pci; int err; + __verbose = verbose; err = pci_scan(lst,&num_pci); if(err) { @@ -724,7 +721,6 @@ int vixQueryFourcc(vidix_fourcc_t *to) return ENOSYS; } -#ifdef DEBUG static void radeon_vid_dump_regs( void ) { size_t i; @@ -738,7 +734,6 @@ static void radeon_vid_dump_regs( void ) printf(RADEON_MSG"%s = %08X\n",vregs[i].sname,INREG(vregs[i].name)); printf(RADEON_MSG"*** End of OV0 registers dump ***\n"); } -#endif static void radeon_vid_stop_video( void ) { @@ -848,9 +843,7 @@ static void radeon_vid_display_video( void ) } OUTREG(OV0_SCALE_CNTL, bes_flags); OUTREG(OV0_REG_LOAD_CNTL, 0); -#ifdef DEBUG - radeon_vid_dump_regs(); -#endif + if(__verbose > 1) radeon_vid_dump_regs(); } static unsigned radeon_query_pitch(unsigned fourcc) @@ -1050,9 +1043,7 @@ int vixPlaybackFrameSel(unsigned frame) OUTREG(OV0_VID_BUF1_BASE_ADRS, off1); OUTREG(OV0_VID_BUF2_BASE_ADRS, off2); OUTREG(OV0_REG_LOAD_CNTL, 0); -#ifdef DEBUG - radeon_vid_dump_regs(); -#endif + if(__verbose > 1) radeon_vid_dump_regs(); return 0; } |