| Message ID | 1248453732-1966-1-git-send-email-eduardo.valentin@nokia.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Fri, 24 Jul 2009 16:53:03 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Fri, 24 Jul 2009 13:56:54 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MUO10-000357-7D; Fri, 24 Jul 2009 16:53:03 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753576AbZGXQwx (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Fri, 24 Jul 2009 12:52:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753579AbZGXQww (ORCPT <rfc822;linux-media-outgoing>); Fri, 24 Jul 2009 12:52:52 -0400 Received: from smtp.nokia.com ([192.100.122.230]:51931 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753571AbZGXQwu (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 24 Jul 2009 12:52:50 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6OGqYen025361; Fri, 24 Jul 2009 19:52:35 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 24 Jul 2009 19:52:40 +0300 Received: from vaebe101.NOE.Nokia.com ([10.160.244.11]) by vaebh104.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 24 Jul 2009 19:52:39 +0300 Received: from localhost.localdomain ([172.21.41.99]) by vaebe101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 24 Jul 2009 19:52:39 +0300 From: Eduardo Valentin <eduardo.valentin@nokia.com> To: "ext Hans Verkuil" <hverkuil@xs4all.nl>, "ext Mauro Carvalho Chehab" <mchehab@infradead.org> Cc: "ext Douglas Schilling Landgraf" <dougsland@gmail.com>, "Nurkkala Eero.An (EXT-Offcode/Oulu)" <ext-Eero.Nurkkala@nokia.com>, "Aaltonen Matti.J (Nokia-D/Tampere)" <matti.j.aaltonen@nokia.com>, Linux-Media <linux-media@vger.kernel.org>, Eduardo Valentin <eduardo.valentin@nokia.com> Subject: [PATCH 1/1] v4l2-ctl: Add G_MODULATOR before set/get frequency Date: Fri, 24 Jul 2009 19:42:12 +0300 Message-Id: <1248453732-1966-1-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.6.2.GIT X-OriginalArrivalTime: 24 Jul 2009 16:52:39.0571 (UTC) FILETIME=[27730630:01CA0C7F] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Eduardo Valentin
July 24, 2009, 4:42 p.m. UTC
As there can be modulator devices with get/set frequency
callbacks, this patch adds support to them in v4l2-ctl utility.
Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com>
---
v4l2-apps/util/v4l2-ctl.cpp | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
Comments
On Sat, Jul 25, 2009 at 04:10:53PM +0200, ext Hans Verkuil wrote: > On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > > As there can be modulator devices with get/set frequency > > callbacks, this patch adds support to them in v4l2-ctl utility. > > Thanks for this patch. > > I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR > to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my > v4l-dvb-strctrl tree. I've also improved the string print function so things > like newlines and carriage returns are printed as \r and \n. > > Can you mail me the output of 'v4l2-ctl --all -L' based on this updated > version of v4l2-ctl? I'd like to check whether everything is now reported > correctly. Yes sure. But there is also the RDS output for txsubchannel. This is missing now for G_MODULATOR. RDS is also missing in S_MODULATOR. S_MODULATOR is also confusing to me. The strings can be set only with one value? I though I could do something like: v4l2-ctl -d /dev/radio0 --set-modulator=rds,stereo > > Regards, > > Hans > > > > > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > > --- > > v4l2-apps/util/v4l2-ctl.cpp | 10 +++++++++- > > 1 files changed, 9 insertions(+), 1 deletions(-) > > > > diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp > > index fc9e459..ff74177 100644 > > --- a/v4l2-apps/util/v4l2-ctl.cpp > > +++ b/v4l2-apps/util/v4l2-ctl.cpp > > @@ -1962,12 +1962,16 @@ int main(int argc, char **argv) > > > > if (options[OptSetFreq]) { > > double fac = 16; > > + struct v4l2_modulator mt; > > > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > + vf.type = tuner.type; > > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > } > > vf.tuner = 0; > > - vf.type = tuner.type; > > vf.frequency = __u32(freq * fac); > > if (doioctl(fd, VIDIOC_S_FREQUENCY, &vf, > > "VIDIOC_S_FREQUENCY") == 0) > > @@ -2418,9 +2422,13 @@ set_vid_fmt_error: > > > > if (options[OptGetFreq]) { > > double fac = 16; > > + struct v4l2_modulator mt; > > > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > } > > vf.tuner = 0; > > if (doioctl(fd, VIDIOC_G_FREQUENCY, &vf, "VIDIOC_G_FREQUENCY") == 0) > > > > -- > Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom
On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > As there can be modulator devices with get/set frequency > callbacks, this patch adds support to them in v4l2-ctl utility. Thanks for this patch. I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my v4l-dvb-strctrl tree. I've also improved the string print function so things like newlines and carriage returns are printed as \r and \n. Can you mail me the output of 'v4l2-ctl --all -L' based on this updated version of v4l2-ctl? I'd like to check whether everything is now reported correctly. Regards, Hans > > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > --- > v4l2-apps/util/v4l2-ctl.cpp | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp > index fc9e459..ff74177 100644 > --- a/v4l2-apps/util/v4l2-ctl.cpp > +++ b/v4l2-apps/util/v4l2-ctl.cpp > @@ -1962,12 +1962,16 @@ int main(int argc, char **argv) > > if (options[OptSetFreq]) { > double fac = 16; > + struct v4l2_modulator mt; > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > + vf.type = tuner.type; > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > } > vf.tuner = 0; > - vf.type = tuner.type; > vf.frequency = __u32(freq * fac); > if (doioctl(fd, VIDIOC_S_FREQUENCY, &vf, > "VIDIOC_S_FREQUENCY") == 0) > @@ -2418,9 +2422,13 @@ set_vid_fmt_error: > > if (options[OptGetFreq]) { > double fac = 16; > + struct v4l2_modulator mt; > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > } > vf.tuner = 0; > if (doioctl(fd, VIDIOC_G_FREQUENCY, &vf, "VIDIOC_G_FREQUENCY") == 0)
On Sat, Jul 25, 2009 at 04:08:01PM +0200, Valentin Eduardo (Nokia-D/Helsinki) wrote: > On Sat, Jul 25, 2009 at 04:10:53PM +0200, ext Hans Verkuil wrote: > > On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > > > As there can be modulator devices with get/set frequency > > > callbacks, this patch adds support to them in v4l2-ctl utility. > > > > Thanks for this patch. > > > > I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR > > to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my > > v4l-dvb-strctrl tree. I've also improved the string print function so things > > like newlines and carriage returns are printed as \r and \n. > > > > Can you mail me the output of 'v4l2-ctl --all -L' based on this updated > > version of v4l2-ctl? I'd like to check whether everything is now reported > > correctly. > > Yes sure. But there is also the RDS output for txsubchannel. This is missing > now for G_MODULATOR. RDS is also missing in S_MODULATOR. S_MODULATOR is also > confusing to me. The strings can be set only with one value? I though I could > do something like: > > v4l2-ctl -d /dev/radio0 --set-modulator=rds,stereo Here is an output with you new version: / # v4l2-ctl -d /dev/radio0 --all -L Driver Info: Driver name : radio-si4713 Card type : Silicon Labs Si4713 Modulator Bus info : Driver version: 0 Capabilities : 0x00080800 RDS Output Modulator Audio output: 0 (FM Modulator Audio Out) Frequency: 1408000 (88.000000 MHz) Video Standard = 0x00000000 Modulator: Name : FM Modulator Capabilities : 62.5 Hz stereo rds Frequency range : 76.0 MHz - 108.0 MHz Subchannel modulation: stereo+rds User Controls mute (bool) : default=1 value=0 FM Radio Modulator Controls rds_program_id (int) : min=0 max=65535 step=1 default=0 value=0 rds_program_type (int) : min=0 max=31 step=1 default=0 value=0 rds_signal_deviation (int) : min=0 max=90000 step=10 default=200 value=200 flags=slider rds_ps_name (str) : min=0 max=97 value='Si4713 ' len=97 rds_radio_text (str) : min=0 max=385 value='Si4713 \r' len=385 audio_limiter_feature_enabled (bool) : default=1 value=1 audio_limiter_release_time (int) : min=250 max=102390 step=50 default=5010 value=5010 flags=slider audio_limiter_deviation (int) : min=0 max=90000 step=10 default=66250 value=66250 flags=slider audio_compression_feature_enabl (bool) : default=1 value=1 audio_compression_gain (int) : min=0 max=20 step=1 default=15 value=15 flags=slider audio_compression_threshold (int) : min=-40 max=0 step=1 default=-40 value=-40 flags=slider audio_compression_attack_time (int) : min=0 max=5000 step=500 default=0 value=0 flags=slider audio_compression_release_time (int) : min=100000 max=1000000 step=100000 default=1000000 value=1000000 flags=slider pilot_tone_feature_enabled (bool) : default=1 value=1 pilot_tone_deviation (int) : min=0 max=90000 step=10 default=6750 value=6750 flags=slider pilot_tone_frequency (int) : min=0 max=19000 step=1 default=19000 value=19000 flags=slider pre_emphasis_settings (menu) : min=0 max=2 default=1 value=1 tune_power_level (int) : min=0 max=120 step=1 default=88 value=88 flags=slider tune_antenna_capacitor (int) : min=0 max=191 step=1 default=0 value=109 flags=slider So far so good for G_MODULATOR and for String with escaped characters. I also tried S_MODULATOR. Looks good but there is a bug: else if (!strcmp(optarg, "stereo-rds")) txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; else if (!strcmp(optarg, "mono-rds")) txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; As you can see, you cannot properly set stereo-rds, it will keep it mono. Otherwise it is fine to me. BR, > > > > > Regards, > > > > Hans > > > > > > > > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > > > --- > > > v4l2-apps/util/v4l2-ctl.cpp | 10 +++++++++- > > > 1 files changed, 9 insertions(+), 1 deletions(-) > > > > > > diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp > > > index fc9e459..ff74177 100644 > > > --- a/v4l2-apps/util/v4l2-ctl.cpp > > > +++ b/v4l2-apps/util/v4l2-ctl.cpp > > > @@ -1962,12 +1962,16 @@ int main(int argc, char **argv) > > > > > > if (options[OptSetFreq]) { > > > double fac = 16; > > > + struct v4l2_modulator mt; > > > > > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > > > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > > > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > > + vf.type = tuner.type; > > > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > > > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > > } > > > vf.tuner = 0; > > > - vf.type = tuner.type; > > > vf.frequency = __u32(freq * fac); > > > if (doioctl(fd, VIDIOC_S_FREQUENCY, &vf, > > > "VIDIOC_S_FREQUENCY") == 0) > > > @@ -2418,9 +2422,13 @@ set_vid_fmt_error: > > > > > > if (options[OptGetFreq]) { > > > double fac = 16; > > > + struct v4l2_modulator mt; > > > > > > + memset(&mt, 0, sizeof(struct v4l2_modulator)); > > > if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { > > > fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > > + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { > > > + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; > > > } > > > vf.tuner = 0; > > > if (doioctl(fd, VIDIOC_G_FREQUENCY, &vf, "VIDIOC_G_FREQUENCY") == 0) > > > > > > > > -- > > Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom > > -- > Eduardo Valentin
On Saturday 25 July 2009 16:08:01 Eduardo Valentin wrote: > On Sat, Jul 25, 2009 at 04:10:53PM +0200, ext Hans Verkuil wrote: > > On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > > > As there can be modulator devices with get/set frequency > > > callbacks, this patch adds support to them in v4l2-ctl utility. > > > > Thanks for this patch. > > > > I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR > > to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my > > v4l-dvb-strctrl tree. I've also improved the string print function so things > > like newlines and carriage returns are printed as \r and \n. > > > > Can you mail me the output of 'v4l2-ctl --all -L' based on this updated > > version of v4l2-ctl? I'd like to check whether everything is now reported > > correctly. > > Yes sure. But there is also the RDS output for txsubchannel. This is missing > now for G_MODULATOR. RDS is also missing in S_MODULATOR. Added both. > S_MODULATOR is also > confusing to me. The strings can be set only with one value? I though I could > do something like: > > v4l2-ctl -d /dev/radio0 --set-modulator=rds,stereo The reason I did that is that txsubchans only supports specific flag combinations. So rather than having to make all sorts of verification code I decided to make these combinations explicit. Regards, Hans
On Sat, Jul 25, 2009 at 04:44:27PM +0200, ext Hans Verkuil wrote: > On Saturday 25 July 2009 16:23:51 Eduardo Valentin wrote: > > On Sat, Jul 25, 2009 at 04:08:01PM +0200, Valentin Eduardo (Nokia-D/Helsinki) wrote: > > > On Sat, Jul 25, 2009 at 04:10:53PM +0200, ext Hans Verkuil wrote: > > > > On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > > > > > As there can be modulator devices with get/set frequency > > > > > callbacks, this patch adds support to them in v4l2-ctl utility. > > > > > > > > Thanks for this patch. > > > > > > > > I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR > > > > to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my > > > > v4l-dvb-strctrl tree. I've also improved the string print function so things > > > > like newlines and carriage returns are printed as \r and \n. > > > > > > > > Can you mail me the output of 'v4l2-ctl --all -L' based on this updated > > > > version of v4l2-ctl? I'd like to check whether everything is now reported > > > > correctly. > > > > > > Yes sure. But there is also the RDS output for txsubchannel. This is missing > > > now for G_MODULATOR. RDS is also missing in S_MODULATOR. S_MODULATOR is also > > > confusing to me. The strings can be set only with one value? I though I could > > > do something like: > > > > > > v4l2-ctl -d /dev/radio0 --set-modulator=rds,stereo > > > > Here is an output with you new version: > > / # v4l2-ctl -d /dev/radio0 --all -L > > Driver Info: > > Driver name : radio-si4713 > > Card type : Silicon Labs Si4713 Modulator > > Bus info : > > Driver version: 0 > > Capabilities : 0x00080800 > > RDS Output > > Modulator > > Audio output: 0 (FM Modulator Audio Out) > > Frequency: 1408000 (88.000000 MHz) > > Video Standard = 0x00000000 > > Modulator: > > Name : FM Modulator > > Capabilities : 62.5 Hz stereo rds > > Frequency range : 76.0 MHz - 108.0 MHz > > Subchannel modulation: stereo+rds > > > > User Controls > > > > mute (bool) : default=1 value=0 > > > > FM Radio Modulator Controls > > > > rds_program_id (int) : min=0 max=65535 step=1 default=0 value=0 > > rds_program_type (int) : min=0 max=31 step=1 default=0 value=0 > > rds_signal_deviation (int) : min=0 max=90000 step=10 default=200 value=200 flags=slider > > rds_ps_name (str) : min=0 max=97 value='Si4713 ' len=97 > > rds_radio_text (str) : min=0 max=385 value='Si4713 \r' len=385 > > audio_limiter_feature_enabled (bool) : default=1 value=1 > > audio_limiter_release_time (int) : min=250 max=102390 step=50 default=5010 value=5010 flags=slider > > audio_limiter_deviation (int) : min=0 max=90000 step=10 default=66250 value=66250 flags=slider > > audio_compression_feature_enabl (bool) : default=1 value=1 > > audio_compression_gain (int) : min=0 max=20 step=1 default=15 value=15 flags=slider > > audio_compression_threshold (int) : min=-40 max=0 step=1 default=-40 value=-40 flags=slider > > audio_compression_attack_time (int) : min=0 max=5000 step=500 default=0 value=0 flags=slider > > audio_compression_release_time (int) : min=100000 max=1000000 step=100000 default=1000000 value=1000000 flags=slider > > pilot_tone_feature_enabled (bool) : default=1 value=1 > > pilot_tone_deviation (int) : min=0 max=90000 step=10 default=6750 value=6750 flags=slider > > pilot_tone_frequency (int) : min=0 max=19000 step=1 default=19000 value=19000 flags=slider > > pre_emphasis_settings (menu) : min=0 max=2 default=1 value=1 > > tune_power_level (int) : min=0 max=120 step=1 default=88 value=88 flags=slider > > tune_antenna_capacitor (int) : min=0 max=191 step=1 default=0 value=109 flags=slider > > > > So far so good for G_MODULATOR and for String with escaped characters. > > I also tried S_MODULATOR. Looks good but there is a bug: > > else if (!strcmp(optarg, "stereo-rds")) > > txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; > > else if (!strcmp(optarg, "mono-rds")) > > txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; > > > > As you can see, you cannot properly set stereo-rds, it will keep it mono. Otherwise it is fine to me. > > Oops, fixed. I've also removed the 'len=' part for strings since that does not > add anything useful. Right. I will update si4713.txt file with latest output and send with v11. > > Hans > > -- > Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Saturday 25 July 2009 16:23:51 Eduardo Valentin wrote: > On Sat, Jul 25, 2009 at 04:08:01PM +0200, Valentin Eduardo (Nokia-D/Helsinki) wrote: > > On Sat, Jul 25, 2009 at 04:10:53PM +0200, ext Hans Verkuil wrote: > > > On Friday 24 July 2009 18:42:12 Eduardo Valentin wrote: > > > > As there can be modulator devices with get/set frequency > > > > callbacks, this patch adds support to them in v4l2-ctl utility. > > > > > > Thanks for this patch. > > > > > > I've implemented it somewhat differently (using the new V4L2_CAP_MODULATOR > > > to decide whether to call G_TUNER or G_MODULATOR) and pushed it to my > > > v4l-dvb-strctrl tree. I've also improved the string print function so things > > > like newlines and carriage returns are printed as \r and \n. > > > > > > Can you mail me the output of 'v4l2-ctl --all -L' based on this updated > > > version of v4l2-ctl? I'd like to check whether everything is now reported > > > correctly. > > > > Yes sure. But there is also the RDS output for txsubchannel. This is missing > > now for G_MODULATOR. RDS is also missing in S_MODULATOR. S_MODULATOR is also > > confusing to me. The strings can be set only with one value? I though I could > > do something like: > > > > v4l2-ctl -d /dev/radio0 --set-modulator=rds,stereo > > Here is an output with you new version: > / # v4l2-ctl -d /dev/radio0 --all -L > Driver Info: > Driver name : radio-si4713 > Card type : Silicon Labs Si4713 Modulator > Bus info : > Driver version: 0 > Capabilities : 0x00080800 > RDS Output > Modulator > Audio output: 0 (FM Modulator Audio Out) > Frequency: 1408000 (88.000000 MHz) > Video Standard = 0x00000000 > Modulator: > Name : FM Modulator > Capabilities : 62.5 Hz stereo rds > Frequency range : 76.0 MHz - 108.0 MHz > Subchannel modulation: stereo+rds > > User Controls > > mute (bool) : default=1 value=0 > > FM Radio Modulator Controls > > rds_program_id (int) : min=0 max=65535 step=1 default=0 value=0 > rds_program_type (int) : min=0 max=31 step=1 default=0 value=0 > rds_signal_deviation (int) : min=0 max=90000 step=10 default=200 value=200 flags=slider > rds_ps_name (str) : min=0 max=97 value='Si4713 ' len=97 > rds_radio_text (str) : min=0 max=385 value='Si4713 \r' len=385 > audio_limiter_feature_enabled (bool) : default=1 value=1 > audio_limiter_release_time (int) : min=250 max=102390 step=50 default=5010 value=5010 flags=slider > audio_limiter_deviation (int) : min=0 max=90000 step=10 default=66250 value=66250 flags=slider > audio_compression_feature_enabl (bool) : default=1 value=1 > audio_compression_gain (int) : min=0 max=20 step=1 default=15 value=15 flags=slider > audio_compression_threshold (int) : min=-40 max=0 step=1 default=-40 value=-40 flags=slider > audio_compression_attack_time (int) : min=0 max=5000 step=500 default=0 value=0 flags=slider > audio_compression_release_time (int) : min=100000 max=1000000 step=100000 default=1000000 value=1000000 flags=slider > pilot_tone_feature_enabled (bool) : default=1 value=1 > pilot_tone_deviation (int) : min=0 max=90000 step=10 default=6750 value=6750 flags=slider > pilot_tone_frequency (int) : min=0 max=19000 step=1 default=19000 value=19000 flags=slider > pre_emphasis_settings (menu) : min=0 max=2 default=1 value=1 > tune_power_level (int) : min=0 max=120 step=1 default=88 value=88 flags=slider > tune_antenna_capacitor (int) : min=0 max=191 step=1 default=0 value=109 flags=slider > > So far so good for G_MODULATOR and for String with escaped characters. > I also tried S_MODULATOR. Looks good but there is a bug: > else if (!strcmp(optarg, "stereo-rds")) > txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; > else if (!strcmp(optarg, "mono-rds")) > txsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_RDS; > > As you can see, you cannot properly set stereo-rds, it will keep it mono. Otherwise it is fine to me. Oops, fixed. I've also removed the 'len=' part for strings since that does not add anything useful. Hans
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index fc9e459..ff74177 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -1962,12 +1962,16 @@ int main(int argc, char **argv) if (options[OptSetFreq]) { double fac = 16; + struct v4l2_modulator mt; + memset(&mt, 0, sizeof(struct v4l2_modulator)); if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + vf.type = tuner.type; + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; } vf.tuner = 0; - vf.type = tuner.type; vf.frequency = __u32(freq * fac); if (doioctl(fd, VIDIOC_S_FREQUENCY, &vf, "VIDIOC_S_FREQUENCY") == 0) @@ -2418,9 +2422,13 @@ set_vid_fmt_error: if (options[OptGetFreq]) { double fac = 16; + struct v4l2_modulator mt; + memset(&mt, 0, sizeof(struct v4l2_modulator)); if (doioctl(fd, VIDIOC_G_TUNER, &tuner, "VIDIOC_G_TUNER") == 0) { fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + } else if (doioctl(fd, VIDIOC_G_MODULATOR, &mt, "VIDIOC_G_MODULATOR") == 0) { + fac = (mt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; } vf.tuner = 0; if (doioctl(fd, VIDIOC_G_FREQUENCY, &vf, "VIDIOC_G_FREQUENCY") == 0)