mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
Merge pull request #24178 from dmatveev:dm/streaming_queue
G-API: Introduce a Queue Source #24178 - Added a new IStreamSource class: in fact, a wrapper over a concurrent queue; - Added minimal example on how it can be used; - Extended IStreamSource with optional "halt" interface to break the blocking calls in the emitter threads when required to stop. - Introduced a QueueInput class which allows to pass the whole graph's input vector at once. In fact it is a thin wrapper atop of individual Queue Sources. There is a hidden trap found with our type system as described in https://github.com/orgs/g-api-org/discussions/2 While it works even in this form, it should be addressed somewhere in the 5.0 timeframe. ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
@@ -141,8 +141,10 @@ namespace detail
|
||||
template<typename U> struct GTypeOf<std::vector<U> > { using type = cv::GArray<U>; };
|
||||
template<typename U> struct GTypeOf { using type = cv::GOpaque<U>;};
|
||||
template<> struct GTypeOf<cv::MediaFrame> { using type = cv::GFrame; };
|
||||
// FIXME: This is not quite correct since IStreamSource may produce not only Mat but also Scalar
|
||||
// and vector data. TODO: Extend the type dispatching on these types too.
|
||||
|
||||
// FIXME: This is not quite correct since IStreamSource may
|
||||
// produce not only Mat but also MediaFrame, Scalar and vector
|
||||
// data. TODO: Extend the type dispatching on these types too.
|
||||
template<> struct GTypeOf<cv::gapi::wip::IStreamSource::Ptr> { using type = cv::GMat;};
|
||||
template<class T> using g_type_of_t = typename GTypeOf<T>::type;
|
||||
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
// This file is part of OpenCV project.
|
||||
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
||||
// of this distribution and at http://opencv.org/license.html.
|
||||
//
|
||||
// Copyright (C) 2023 Intel Corporation
|
||||
|
||||
#ifndef OPENCV_GAPI_STREAMING_QUEUE_SOURCE_HPP
|
||||
#define OPENCV_GAPI_STREAMING_QUEUE_SOURCE_HPP
|
||||
|
||||
#include <memory> // shared_ptr
|
||||
#include <type_traits> // is_base_of
|
||||
|
||||
#include <opencv2/gapi/garg.hpp> // GRunArgs
|
||||
#include <opencv2/gapi/gmetaarg.hpp> // GMetaArg + all descr_of
|
||||
#include <opencv2/gapi/streaming/source.hpp> // IStreamSource
|
||||
|
||||
namespace cv {
|
||||
namespace gapi {
|
||||
namespace wip {
|
||||
struct Data; // fwd-declare to avoid circular? header dependencies
|
||||
|
||||
class GAPI_EXPORTS QueueSourceBase: public cv::gapi::wip::IStreamSource {
|
||||
class Priv;
|
||||
std::shared_ptr<Priv> m_priv;
|
||||
// FIXME: Need to understand how it works with IStreamSource's shared_from_this
|
||||
// Can we avoid having too many shared_ptrs here?
|
||||
|
||||
public:
|
||||
explicit QueueSourceBase(const cv::GMetaArg &m);
|
||||
void push(Data &&data);
|
||||
virtual bool pull(Data &data) override;
|
||||
virtual void halt() override;
|
||||
virtual GMetaArg descr_of() const override;
|
||||
virtual ~QueueSourceBase() = default;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Queued streaming pipeline source.
|
||||
*
|
||||
*/
|
||||
template<class T>
|
||||
class QueueSource final: public QueueSourceBase
|
||||
{
|
||||
public:
|
||||
using Meta = decltype(cv::descr_of(T{}));
|
||||
explicit QueueSource(Meta m) : QueueSourceBase(GMetaArg{m}) {
|
||||
}
|
||||
void push(T t) {
|
||||
QueueSourceBase::push(Data{t});
|
||||
}
|
||||
};
|
||||
|
||||
class GAPI_EXPORTS QueueInput {
|
||||
std::vector<std::shared_ptr<QueueSourceBase> > m_sources;
|
||||
|
||||
public:
|
||||
explicit QueueInput(const cv::GMetaArgs &args);
|
||||
|
||||
void push(cv::GRunArgs &&ins);
|
||||
operator cv::GRunArgs();
|
||||
};
|
||||
|
||||
} // namespace wip
|
||||
} // namespace gapi
|
||||
} // namespace cv
|
||||
|
||||
#endif // OPENCV_GAPI_STREAMING_SOURCE_HPP
|
||||
@@ -16,7 +16,7 @@
|
||||
namespace cv {
|
||||
namespace gapi {
|
||||
namespace wip {
|
||||
struct Data; // "forward-declaration" of GRunArg
|
||||
struct Data; // forward-declaration of Data to avoid circular dependencies
|
||||
|
||||
/**
|
||||
* @brief Abstract streaming pipeline source.
|
||||
@@ -43,6 +43,11 @@ public:
|
||||
Ptr ptr() { return shared_from_this(); }
|
||||
virtual bool pull(Data &data) = 0;
|
||||
virtual GMetaArg descr_of() const = 0;
|
||||
virtual void halt() {
|
||||
// Do nothing by default to maintain compatibility with the existing sources...
|
||||
// In fact needs to be decorated atop of the child classes to maintain the behavior
|
||||
// FIXME: Make it mandatory in OpenCV 5.0
|
||||
};
|
||||
virtual ~IStreamSource() = default;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user