From patchwork Mon Feb 13 09:33:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9569049 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7EECA6045D for ; Mon, 13 Feb 2017 09:33:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E47623E64 for ; Mon, 13 Feb 2017 09:33:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 612AB27F85; Mon, 13 Feb 2017 09:33:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A747323E64 for ; Mon, 13 Feb 2017 09:33:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbdBMJdd (ORCPT ); Mon, 13 Feb 2017 04:33:33 -0500 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:41785 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbdBMJdd (ORCPT ); Mon, 13 Feb 2017 04:33:33 -0500 Received: from lupine.hi.4.pengutronix.de ([10.1.0.115] helo=lupine.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1cdD0l-0006Pl-V2; Mon, 13 Feb 2017 10:33:31 +0100 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Hans Verkuil , Steve Longerbeam , Sakari Ailus , Philipp Zabel Subject: [PATCH v2 1/4] media-ctl: add pad support to set/get_frame_interval Date: Mon, 13 Feb 2017 10:33:25 +0100 Message-Id: <1486978408-28580-1-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.1.4 X-SA-Exim-Connect-IP: 10.1.0.115 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This allows to set and get the frame interval on pads other than pad 0. Signed-off-by: Philipp Zabel Acked-by: Sakari Ailus --- Changes since v1: - use "pad %s/%u" instead of "entity %s pad %u" in debug message --- utils/media-ctl/libv4l2subdev.c | 24 ++++++++++++++---------- utils/media-ctl/v4l2subdev.h | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c index 3dcf943..2f2ac8e 100644 --- a/utils/media-ctl/libv4l2subdev.c +++ b/utils/media-ctl/libv4l2subdev.c @@ -262,7 +262,8 @@ int v4l2_subdev_set_dv_timings(struct media_entity *entity, } int v4l2_subdev_get_frame_interval(struct media_entity *entity, - struct v4l2_fract *interval) + struct v4l2_fract *interval, + unsigned int pad) { struct v4l2_subdev_frame_interval ival; int ret; @@ -272,6 +273,7 @@ int v4l2_subdev_get_frame_interval(struct media_entity *entity, return ret; memset(&ival, 0, sizeof(ival)); + ival.pad = pad; ret = ioctl(entity->fd, VIDIOC_SUBDEV_G_FRAME_INTERVAL, &ival); if (ret < 0) @@ -282,7 +284,8 @@ int v4l2_subdev_get_frame_interval(struct media_entity *entity, } int v4l2_subdev_set_frame_interval(struct media_entity *entity, - struct v4l2_fract *interval) + struct v4l2_fract *interval, + unsigned int pad) { struct v4l2_subdev_frame_interval ival; int ret; @@ -292,6 +295,7 @@ int v4l2_subdev_set_frame_interval(struct media_entity *entity, return ret; memset(&ival, 0, sizeof(ival)); + ival.pad = pad; ival.interval = *interval; ret = ioctl(entity->fd, VIDIOC_SUBDEV_S_FRAME_INTERVAL, &ival); @@ -617,7 +621,7 @@ static int set_selection(struct media_pad *pad, unsigned int target, return 0; } -static int set_frame_interval(struct media_entity *entity, +static int set_frame_interval(struct media_pad *pad, struct v4l2_fract *interval) { int ret; @@ -625,20 +629,20 @@ static int set_frame_interval(struct media_entity *entity, if (interval->numerator == 0) return 0; - media_dbg(entity->media, - "Setting up frame interval %u/%u on entity %s\n", + media_dbg(pad->entity->media, + "Setting up frame interval %u/%u on pad %s/%u\n", interval->numerator, interval->denominator, - entity->info.name); + pad->entity->info.name, pad->index); - ret = v4l2_subdev_set_frame_interval(entity, interval); + ret = v4l2_subdev_set_frame_interval(pad->entity, interval, pad->index); if (ret < 0) { - media_dbg(entity->media, + media_dbg(pad->entity->media, "Unable to set frame interval: %s (%d)", strerror(-ret), ret); return ret; } - media_dbg(entity->media, "Frame interval set: %u/%u\n", + media_dbg(pad->entity->media, "Frame interval set: %u/%u\n", interval->numerator, interval->denominator); return 0; @@ -685,7 +689,7 @@ static int v4l2_subdev_parse_setup_format(struct media_device *media, return ret; } - ret = set_frame_interval(pad->entity, &interval); + ret = set_frame_interval(pad, &interval); if (ret < 0) return ret; diff --git a/utils/media-ctl/v4l2subdev.h b/utils/media-ctl/v4l2subdev.h index 9c8fee8..413094d 100644 --- a/utils/media-ctl/v4l2subdev.h +++ b/utils/media-ctl/v4l2subdev.h @@ -200,7 +200,7 @@ int v4l2_subdev_set_dv_timings(struct media_entity *entity, */ int v4l2_subdev_get_frame_interval(struct media_entity *entity, - struct v4l2_fract *interval); + struct v4l2_fract *interval, unsigned int pad); /** * @brief Set the frame interval on a sub-device. @@ -217,7 +217,7 @@ int v4l2_subdev_get_frame_interval(struct media_entity *entity, * @return 0 on success, or a negative error code on failure. */ int v4l2_subdev_set_frame_interval(struct media_entity *entity, - struct v4l2_fract *interval); + struct v4l2_fract *interval, unsigned int pad); /** * @brief Parse a string and apply format, crop and frame interval settings.