Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (e695e10b) · Commits · 戴 / test

Documentation/video4linux/CARDLIST.bttv

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,7 @@
	125 -> MATRIX Vision Sigma-SQ		125 -> MATRIX Vision Sigma-SQ
	126 -> MATRIX Vision Sigma-SLC		126 -> MATRIX Vision Sigma-SLC
	127 -> APAC Viewcomp 878(AMAX)		127 -> APAC Viewcomp 878(AMAX)
	128 -> DViCO FusionHDTV DVB-T Lite [18ac:db10]		128 -> DViCO FusionHDTV DVB-T Lite [18ac:db10,18ac:db11]
	129 -> V-Gear MyVCD		129 -> V-Gear MyVCD
	130 -> Super TV Tuner		130 -> Super TV Tuner
	131 -> Tibet Systems 'Progress DVR' CS16		131 -> Tibet Systems 'Progress DVR' CS16

Documentation/video4linux/CARDLIST.saa7134

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,3 +104,6 @@
	103 -> Compro Videomate DVB-T200A		103 -> Compro Videomate DVB-T200A
	104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6701]		104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6701]
	105 -> Terratec Cinergy HT PCMCIA [153b:1172]		105 -> Terratec Cinergy HT PCMCIA [153b:1172]
			106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344]
			107 -> Encore ENLTV-FM [1131:230f]
			108 -> Terratec Cinergy HT PCI [153b:1175]

Documentation/video4linux/CQcam.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -197,10 +197,10 @@ Use the ../../Maintainers file, particularly the VIDEO FOR LINUX and PARALLEL
	PORT SUPPORT sections		PORT SUPPORT sections

	The video4linux page:		The video4linux page:
	http://roadrunner.swansea.linux.org.uk/v4l.shtml		http://linuxtv.org

	The video4linux2 page:		The V4L2 API spec:
	http://millennium.diads.com/bdirks/v4l2.htm		http://v4l2spec.bytesex.org/

	Some web pages about the quickcams:		Some web pages about the quickcams:
	http://www.dkfz-heidelberg.de/Macromol/wedemann/mini-HOWTO-cqcam.html		http://www.dkfz-heidelberg.de/Macromol/wedemann/mini-HOWTO-cqcam.html

Documentation/video4linux/Zoran

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -339,9 +339,9 @@ Information - video4linux/mjpeg extensions:
	(also see below)		(also see below)

	Information - video4linux2:		Information - video4linux2:
	http://www.thedirks.org/v4l2/		http://linuxtv.org
			http://v4l2spec.bytesex.org/
	/usr/include/linux/videodev2.h		/usr/include/linux/videodev2.h
	http://www.bytesex.org/v4l/

	More information on the video4linux/mjpeg extensions, by Serguei		More information on the video4linux/mjpeg extensions, by Serguei
	Miridonovi and Rainer Johanni:		Miridonovi and Rainer Johanni:

Documentation/video4linux/cx2341x/fw-decoder-api.txt

+18 −40

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ Param[0]
	0 based frame number in GOP to begin playback from.		0 based frame number in GOP to begin playback from.
	Param[1]		Param[1]
	Specifies the number of muted audio frames to play before normal		Specifies the number of muted audio frames to play before normal
	audio resumes.		audio resumes. (This is not implemented in the firmware, leave at 0)

	-------------------------------------------------------------------------------		-------------------------------------------------------------------------------

	@@ -32,6 +32,10 @@ Description
	playback stops at specified PTS.		playback stops at specified PTS.
	Param[0]		Param[0]
	Display 0=last frame, 1=black		Display 0=last frame, 1=black
			Note: this takes effect immediately, so if you want to wait for a PTS,
			then use '0', otherwise the screen goes to black at once.
			You can call this later (even if there is no playback) with a 1 value
			to set the screen to black.
	Param[1]		Param[1]
	PTS low		PTS low
	Param[2]		Param[2]
	@@ -60,8 +64,12 @@ Param[0]
	31 Speed:		31 Speed:
	'0' slow		'0' slow
	'1' fast		'1' fast
			Note: n is limited to 2. Anything higher does not result in
			faster playback. Instead the host should start dropping frames.
	Param[1]		Param[1]
	Direction: 0=forward, 1=reverse		Direction: 0=forward, 1=reverse
			Note: to make reverse playback work you have to write full GOPs in
			reverse order.
	Param[2]		Param[2]
	Picture mask:		Picture mask:
	1=I frames		1=I frames
	@@ -69,13 +77,16 @@ Param[2]
	7=I, P, B frames		7=I, P, B frames
	Param[3]		Param[3]
	B frames per GOP (for reverse play only)		B frames per GOP (for reverse play only)
			Note: for reverse playback the Picture Mask should be set to I or I, P.
			Adding B frames to the mask will result in corrupt video. This field
			has to be set to the correct value in order to keep the timing correct.
	Param[4]		Param[4]
	Mute audio: 0=disable, 1=enable		Mute audio: 0=disable, 1=enable
	Param[5]		Param[5]
	Display 0=frame, 1=field		Display 0=frame, 1=field
	Param[6]		Param[6]
	Specifies the number of muted audio frames to play before normal audio		Specifies the number of muted audio frames to play before normal audio
	resumes.		resumes. (Not implemented in the firmware, leave at 0)

	-------------------------------------------------------------------------------		-------------------------------------------------------------------------------

	@@ -212,6 +223,7 @@ Description
	Select audio mode		Select audio mode
	Param[0]		Param[0]
	Dual mono mode action		Dual mono mode action
			0=Stereo, 1=Left, 2=Right, 3=Mono, 4=Swap, -1=Unchanged
	Param[1]		Param[1]
	Stereo mode action:		Stereo mode action:
	0=Stereo, 1=Left, 2=Right, 3=Mono, 4=Swap, -1=Unchanged		0=Stereo, 1=Left, 2=Right, 3=Mono, 4=Swap, -1=Unchanged
	@@ -224,7 +236,10 @@ Description
	Setup firmware to notify the host about a particular event.		Setup firmware to notify the host about a particular event.
	Counterpart to API 0xD5		Counterpart to API 0xD5
	Param[0]		Param[0]
	Event: 0=Audio mode change between stereo and dual channel		Event: 0=Audio mode change between mono, (joint) stereo and dual channel.
			Event: 3=Decoder started
			Event: 4=Unknown: goes off 10-15 times per second while decoding.
			Event: 5=Some sync event: goes off once per frame.
	Param[1]		Param[1]
	Notification 0=disabled, 1=enabled		Notification 0=disabled, 1=enabled
	Param[2]		Param[2]
	@@ -273,43 +288,6 @@ Param[3]

	-------------------------------------------------------------------------------		-------------------------------------------------------------------------------

	Name CX2341X_DEC_SET_AUDIO_OUTPUT
	Enum 27/0x1B
	Description
	Select audio output format
	Param[0]
	Bitmask:
	0:1 Data size:
	'00' 16 bit
	'01' 20 bit
	'10' 24 bit
	2:7 Unused
	8:9 Mode:
	'00' 2 channels
	'01' 4 channels
	'10' 6 channels
	'11' 6 channels with one line data mode
	(for left justified MSB first mode, 20 bit only)
	10:11 Unused
	12:13 Channel format:
	'00' right justified MSB first mode
	'01' left justified MSB first mode
	'10' I2S mode
	14:15 Unused
	16:21 Right justify bit count
	22:31 Unused

	-------------------------------------------------------------------------------

	Name CX2341X_DEC_SET_AV_DELAY
	Enum 28/0x1C
	Description
	Set audio/video delay in 90Khz ticks
	Param[0]
	0=A/V in sync, negative=audio lags, positive=video lags

	-------------------------------------------------------------------------------

	Name CX2341X_DEC_SET_PREBUFFERING		Name CX2341X_DEC_SET_PREBUFFERING
	Enum 30/0x1E		Enum 30/0x1E
	Description		Description

Admin message