diff options
| author | Mike Isely <isely@pobox.com> | 2006-07-22 18:39:33 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-07-22 18:39:33 -0500 |
| commit | 9b657fea9df3065a76166f00d4f141f6311d4f66 (patch) | |
| tree | c6e2554b2c28191bbd31912f7ddb6c8ba7d56a39 /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |
| parent | d4a534b7849eeee1e2b0bd61bd8e636dcf793ca1 (diff) | |
| download | mediapointer-dvb-s2-9b657fea9df3065a76166f00d4f141f6311d4f66.tar.gz mediapointer-dvb-s2-9b657fea9df3065a76166f00d4f141f6311d4f66.tar.bz2 | |
Clean up some post mpeg-controls issues in pvrusb2
From: Mike Isely <isely@pobox.com>
Fix a few miscellaneous issues in the pvrusb2 driver related to use of
the new mpeg controls. This also should fix problems involving
update of the saa7115 / cx25840 configuration as control changes are made.
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index fa4a56f7a..1feec2c2b 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -222,14 +222,15 @@ static const struct pvr2_mpeg_ids mpeg_ids[] = { }; #define MPEGDEF_COUNT (sizeof(mpeg_ids)/sizeof(mpeg_ids[0])) + static const char *control_values_srate[] = { - [PVR2_CVAL_SRATE_48] = "48KHz", - [PVR2_CVAL_SRATE_44_1] = "44.1KHz", + [V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100] = "44.1 kHz", + [V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000] = "48 kHz", + [V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000] = "32 kHz", }; - static const char *control_values_input[] = { [PVR2_CVAL_INPUT_TV] = "television", /*xawtv needs this name*/ [PVR2_CVAL_INPUT_RADIO] = "radio", @@ -730,9 +731,9 @@ static const struct pvr2_ctl_info control_defs[] = { DEFINT(200,625), },{ .v4l_id = V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, - .desc = "Sample rate", + .default_value = V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000, + .desc = "Audio Sampling Frequency", .name = "srate", - .default_value = PVR2_CVAL_SRATE_48, DEFREF(srate), DEFENUM(control_values_srate), },{ @@ -2264,17 +2265,17 @@ static int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) } if (hdw->std_dirty || -#if 0 /* Don't toggle encoder for now - seems to work better this way */ hdw->enc_stale || hdw->srate_dirty || hdw->res_ver_dirty || hdw->res_hor_dirty || -#endif 0) { /* If any of this changes, then the encoder needs to be reconfigured, and we need to reset the stream. */ stale_subsys_mask |= (1<<PVR2_SUBSYS_B_ENC_CFG); +#if 0 /* Don't toggle encoder for now - seems to work better this way */ stale_subsys_mask |= hdw->subsys_stream_mask; +#endif } if (hdw->srate_dirty) { |