OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support 

- clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder.
- enable blackbird support on the KWorld HardwareMpegTV XPert

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2006-04-16 12:17:34 -03:00 committed by Mauro Carvalho Chehab
parent 1b77c54ee1
commit 3febc04d42
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/cx88/cx88-blackbird.c
View File

@ -1686,12 +1686,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
if (core->tuner_formats & V4L2_STD_525_60) {
dev->height = 480;
dev->params.vi_frame_rate = 30;
} else {
dev->height = 576;
dev->params.vi_frame_rate = 25;
if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {
if (core->tuner_formats & V4L2_STD_525_60) {
dev->height = 480;
dev->params.vi_frame_rate = 30;
} else {
dev->height = 576;
dev->params.vi_frame_rate = 25;
}
}
err = cx8802_init_common(dev);

1
drivers/media/video/cx88/cx88-cards.c
View File

@ -1071,6 +1071,7 @@ struct cx88_board cx88_boards[] = {
.gpio0 = 0x3de6,
.gpio2 = 0x00ff,
},
.blackbird = 1,
},
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
.name = "DViCO FusionHDTV DVB-T Hybrid",

1
drivers/media/video/cx88/cx88-tvaudio.c
View File

@ -151,6 +151,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
switch (core->board) {
case CX88_BOARD_HAUPPAUGE_ROSLYN:
case CX88_BOARD_KWORLD_MCE200_DELUXE:
case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
break;
default: