mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19107 from TolyaTalamanov:at/hotfix-gstreamingbackend

Browse Source 
[G-API] GStreamingBackend hotfix

* GStreamingBackend hotfix

* Fix comments to review

* Add strides

* Removew while loop inside actor
This commit is contained in:
Anatoliy Talamanov 2020-12-15 21:05:26 +03:00 committed by GitHub
parent fcdd69fd97
commit 50baf76cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gapi/include/opencv2/gapi/streaming/format.hpp
View File

@ -13,8 +13,7 @@ namespace cv {
namespace gapi { namespace gapi {
namespace streaming { namespace streaming {
cv::gapi::GKernelPackage kernels(); GAPI_EXPORTS cv::gapi::GKernelPackage kernels();
cv::gapi::GBackend backend();
// FIXME: Make a generic kernel // FIXME: Make a generic kernel
G_API_OP(GCopy, <GFrame(GFrame)>, "org.opencv.streaming.copy") G_API_OP(GCopy, <GFrame(GFrame)>, "org.opencv.streaming.copy")

29
modules/gapi/src/backends/common/gbackend.hpp
View File

@ -58,6 +58,35 @@ namespace gimpl {
struct Data; struct Data;
struct RcDesc; struct RcDesc;
struct GAPI_EXPORTS RMatMediaAdapterBGR final: public cv::RMat::Adapter
{
explicit RMatMediaAdapterBGR(const cv::MediaFrame& frame) : m_frame(frame) { };
virtual cv::RMat::View access(cv::RMat::Access a) override
{
auto view = m_frame.access(a == cv::RMat::Access::W ? cv::MediaFrame::Access::W
: cv::MediaFrame::Access::R);
auto ptr = reinterpret_cast<uchar*>(view.ptr[0]);
auto stride = view.stride[0];
std::shared_ptr<cv::MediaFrame::View> view_ptr =
std::make_shared<cv::MediaFrame::View>(std::move(view));
auto callback = [view_ptr]() mutable { view_ptr.reset(); };
return cv::RMat::View(desc(), ptr, stride, callback);
}
virtual cv::GMatDesc desc() const override
{
const auto& desc = m_frame.desc();
GAPI_Assert(desc.fmt == cv::MediaFormat::BGR);
return cv::GMatDesc{CV_8U, 3, desc.size};
}
cv::MediaFrame m_frame;
};
namespace magazine { namespace magazine {
template<typename... Ts> struct Class template<typename... Ts> struct Class
{ {

82
modules/gapi/src/backends/streaming/gstreamingbackend.cpp
View File

@ -55,6 +55,7 @@ class GStreamingIntrinExecutable final: public cv::gimpl::GIslandExecutable
public: public:
GStreamingIntrinExecutable(const ade::Graph &, GStreamingIntrinExecutable(const ade::Graph &,
const cv::GCompileArgs &,
const std::vector<ade::NodeHandle> &); const std::vector<ade::NodeHandle> &);
const ade::Graph& m_g; const ade::Graph& m_g;
@ -80,10 +81,10 @@ class GStreamingBackendImpl final: public cv::gapi::GBackend::Priv
} }
virtual EPtr compile(const ade::Graph &graph, virtual EPtr compile(const ade::Graph &graph,
const cv::GCompileArgs &, const cv::GCompileArgs &args,
const std::vector<ade::NodeHandle> &nodes) const override const std::vector<ade::NodeHandle> &nodes) const override
{ {
return EPtr{new GStreamingIntrinExecutable(graph, nodes)}; return EPtr{new GStreamingIntrinExecutable(graph, args, nodes)};
} }
virtual bool controlsMerge() const override virtual bool controlsMerge() const override
@ -101,6 +102,7 @@ class GStreamingBackendImpl final: public cv::gapi::GBackend::Priv
}; };
GStreamingIntrinExecutable::GStreamingIntrinExecutable(const ade::Graph& g, GStreamingIntrinExecutable::GStreamingIntrinExecutable(const ade::Graph& g,
const cv::GCompileArgs& args,
const std::vector<ade::NodeHandle>& nodes) const std::vector<ade::NodeHandle>& nodes)
: m_g(g), m_gm(m_g) : m_g(g), m_gm(m_g)
{ {
@ -114,7 +116,7 @@ GStreamingIntrinExecutable::GStreamingIntrinExecutable(const ade::Graph& g,
GAPI_Assert(it != nodes.end() && "No operators found for this island?!"); GAPI_Assert(it != nodes.end() && "No operators found for this island?!");
ConstStreamingGraph cag(m_g); ConstStreamingGraph cag(m_g);
m_actor = cag.metadata(*it).get<StreamingCreateFunction>().createActorFunction(); m_actor = cag.metadata(*it).get<StreamingCreateFunction>().createActorFunction(args);
// Ensure this the only op in the graph // Ensure this the only op in the graph
if (std::any_of(it+1, nodes.end(), is_op)) if (std::any_of(it+1, nodes.end(), is_op))
@ -141,63 +143,57 @@ cv::gapi::GKernelPackage cv::gapi::streaming::kernels()
void cv::gimpl::Copy::Actor::run(cv::gimpl::GIslandExecutable::IInput &in, void cv::gimpl::Copy::Actor::run(cv::gimpl::GIslandExecutable::IInput &in,
cv::gimpl::GIslandExecutable::IOutput &out) cv::gimpl::GIslandExecutable::IOutput &out)
{ {
while (true) const auto in_msg = in.get();
if (cv::util::holds_alternative<cv::gimpl::EndOfStream>(in_msg))
{ {
const auto in_msg = in.get(); out.post(cv::gimpl::EndOfStream{});
if (cv::util::holds_alternative<cv::gimpl::EndOfStream>(in_msg)) return;
{
out.post(cv::gimpl::EndOfStream{});
return;
}
const cv::GRunArgs &in_args = cv::util::get<cv::GRunArgs>(in_msg);
GAPI_Assert(in_args.size() == 1u);
cv::GRunArgP out_arg = out.get(0);
*cv::util::get<cv::MediaFrame*>(out_arg) = cv::util::get<cv::MediaFrame>(in_args[0]);
out.post(std::move(out_arg));
} }
const cv::GRunArgs &in_args = cv::util::get<cv::GRunArgs>(in_msg);
GAPI_Assert(in_args.size() == 1u);
cv::GRunArgP out_arg = out.get(0);
*cv::util::get<cv::MediaFrame*>(out_arg) = cv::util::get<cv::MediaFrame>(in_args[0]);
out.post(std::move(out_arg));
} }
void cv::gimpl::BGR::Actor::run(cv::gimpl::GIslandExecutable::IInput &in, void cv::gimpl::BGR::Actor::run(cv::gimpl::GIslandExecutable::IInput &in,
cv::gimpl::GIslandExecutable::IOutput &out) cv::gimpl::GIslandExecutable::IOutput &out)
{ {
while (true) const auto in_msg = in.get();
if (cv::util::holds_alternative<cv::gimpl::EndOfStream>(in_msg))
{ {
const auto in_msg = in.get(); out.post(cv::gimpl::EndOfStream{});
if (cv::util::holds_alternative<cv::gimpl::EndOfStream>(in_msg)) return;
{ }
out.post(cv::gimpl::EndOfStream{});
return;
}
const cv::GRunArgs &in_args = cv::util::get<cv::GRunArgs>(in_msg); const cv::GRunArgs &in_args = cv::util::get<cv::GRunArgs>(in_msg);
GAPI_Assert(in_args.size() == 1u); GAPI_Assert(in_args.size() == 1u);
cv::GRunArgP out_arg = out.get(0); cv::GRunArgP out_arg = out.get(0);
auto frame = cv::util::get<cv::MediaFrame>(in_args[0]); auto frame = cv::util::get<cv::MediaFrame>(in_args[0]);
const auto& desc = frame.desc(); const auto& desc = frame.desc();
auto& rmat = *cv::util::get<cv::RMat*>(out_arg); auto& rmat = *cv::util::get<cv::RMat*>(out_arg);
switch (desc.fmt) switch (desc.fmt)
{ {
case cv::MediaFormat::BGR: case cv::MediaFormat::BGR:
rmat = cv::make_rmat<cv::gimpl::RMatMediaBGRAdapter>(frame); rmat = cv::make_rmat<cv::gimpl::RMatMediaAdapterBGR>(frame);
break; break;
case cv::MediaFormat::NV12: case cv::MediaFormat::NV12:
{ {
cv::Mat bgr; cv::Mat bgr;
auto view = frame.access(cv::MediaFrame::Access::R); auto view = frame.access(cv::MediaFrame::Access::R);
cv::Mat y_plane (desc.size, CV_8UC1, view.ptr[0]); cv::Mat y_plane (desc.size, CV_8UC1, view.ptr[0], view.stride[0]);
cv::Mat uv_plane(desc.size / 2, CV_8UC2, view.ptr[1]); cv::Mat uv_plane(desc.size / 2, CV_8UC2, view.ptr[1], view.stride[1]);
cv::cvtColorTwoPlane(y_plane, uv_plane, bgr, cv::COLOR_YUV2BGR_NV12); cv::cvtColorTwoPlane(y_plane, uv_plane, bgr, cv::COLOR_YUV2BGR_NV12);
rmat = cv::make_rmat<cv::gimpl::RMatAdapter>(bgr); rmat = cv::make_rmat<cv::gimpl::RMatAdapter>(bgr);
break; break;
} }
default: default:
cv::util::throw_error( cv::util::throw_error(
std::logic_error("Unsupported MediaFormat for cv::gapi::streaming::BGR")); std::logic_error("Unsupported MediaFormat for cv::gapi::streaming::BGR"));
}
out.post(std::move(out_arg));
} }
out.post(std::move(out_arg));
} }

40
modules/gapi/src/backends/streaming/gstreamingbackend.hpp
View File

@ -14,34 +14,6 @@
namespace cv { namespace cv {
namespace gimpl { namespace gimpl {
struct RMatMediaBGRAdapter final: public cv::RMat::Adapter
{
RMatMediaBGRAdapter(cv::MediaFrame frame) : m_frame(frame) { };
virtual cv::RMat::View access(cv::RMat::Access a) override
{
auto view = m_frame.access(a == cv::RMat::Access::W ? cv::MediaFrame::Access::W
: cv::MediaFrame::Access::R);
auto ptr = reinterpret_cast<uchar*>(view.ptr[0]);
auto stride = view.stride[0];
std::shared_ptr<cv::MediaFrame::View> view_ptr =
std::make_shared<cv::MediaFrame::View>(std::move(view));
auto callback = [view_ptr]() mutable { view_ptr.reset(); };
return cv::RMat::View(desc(), ptr, stride, callback);
}
virtual cv::GMatDesc desc() const override
{
const auto& desc = m_frame.desc();
GAPI_Assert(desc.fmt == cv::MediaFormat::BGR);
return cv::GMatDesc{CV_8U, 3, desc.size};
}
cv::MediaFrame m_frame;
};
struct Copy: public cv::detail::KernelTag struct Copy: public cv::detail::KernelTag
{ {
using API = cv::gapi::streaming::GCopy; using API = cv::gapi::streaming::GCopy;
@ -51,14 +23,14 @@ struct Copy: public cv::detail::KernelTag
class Actor final: public cv::gapi::streaming::IActor class Actor final: public cv::gapi::streaming::IActor
{ {
public: public:
explicit Actor() {} explicit Actor(const cv::GCompileArgs&) {}
virtual void run(cv::gimpl::GIslandExecutable::IInput &in, virtual void run(cv::gimpl::GIslandExecutable::IInput &in,
cv::gimpl::GIslandExecutable::IOutput &out) override; cv::gimpl::GIslandExecutable::IOutput &out) override;
}; };
static cv::gapi::streaming::IActor::Ptr create() static cv::gapi::streaming::IActor::Ptr create(const cv::GCompileArgs& args)
{ {
return cv::gapi::streaming::IActor::Ptr(new Actor()); return cv::gapi::streaming::IActor::Ptr(new Actor(args));
} }
static cv::gapi::streaming::GStreamingKernel kernel() { return {&create}; }; static cv::gapi::streaming::GStreamingKernel kernel() { return {&create}; };
@ -71,14 +43,14 @@ struct BGR: public cv::detail::KernelTag
class Actor final: public cv::gapi::streaming::IActor { class Actor final: public cv::gapi::streaming::IActor {
public: public:
explicit Actor() {} explicit Actor(const cv::GCompileArgs&) {}
virtual void run(cv::gimpl::GIslandExecutable::IInput &in, virtual void run(cv::gimpl::GIslandExecutable::IInput &in,
cv::gimpl::GIslandExecutable::IOutput&out) override; cv::gimpl::GIslandExecutable::IOutput&out) override;
}; };
static cv::gapi::streaming::IActor::Ptr create() static cv::gapi::streaming::IActor::Ptr create(const cv::GCompileArgs& args)
{ {
return cv::gapi::streaming::IActor::Ptr(new Actor()); return cv::gapi::streaming::IActor::Ptr(new Actor(args));
} }
static cv::gapi::streaming::GStreamingKernel kernel() { return {&create}; }; static cv::gapi::streaming::GStreamingKernel kernel() { return {&create}; };
}; };

4
modules/gapi/src/backends/streaming/gstreamingkernel.hpp
View File

@ -14,6 +14,8 @@ namespace cv {
namespace gapi { namespace gapi {
namespace streaming { namespace streaming {
GAPI_EXPORTS cv::gapi::GBackend backend();
class IActor { class IActor {
public: public:
using Ptr = std::shared_ptr<IActor>; using Ptr = std::shared_ptr<IActor>;
@ -24,7 +26,7 @@ public:
virtual ~IActor() = default; virtual ~IActor() = default;
}; };
using CreateActorFunction = std::function<IActor::Ptr()>; using CreateActorFunction = std::function<IActor::Ptr(const cv::GCompileArgs&)>;
struct GStreamingKernel struct GStreamingKernel
{ {
CreateActorFunction createActorFunction; CreateActorFunction createActorFunction;