From patchwork Wed Jan 29 03:31:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 2738 Return-Path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 401D5608BF for ; Wed, 29 Jan 2020 04:35:20 +0100 (CET) Received: from nicolas-tpx395.localdomain (unknown [IPv6:2002:c0de:c115:0:66fc:8b:2a38:8313]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: nicolas) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 79D9E28EA9F; Wed, 29 Jan 2020 03:35:19 +0000 (GMT) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Cc: Nicolas Dufresne Date: Tue, 28 Jan 2020 22:31:51 -0500 Message-Id: <20200129033210.278800-5-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200129033210.278800-1-nicolas@ndufresne.ca> References: <20200129033210.278800-1-nicolas@ndufresne.ca> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 04/23] gst: utils: Add a macro to use a GMutexLocker 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: Wed, 29 Jan 2020 03:35:20 -0000 From: Nicolas Dufresne The GMutexLocker uses GCC/CLANG C feature to implement a smart lock, that unlocks the mutex when the GMutexLocker goes out of scope. This could have been implemented in C++, but as this is already implemented I decided to just reuse it. This is particularly handy to avoid gotos in error handling cases and to prevent unbalanced locking. Signed-off-by: Nicolas Dufresne --- src/gstreamer/gstlibcamera-utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h index 4545512..528dc2c 100644 --- a/src/gstreamer/gstlibcamera-utils.h +++ b/src/gstreamer/gstlibcamera-utils.h @@ -13,6 +13,8 @@ #ifndef __GST_LIBCAMERA_UTILS_H_ +#define GST_OBJECT_LOCKER(obj) g_autoptr(GMutexLocker) locker = g_mutex_locker_new(GST_OBJECT_GET_LOCK(obj)) + GstCaps *gst_libcamera_stream_formats_to_caps(const libcamera::StreamFormats &formats); #endif /* __GST_LIBCAMERA_UTILS_H_ */