From patchwork Mon Jun 22 16:21:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 31799 X-Patchwork-Delegate: dougsland@redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5MGSTZo027609 for ; Mon, 22 Jun 2009 16:28:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755538AbZFVQ21 (ORCPT ); Mon, 22 Jun 2009 12:28:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755157AbZFVQ21 (ORCPT ); Mon, 22 Jun 2009 12:28:27 -0400 Received: from smtp.nokia.com ([192.100.122.233]:58538 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755538AbZFVQ2Z (ORCPT ); Mon, 22 Jun 2009 12:28:25 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n5MGRrCc025528; Mon, 22 Jun 2009 19:27:53 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 22 Jun 2009 19:27:55 +0300 Received: from vaebe101.NOE.Nokia.com ([10.160.244.11]) by vaebh104.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 22 Jun 2009 19:27:55 +0300 Received: from localhost.localdomain ([172.21.41.99]) by vaebe101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 22 Jun 2009 19:27:54 +0300 From: Eduardo Valentin To: "ext Hans Verkuil" , "ext Mauro Carvalho Chehab" Cc: "Nurkkala Eero.An (EXT-Offcode/Oulu)" , "Aaltonen Matti.J (Nokia-D/Tampere)" , "ext Douglas Schilling Landgraf" , Linux-Media , Eduardo Valentin Subject: [PATCHv9 4/9] v4l2-ctl: Add support for FM TX controls Date: Mon, 22 Jun 2009 19:21:31 +0300 Message-Id: <1245687696-6730-5-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.6.2.GIT In-Reply-To: <1245687696-6730-4-git-send-email-eduardo.valentin@nokia.com> References: <1245687696-6730-1-git-send-email-eduardo.valentin@nokia.com> <1245687696-6730-2-git-send-email-eduardo.valentin@nokia.com> <1245687696-6730-3-git-send-email-eduardo.valentin@nokia.com> <1245687696-6730-4-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 22 Jun 2009 16:27:54.0377 (UTC) FILETIME=[64FC6790:01C9F356] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This patch adds simple support for FM TX extended controls on v4l2-ctl utility. Signed-off-by: Eduardo Valentin --- v4l2-apps/util/v4l2-ctl.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 7a4cf0e..0399eb1 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -148,6 +148,7 @@ typedef std::vector ctrl_list; static ctrl_list user_ctrls; static ctrl_list mpeg_ctrls; static ctrl_list camera_ctrls; +static ctrl_list fm_tx_ctrls; typedef std::map ctrl_strmap; static ctrl_strmap ctrl_str2id; @@ -2181,6 +2182,8 @@ set_vid_fmt_error: mpeg_ctrls.push_back(ctrl); else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_CAMERA) camera_ctrls.push_back(ctrl); + else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_FM_TX) + fm_tx_ctrls.push_back(ctrl); else user_ctrls.push_back(ctrl); } @@ -2227,6 +2230,22 @@ set_vid_fmt_error: } } } + if (fm_tx_ctrls.size()) { + ctrls.ctrl_class = V4L2_CTRL_CLASS_FM_TX; + ctrls.count = fm_tx_ctrls.size(); + ctrls.controls = &fm_tx_ctrls[0]; + if (doioctl(fd, VIDIOC_S_EXT_CTRLS, &ctrls, "VIDIOC_S_EXT_CTRLS")) { + if (ctrls.error_idx >= ctrls.count) { + fprintf(stderr, "Error setting FM Modulator controls: %s\n", + strerror(errno)); + } + else { + fprintf(stderr, "%s: %s\n", + ctrl_id2str[fm_tx_ctrls[ctrls.error_idx].id].c_str(), + strerror(errno)); + } + } + } } /* Get options */ @@ -2444,6 +2463,7 @@ set_vid_fmt_error: mpeg_ctrls.clear(); camera_ctrls.clear(); user_ctrls.clear(); + fm_tx_ctrls.clear(); for (ctrl_get_list::iterator iter = get_ctrls.begin(); iter != get_ctrls.end(); ++iter) { struct v4l2_ext_control ctrl = { 0 }; @@ -2458,6 +2478,8 @@ set_vid_fmt_error: mpeg_ctrls.push_back(ctrl); else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_CAMERA) camera_ctrls.push_back(ctrl); + else if (V4L2_CTRL_ID2CLASS(ctrl.id) == V4L2_CTRL_CLASS_FM_TX) + fm_tx_ctrls.push_back(ctrl); else user_ctrls.push_back(ctrl); } @@ -2496,6 +2518,20 @@ set_vid_fmt_error: printf("%s: %d\n", ctrl_id2str[ctrl.id].c_str(), ctrl.value); } } + if (fm_tx_ctrls.size()) { + ctrls.ctrl_class = V4L2_CTRL_CLASS_FM_TX; + ctrls.count = fm_tx_ctrls.size(); + ctrls.controls = &fm_tx_ctrls[0]; + doioctl(fd, VIDIOC_G_EXT_CTRLS, &ctrls, "VIDIOC_G_EXT_CTRLS"); + for (unsigned i = 0; i < fm_tx_ctrls.size(); i++) { + struct v4l2_ext_control ctrl = fm_tx_ctrls[i]; + + if (ctrl_id2type[ctrl.id] == V4L2_CTRL_TYPE_STRING) + printf("%s: '%s'\n", ctrl_id2str[ctrl.id].c_str(), ctrl.string); + else + printf("%s: %d\n", ctrl_id2str[ctrl.id].c_str(), ctrl.value); + } + } } if (options[OptGetTuner]) {