From patchwork Fri Jun 19 05:41:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4090 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5A0E060AF2 for ; Fri, 19 Jun 2020 07:41:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="uW6h0MdB"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:e972:d773:e99a:4f79]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B3000556; Fri, 19 Jun 2020 07:41:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592545316; bh=H/ZXtk9Q6IOQXuUmU2vYulaC9dDGP7RKuMI30+7YygM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uW6h0MdB0/JDzMk6pbnVJQ1fHtubi1siilWpZt0mzn38zmLW88h6nKmxUcyfSHwNd XmxLTuF6Hap7Hgv4pZlOVKlnb8laZ0yAYD6Dv73TRjRC5UKY50HRHpTgot1PKqBFjv 1P5v9qedzcpQcUmCYzZKCxR6QGdSPiY9nfDpm1Es= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Jun 2020 14:41:16 +0900 Message-Id: <20200619054123.19052-11-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619054123.19052-1-paul.elder@ideasonboard.com> References: <20200619054123.19052-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 10/17] v4l2: v4l2_camera_proxy: noop if streamon when stream is already on X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 05:41:57 -0000 If VIDIOC_STREMAON is called when the stream is already on, do a noop. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- New in v2: (split from "v4l2: v4l2_camera: Add isRunning()") --- src/v4l2/v4l2_camera_proxy.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 63c6a2c..4d37662 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -616,6 +616,9 @@ int V4L2CameraProxy::vidioc_streamon(V4L2CameraFile *cf, int *arg) { LOG(V4L2Compat, Debug) << "Servicing vidioc_streamon fd = " << cf->efd(); + if (vcam_->isRunning()) + return 0; + int ret = lock(cf); if (ret < 0) return ret;