Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (25581ad1) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/video4linux/CARDLIST.bttv

+2 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@
		86 -> Osprey 101/151 w/ svid
		87 -> Osprey 200/201/250/251
		88 -> Osprey 200/250 [0070:ff01]
		89 -> Osprey 210/220
		89 -> Osprey 210/220/230
		90 -> Osprey 500 [0070:ff02]
		91 -> Osprey 540 [0070:ff04]
		92 -> Osprey 2000 [0070:ff03]
		@@ -111,7 +111,7 @@
		110 -> IVC-100 [ff00:a132]
		111 -> IVC-120G [ff00:a182,ff01:a182,ff02:a182,ff03:a182,ff04:a182,ff05:a182,ff06:a182,ff07:a182,ff08:a182,ff09:a182,ff0a:a182,ff0b:a182,ff0c:a182,ff0d:a182,ff0e:a182,ff0f:a182]
		112 -> pcHDTV HD-2000 TV [7063:2000]
		113 -> Twinhan DST + clones [11bd:0026,1822:0001,270f:fc00]
		113 -> Twinhan DST + clones [11bd:0026,1822:0001,270f:fc00,1822:0026]
		114 -> Winfast VC100 [107d:6607]
		115 -> Teppro TEV-560/InterVision IV-560
		116 -> SIMUS GVC1100 [aa6a:82b2]

Documentation/video4linux/CARDLIST.cx88

+7 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		14 -> KWorld/VStream XPert DVB-T [17de:08a6]
		15 -> DViCO FusionHDTV DVB-T1 [18ac:db00]
		16 -> KWorld LTV883RF
		17 -> DViCO FusionHDTV 3 Gold-Q [18ac:d810]
		17 -> DViCO FusionHDTV 3 Gold-Q [18ac:d810,18ac:d800]
		18 -> Hauppauge Nova-T DVB-T [0070:9002,0070:9001]
		19 -> Conexant DVB-T reference design [14f1:0187]
		20 -> Provideo PV259 [1540:2580]
		@@ -40,8 +40,13 @@
		39 -> KWorld DVB-S 100 [17de:08b2]
		40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid [0070:9400,0070:9402]
		41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile) [0070:9800,0070:9802]
		42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025]
		42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025,1822:0019]
		43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1]
		44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]
		45 -> KWorld HardwareMpegTV XPert [17de:0840]
		46 -> DViCO FusionHDTV DVB-T Hybrid [18ac:db40,18ac:db44]
		47 -> pcHDTV HD5500 HDTV [7063:5500]
		48 -> Kworld MCE 200 Deluxe [17de:0841]
		49 -> PixelView PlayTV P7000 [1554:4813]
		50 -> NPG Tech Real TV FM Top 10 [14f1:0842]
		51 -> WinFast DTV2000 H [107d:665e]

Documentation/video4linux/CARDLIST.saa7134

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,3 +93,4 @@
		92 -> AVerMedia A169 B1 [1461:6360]
		93 -> Medion 7134 Bridge #2 [16be:0005]
		94 -> LifeView FlyDVB-T Hybrid Cardbus [5168:3306,5168:3502]
		95 -> LifeView FlyVIDEO3000 (NTSC) [5169:0138]

Documentation/video4linux/CARDLIST.tuner

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ tuner=60 - Thomson DTT 761X (ATSC/NTSC)
		tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF
		tuner=62 - Philips TEA5767HN FM Radio
		tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner
		tuner=64 - LG TDVS-H062F/TUA6034
		tuner=64 - LG TDVS-H06xF
		tuner=65 - Ymec TVF66T5-B/DFF
		tuner=66 - LG TALN series
		tuner=67 - Philips TD1316 Hybrid Tuner
		@@ -71,3 +71,4 @@ tuner=69 - Tena TNF 5335 and similar models
		tuner=70 - Samsung TCPN 2121P30A
		tuner=71 - Xceive xc3028
		tuner=72 - Thomson FE6600
		tuner=73 - Samsung TCPG 6121P30A

Documentation/video4linux/CQcam.txt

+3 −200

Original line number	Diff line number	Diff line
		@@ -185,207 +185,10 @@ this work is documented at the video4linux2 site listed below.

		9.0 --- A sample program using v4lgrabber,

		This program is a simple image grabber that will copy a frame from the
		v4lgrab is a simple image grabber that will copy a frame from the
		first video device, /dev/video0 to standard output in portable pixmap
		format (.ppm) Using this like: 'v4lgrab \| convert - c-qcam.jpg'
		produced this picture of me at
		http://mug.sys.virginia.edu/~drf5n/extras/c-qcam.jpg

		-------------------- 8< ---------------- 8< -----------------------------

		/* Simple Video4Linux image grabber. */
		/*
		* Video4Linux Driver Test/Example Framegrabbing Program
		*
		* Compile with:
		* gcc -s -Wall -Wstrict-prototypes v4lgrab.c -o v4lgrab
		* Use as:
		* v4lgrab >image.ppm
		*
		* Copyright (C) 1998-05-03, Phil Blundell <philb@gnu.org>
		* Copied from http://www.tazenda.demon.co.uk/phil/vgrabber.c
		* with minor modifications (Dave Forrest, drf5n@virginia.edu).
		*
		*/

		#include <unistd.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <fcntl.h>
		#include <stdio.h>
		#include <sys/ioctl.h>
		#include <stdlib.h>

		#include <linux/types.h>
		#include <linux/videodev.h>

		#define FILE "/dev/video0"

		/* Stole this from tvset.c */

		#define READ_VIDEO_PIXEL(buf, format, depth, r, g, b) \
		{ \
		switch (format) \
		{ \
		case VIDEO_PALETTE_GREY: \
		switch (depth) \
		{ \
		case 4: \
		case 6: \
		case 8: \
		(r) = (g) = (b) = (*buf++ << 8);\
		break; \
		\
		case 16: \
		(r) = (g) = (b) = \
		((unsigned short ) buf); \
		buf += 2; \
		break; \
		} \
		break; \
		\
		\
		case VIDEO_PALETTE_RGB565: \
		{ \
		unsigned short tmp = (unsigned short )buf; \
		(r) = tmp&0xF800; \
		(g) = (tmp<<5)&0xFC00; \
		(b) = (tmp<<11)&0xF800; \
		buf += 2; \
		} \
		break; \
		\
		case VIDEO_PALETTE_RGB555: \
		(r) = (buf[0]&0xF8)<<8; \
		(g) = ((buf[0] << 5 \| buf[1] >> 3)&0xF8)<<8; \
		(b) = ((buf[1] << 2 ) & 0xF8)<<8; \
		buf += 2; \
		break; \
		\
		case VIDEO_PALETTE_RGB24: \
		(r) = buf[0] << 8; (g) = buf[1] << 8; \
		(b) = buf[2] << 8; \
		buf += 3; \
		break; \
		\
		default: \
		fprintf(stderr, \
		"Format %d not yet supported\n", \
		format); \
		} \
		}

		int get_brightness_adj(unsigned char image, long size, int brightness) {
		long i, tot = 0;
		for (i=0;i<size*3;i++)
		tot += image[i];
		brightness = (128 - tot/(size3))/3;
		return !((tot/(size3)) >= 126 && (tot/(size3)) <= 130);
		}

		int main(int argc, char ** argv)
		{
		int fd = open(FILE, O_RDONLY), f;
		struct video_capability cap;
		struct video_window win;
		struct video_picture vpic;

		unsigned char buffer, src;
		int bpp = 24, r, g, b;
		unsigned int i, src_depth;

		if (fd < 0) {
		perror(FILE);
		exit(1);
		}

		if (ioctl(fd, VIDIOCGCAP, &cap) < 0) {
		perror("VIDIOGCAP");
		fprintf(stderr, "(" FILE " not a video4linux device?)\n");
		close(fd);
		exit(1);
		}

		if (ioctl(fd, VIDIOCGWIN, &win) < 0) {
		perror("VIDIOCGWIN");
		close(fd);
		exit(1);
		}

		if (ioctl(fd, VIDIOCGPICT, &vpic) < 0) {
		perror("VIDIOCGPICT");
		close(fd);
		exit(1);
		}

		if (cap.type & VID_TYPE_MONOCHROME) {
		vpic.depth=8;
		vpic.palette=VIDEO_PALETTE_GREY; /* 8bit grey */
		if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
		vpic.depth=6;
		if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
		vpic.depth=4;
		if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
		fprintf(stderr, "Unable to find a supported capture format.\n");
		close(fd);
		exit(1);
		}
		}
		}
		} else {
		vpic.depth=24;
		vpic.palette=VIDEO_PALETTE_RGB24;

		if(ioctl(fd, VIDIOCSPICT, &vpic) < 0) {
		vpic.palette=VIDEO_PALETTE_RGB565;
		vpic.depth=16;

		if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
		vpic.palette=VIDEO_PALETTE_RGB555;
		vpic.depth=15;

		if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
		fprintf(stderr, "Unable to find a supported capture format.\n");
		return -1;
		}
		}
		}
		}

		buffer = malloc(win.width * win.height * bpp);
		if (!buffer) {
		fprintf(stderr, "Out of memory.\n");
		exit(1);
		}

		do {
		int newbright;
		read(fd, buffer, win.width * win.height * bpp);
		f = get_brightness_adj(buffer, win.width * win.height, &newbright);
		if (f) {
		vpic.brightness += (newbright << 8);
		if(ioctl(fd, VIDIOCSPICT, &vpic)==-1) {
		perror("VIDIOSPICT");
		break;
		}
		}
		} while (f);

		fprintf(stdout, "P6\n%d %d 255\n", win.width, win.height);

		src = buffer;

		for (i = 0; i < win.width * win.height; i++) {
		READ_VIDEO_PIXEL(src, vpic.palette, src_depth, r, g, b);
		fputc(r>>8, stdout);
		fputc(g>>8, stdout);
		fputc(b>>8, stdout);
		}

		close(fd);
		return 0;
		}
		-------------------- 8< ---------------- 8< -----------------------------
		format (.ppm) To produce .jpg output, you can use it like this:
		'v4lgrab \| convert - c-qcam.jpg'


		10.0 --- Other Information