Author: mguevara Date: Tue Feb 21 13:11:25 2006 GMT
Module: SOURCES Tag: LINUX_2_6_14
---- Log message:
- patch to add audio for cx88-blackbird tv tuner card
---- Files affected:
SOURCES:
linux-2.6.14.7-cx88-blackbird.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6.14.7-cx88-blackbird.patch
diff -u /dev/null SOURCES/linux-2.6.14.7-cx88-blackbird.patch:1.1.2.1
--- /dev/null Tue Feb 21 14:11:25 2006
+++ SOURCES/linux-2.6.14.7-cx88-blackbird.patch Tue Feb 21 14:11:20 2006
@@ -0,0 +1,103 @@
+--- linux-2.6.14.7.orig/drivers/media/video/cx88/cx88-blackbird.c
2006-02-21 13:47:01.000000000 +0100
++++ linux-2.6.14.7/drivers/media/video/cx88/cx88-blackbird.c 2006-02-21
13:46:34.000000000 +0100
+@@ -685,22 +685,66 @@
+ */
+ static void blackbird_codec_settings(struct cx8802_dev *dev)
+ {
++ struct cx88_core *core = dev->core;
+ int bitrate_mode = 1;
+ int bitrate = 7500000;
+ int bitrate_peak = 7500000;
+ bitrate_mode = BLACKBIRD_VIDEO_CBR;
+ bitrate = 4000*1024;
+- bitrate_peak = 4000*1024;
++ bitrate_peak = 4000*1024; /* it was 7 500 000 */
+
+ /* assign stream type */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_STREAM_TYPE, 1, 0,
BLACKBIRD_STREAM_PROGRAM);
+-
++ /* BLACKBIRD_API_SET_STREAM_TYPE - 0xB9 */
++
+ /* assign output port */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_OUTPUT_PORT, 1, 0,
BLACKBIRD_OUTPUT_PORT_STREAMING); /* Host */
++ /* IVTV_API_ASSIGN_OUTPUT_PORT - 0x000000bb */
++ /* BLACKBIRD_API_SET_OUTPUT_PORT - 0xBB */
++ /* BLACKBIRD_OUTPUT_PORT_STREAMING - enum #1 - earlier 1*/
+
++ if (core->tvnorm->cxiformat == VideoFormatPAL) {
++
+ /* assign framerate */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0,
BLACKBIRD_FRAMERATE_PAL_25);
++ /* IVTV_API_ASSIGN_FRAMERATE - 0x0000008f*/
++ /* BLACKBIRD_API_SET_FRAMERATE - 0x8F */
++ /* BLACKBIRD_FRAMERATE_PAL_25 - enum #1 */
++
++ /* assign gop properties */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, 12, 3);
++ /* IVTV_API_ASSIGN_GOP_PROPERTIES - 0x00000097 */
++ /* BLACKBIRD_API_SET_GOP_STRUCTURE - 0x97 */
++
++ /* assign 3 2 pulldown */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0,
BLACKBIRD_3_2_PULLDOWN_ENABLED);
++ /* IVTV_API_ASSIGN_3_2_PULLDOWN - 0x000000b1 */
++ /* BLACKBIRD_API_SET_3_2_PULLDOWN - 0xB1 */
++ /* BLACKBIRD_3_2_PULLDOWN_DISABLED - enum #0 */
++ /* BLACKBIRD_3_2_PULLDOWN_ENABLED - enum #1 */
++
++ /* assign gop closure */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0,
BLACKBIRD_GOP_CLOSURE_ON);
++ /* IVTV_API_ASSIGN_GOP_CLOSURE - 0x000000c5 */
++ /* BLACKBIRD_API_SET_GOP_CLOSURE - 0xC5 */
++ /* BLACKBIRD_GOP_CLOSURE_ON -enum #1 */
++ /* BLACKBIRD_GOP_CLOSURE_OFF - enum #0 */
++ }
++ else {
++
++ /* assign framerate */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_FRAMERATE, 1, 0,
BLACKBIRD_FRAMERATE_NTSC_30);
++
++ /* assign gop properties */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, 15, 3);
++
++ /* assign 3 2 pulldown */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0,
BLACKBIRD_3_2_PULLDOWN_DISABLED);
+
++ /* assign gop closure */
++ blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0,
BLACKBIRD_GOP_CLOSURE_OFF);
++ }
++
+ /* assign frame size */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_RESOLUTION, 2, 0,
+ dev->height, dev->width);
+@@ -715,18 +759,13 @@
+ bitrate_peak / BLACKBIRD_PEAK_RATE_DIVISOR, /*
peak/400 */
+ BLACKBIRD_MUX_RATE_DEFAULT /*, 0x70*/); /*
encoding buffer, ckennedy */
+
+- /* assign gop properties */
+- blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_STRUCTURE, 2, 0, 15, 3);
+-
+- /* assign 3 2 pulldown */
+- blackbird_api_cmd(dev, BLACKBIRD_API_SET_3_2_PULLDOWN, 1, 0,
BLACKBIRD_3_2_PULLDOWN_DISABLED);
+-
+ /* assign audio properties */
+ /* note: it's not necessary to set the samplerate, the mpeg encoder
seems to autodetect/adjust */
+ /* blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0,
(2<<2) | (8<<4));
+ blackbird_api_cmd(dev, IVTV_API_ASSIGN_AUDIO_PROPERTIES, 1, 0, 0 |
(2 << 2) | (14 << 4)); */
++ /* change to 48kHz */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_AUDIO_PARAMS, 1, 0,
+- BLACKBIRD_AUDIO_BITS_44100HZ |
++ BLACKBIRD_AUDIO_BITS_48000HZ |
+ BLACKBIRD_AUDIO_BITS_LAYER_2 |
+ BLACKBIRD_AUDIO_BITS_LAYER_2_224 |
+ BLACKBIRD_AUDIO_BITS_STEREO |
+@@ -737,10 +776,6 @@
+ BLACKBIRD_AUDIO_BITS_COPY
+ );
+
+- /* assign gop closure */
+- blackbird_api_cmd(dev, BLACKBIRD_API_SET_GOP_CLOSURE, 1, 0,
BLACKBIRD_GOP_CLOSURE_OFF);
+-
+-
+ /* assign dnr filter mode */
+ blackbird_api_cmd(dev, BLACKBIRD_API_SET_DNR_MODE, 2, 0,
+ BLACKBIRD_DNR_BITS_MANUAL,
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
