V4L/DVB (5547): Add ENUM_FRAMESIZES and ENUM_FRAMEINTERVALS ioctls (9ee6d78c) · Commits · e / devices / android_kernel_teracube_emerald

drivers/media/video/pwc/pwc-ctrl.c

+59 −2

Original line number	Diff line number	Diff line
		@@ -140,6 +140,8 @@ static const char *size2name[PSZ_MAX] =
		An alternate value of 0 means this mode is not available at all.
		*/

		#define PWC_FPS_MAX_NALA 8

		struct Nala_table_entry {
		char alternate; /* USB alternate setting */
		int compressed; /* Compressed yes/no */
		@@ -147,7 +149,9 @@ struct Nala_table_entry {
		unsigned char mode[3]; /* precomputed mode table */
		};

		static struct Nala_table_entry Nala_table[PSZ_MAX][8] =
		static unsigned int Nala_fps_vector[PWC_FPS_MAX_NALA] = { 4, 5, 7, 10, 12, 15, 20, 24 };

		static struct Nala_table_entry Nala_table[PSZ_MAX][PWC_FPS_MAX_NALA] =
		{
		#include "pwc-nala.h"
		};
		@@ -423,6 +427,59 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame
		return 0;
		}

		static unsigned int pwc_get_fps_Nala(struct pwc_device *pdev, unsigned int index, unsigned int size)
		{
		unsigned int i;

		for (i = 0; i < PWC_FPS_MAX_NALA; i++) {
		if (Nala_table[size][i].alternate) {
		if (index--==0) return Nala_fps_vector[i];
		}
		}
		return 0;
		}

		static unsigned int pwc_get_fps_Kiara(struct pwc_device *pdev, unsigned int index, unsigned int size)
		{
		unsigned int i;

		for (i = 0; i < PWC_FPS_MAX_KIARA; i++) {
		if (Kiara_table[size][i][3].alternate) {
		if (index--==0) return Kiara_fps_vector[i];
		}
		}
		return 0;
		}

		static unsigned int pwc_get_fps_Timon(struct pwc_device *pdev, unsigned int index, unsigned int size)
		{
		unsigned int i;

		for (i=0; i < PWC_FPS_MAX_TIMON; i++) {
		if (Timon_table[size][i][3].alternate) {
		if (index--==0) return Timon_fps_vector[i];
		}
		}
		return 0;
		}

		unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned int size)
		{
		unsigned int ret;

		if (DEVICE_USE_CODEC1(pdev->type)) {
		ret = pwc_get_fps_Nala(pdev, index, size);

		} else if (DEVICE_USE_CODEC3(pdev->type)) {
		ret = pwc_get_fps_Kiara(pdev, index, size);

		} else {
		ret = pwc_get_fps_Timon(pdev, index, size);
		}

		return ret;
		}

		#define BLACK_Y 0
		#define BLACK_U 128
		#define BLACK_V 128

drivers/media/video/pwc/pwc-if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1493,7 +1493,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
		case 0x0329:
		PWC_INFO("Philips SPC 900NC USB webcam detected.\n");
		name = "Philips SPC 900NC webcam";
		type_id = 720;
		type_id = 740;
		break;
		default:
		return -ENODEV;

drivers/media/video/pwc/pwc-ioctl.h

+34 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		#define PWC_IOCTL_H

		/* (C) 2001-2004 Nemosoft Unv.
		(C) 2004 Luc Saillard (luc@saillard.org)
		(C) 2004-2006 Luc Saillard (luc@saillard.org)

		NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
		driver and thus may have bugs that are not present in the original version.
		@@ -25,7 +25,7 @@
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		/* This is pwc-ioctl.h belonging to PWC 8.12.1
		/* This is pwc-ioctl.h belonging to PWC 10.0.10
		It contains structures and defines to communicate from user space
		directly to the driver.
		*/
		@@ -51,6 +51,9 @@
		... the function
		*/

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


		/* Enumeration of image sizes */
		#define PSZ_SQCIF 0x00
		@@ -65,6 +68,8 @@
		/* The frame rate is encoded in the video_window.flags parameter using
		the upper 16 bits, since some flags are defined nowadays. The following
		defines provide a mask and shift to filter out this value.
		This value can also be passing using the private flag when using v4l2 and
		VIDIOC_S_FMT ioctl.

		In 'Snapshot' mode the camera freezes its automatic exposure and colour
		balance controls.
		@@ -73,6 +78,8 @@
		#define PWC_FPS_MASK 0x00FF0000
		#define PWC_FPS_FRMASK 0x003F0000
		#define PWC_FPS_SNAPSHOT 0x00400000
		#define PWC_QLT_MASK 0x03000000
		#define PWC_QLT_SHIFT 24


		/* structure for transferring x & y coordinates */
		@@ -289,4 +296,29 @@ struct pwc_table_init_buffer {
		};
		#define VIDIOCPWCGVIDTABLE _IOR('v', 216, struct pwc_table_init_buffer)

		/*
		* This is private command used when communicating with v4l2.
		* In the future all private ioctl will be remove/replace to
		* use interface offer by v4l2.
		*/

		#define V4L2_CID_PRIVATE_SAVE_USER (V4L2_CID_PRIVATE_BASE + 0)
		#define V4L2_CID_PRIVATE_RESTORE_USER (V4L2_CID_PRIVATE_BASE + 1)
		#define V4L2_CID_PRIVATE_RESTORE_FACTORY (V4L2_CID_PRIVATE_BASE + 2)
		#define V4L2_CID_PRIVATE_COLOUR_MODE (V4L2_CID_PRIVATE_BASE + 3)
		#define V4L2_CID_PRIVATE_AUTOCONTOUR (V4L2_CID_PRIVATE_BASE + 4)
		#define V4L2_CID_PRIVATE_CONTOUR (V4L2_CID_PRIVATE_BASE + 5)
		#define V4L2_CID_PRIVATE_BACKLIGHT (V4L2_CID_PRIVATE_BASE + 6)
		#define V4L2_CID_PRIVATE_FLICKERLESS (V4L2_CID_PRIVATE_BASE + 7)
		#define V4L2_CID_PRIVATE_NOISE_REDUCTION (V4L2_CID_PRIVATE_BASE + 8)

		struct pwc_raw_frame {
		__le16 type; /* type of the webcam */
		__le16 vbandlength; /* Size of 4lines compressed (used by the decompressor) */
		__u8 cmd[4]; /* the four byte of the command (in case of nala,
		only the first 3 bytes is filled) */
		__u8 rawframe[0]; /* frame_size = H/4vbandlength /
		} __attribute__ ((packed));


		#endif

drivers/media/video/pwc/pwc-kiara.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@
		#include "pwc-kiara.h"
		#include "pwc-uncompress.h"

		const unsigned int Kiara_fps_vector[PWC_FPS_MAX_KIARA] = { 5, 10, 15, 20, 25, 30 };

		const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4] =
		{
		/* SQCIF */

drivers/media/video/pwc/pwc-kiara.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@

		#include <media/pwc-ioctl.h>

		#define PWC_FPS_MAX_KIARA 6

		struct Kiara_table_entry
		{
		char alternate; /* USB alternate interface */
		@@ -37,8 +39,9 @@ struct Kiara_table_entry
		unsigned char mode[12]; /* precomputed mode settings for cam */
		};

		extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][6][4];
		extern const struct Kiara_table_entry Kiara_table[PSZ_MAX][PWC_FPS_MAX_KIARA][4];
		extern const unsigned int KiaraRomTable[8][2][16][8];
		extern const unsigned int Kiara_fps_vector[PWC_FPS_MAX_KIARA];

		#endif