| Message ID | 20220623232210.18742-7-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, Le vendredi 24 juin 2022 à 02:22 +0300, Laurent Pinchart a écrit : > To prepare for the addition of a completed requests queue, rename the > existing queued requests queue from requests_ to queuedRequests_. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Works for me. Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> regards, Nicolas > --- > src/gstreamer/gstlibcamerasrc.cpp | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp > index a1fab71d4f09..02fc913764f8 100644 > --- a/src/gstreamer/gstlibcamerasrc.cpp > +++ b/src/gstreamer/gstlibcamerasrc.cpp > @@ -108,7 +108,7 @@ struct GstLibcameraSrcState { > std::shared_ptr<Camera> cam_; > std::unique_ptr<CameraConfiguration> config_; > std::vector<GstPad *> srcpads_; > - std::queue<std::unique_ptr<RequestWrap>> requests_; > + std::queue<std::unique_ptr<RequestWrap>> queuedRequests_; > guint group_id_; > > void requestCompleted(Request *request); > @@ -155,8 +155,8 @@ GstLibcameraSrcState::requestCompleted(Request *request) > > GST_DEBUG_OBJECT(src_, "buffers are ready"); > > - std::unique_ptr<RequestWrap> wrap = std::move(requests_.front()); > - requests_.pop(); > + std::unique_ptr<RequestWrap> wrap = std::move(queuedRequests_.front()); > + queuedRequests_.pop(); > > g_return_if_fail(wrap->request_.get() == request); > > @@ -311,7 +311,7 @@ gst_libcamera_src_task_run(gpointer user_data) > GLibLocker lock(GST_OBJECT(self)); > GST_TRACE_OBJECT(self, "Requesting buffers"); > state->cam_->queueRequest(wrap->request_.get()); > - state->requests_.push(std::move(wrap)); > + state->queuedRequests_.push(std::move(wrap)); > > /* The RequestWrap will be deleted in the completion handler. */ > }
Hi Laurent, Thank you for the patch. On 6/24/22 04:52, Laurent Pinchart via libcamera-devel wrote: > To prepare for the addition of a completed requests queue, rename the > existing queued requests queue from requests_ to queuedRequests_. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> > --- > src/gstreamer/gstlibcamerasrc.cpp | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp > index a1fab71d4f09..02fc913764f8 100644 > --- a/src/gstreamer/gstlibcamerasrc.cpp > +++ b/src/gstreamer/gstlibcamerasrc.cpp > @@ -108,7 +108,7 @@ struct GstLibcameraSrcState { > std::shared_ptr<Camera> cam_; > std::unique_ptr<CameraConfiguration> config_; > std::vector<GstPad *> srcpads_; > - std::queue<std::unique_ptr<RequestWrap>> requests_; > + std::queue<std::unique_ptr<RequestWrap>> queuedRequests_; > guint group_id_; > > void requestCompleted(Request *request); > @@ -155,8 +155,8 @@ GstLibcameraSrcState::requestCompleted(Request *request) > > GST_DEBUG_OBJECT(src_, "buffers are ready"); > > - std::unique_ptr<RequestWrap> wrap = std::move(requests_.front()); > - requests_.pop(); > + std::unique_ptr<RequestWrap> wrap = std::move(queuedRequests_.front()); > + queuedRequests_.pop(); > > g_return_if_fail(wrap->request_.get() == request); > > @@ -311,7 +311,7 @@ gst_libcamera_src_task_run(gpointer user_data) > GLibLocker lock(GST_OBJECT(self)); > GST_TRACE_OBJECT(self, "Requesting buffers"); > state->cam_->queueRequest(wrap->request_.get()); > - state->requests_.push(std::move(wrap)); > + state->queuedRequests_.push(std::move(wrap)); > > /* The RequestWrap will be deleted in the completion handler. */ > }
diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp index a1fab71d4f09..02fc913764f8 100644 --- a/src/gstreamer/gstlibcamerasrc.cpp +++ b/src/gstreamer/gstlibcamerasrc.cpp @@ -108,7 +108,7 @@ struct GstLibcameraSrcState { std::shared_ptr<Camera> cam_; std::unique_ptr<CameraConfiguration> config_; std::vector<GstPad *> srcpads_; - std::queue<std::unique_ptr<RequestWrap>> requests_; + std::queue<std::unique_ptr<RequestWrap>> queuedRequests_; guint group_id_; void requestCompleted(Request *request); @@ -155,8 +155,8 @@ GstLibcameraSrcState::requestCompleted(Request *request) GST_DEBUG_OBJECT(src_, "buffers are ready"); - std::unique_ptr<RequestWrap> wrap = std::move(requests_.front()); - requests_.pop(); + std::unique_ptr<RequestWrap> wrap = std::move(queuedRequests_.front()); + queuedRequests_.pop(); g_return_if_fail(wrap->request_.get() == request); @@ -311,7 +311,7 @@ gst_libcamera_src_task_run(gpointer user_data) GLibLocker lock(GST_OBJECT(self)); GST_TRACE_OBJECT(self, "Requesting buffers"); state->cam_->queueRequest(wrap->request_.get()); - state->requests_.push(std::move(wrap)); + state->queuedRequests_.push(std::move(wrap)); /* The RequestWrap will be deleted in the completion handler. */ }
To prepare for the addition of a completed requests queue, rename the existing queued requests queue from requests_ to queuedRequests_. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/gstreamer/gstlibcamerasrc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)