From patchwork Tue Nov 26 23:36:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2360 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 84CBB61C97 for ; Wed, 27 Nov 2019 00:39:33 +0100 (CET) X-Halon-ID: fece51f7-10a5-11ea-a0b9-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p54ac5865.dip0.t-ipconnect.de [84.172.88.101]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id fece51f7-10a5-11ea-a0b9-005056917f90; Wed, 27 Nov 2019 00:39:32 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Wed, 27 Nov 2019 00:36:02 +0100 Message-Id: <20191126233620.1695316-13-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126233620.1695316-1-niklas.soderlund@ragnatech.se> References: <20191126233620.1695316-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 12/30] libcamera: v4l2_videodevice: Remove assertion involving BufferPool 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: Tue, 26 Nov 2019 23:39:33 -0000 The BufferPool class will be removed when the buffer logic is reworked. During the transition some functions will be shared between the new and old buffer code and removing this assert allows sharing of the dequeueBuffer() function. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- src/libcamera/v4l2_videodevice.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 7b6fa5347ef320f8..644e4545a2f33b2e 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1100,7 +1100,6 @@ Buffer *V4L2VideoDevice::dequeueBuffer() return nullptr; } - ASSERT(buf.index < bufferPool_->count()); LOG(V4L2, Debug) << "Buffer " << buf.index << " is available"; auto it = queuedBuffers_.find(buf.index);