G-API: Integrated cv::MediaFrame as I/O type + CPU backend

modules/gapi/src/api/gbackend.cpp

@@ -150,6 +150,10 @@ void bindInArg(Mag& mag, const RcDesc &rc, const GRunArg &arg, HandleRMat handle
         mag.template slot<cv::detail::OpaqueRef>()[rc.id] = util::get<cv::detail::OpaqueRef>(arg);
         break;
 
+    case GShape::GFRAME:
+        mag.template slot<cv::MediaFrame>()[rc.id] = util::get<cv::MediaFrame>(arg);
+        break;
+
     default:
         util::throw_error(std::logic_error("Unsupported GShape type"));
     }
@@ -216,6 +220,7 @@ void resetInternalData(Mag& mag, const Data &d)
         break;
 
     case GShape::GMAT:
+    case GShape::GFRAME:
         // Do nothing here - FIXME unify with initInternalData?
         break;
 
@@ -236,6 +241,7 @@ cv::GRunArg getArg(const Mag& mag, const RcDesc &ref)
     //   (and constructed by either bindIn/Out or resetInternal)
     case GShape::GARRAY:  return GRunArg(mag.template slot<cv::detail::VectorRef>().at(ref.id));
     case GShape::GOPAQUE: return GRunArg(mag.template slot<cv::detail::OpaqueRef>().at(ref.id));
+    case GShape::GFRAME:  return GRunArg(mag.template slot<cv::MediaFrame>().at(ref.id));
     default:
         util::throw_error(std::logic_error("Unsupported GShape type"));
         break;
@@ -329,6 +335,12 @@ void unbind(Mag& mag, const RcDesc &rc)
         mag.slot<cv::RMat>().erase(rc.id);
         break;
 
+    case GShape::GFRAME:
+        // MediaFrame can also be associated with external memory,
+        // so requires a special handling here.
+        mag.slot<cv::MediaFrame>().erase(rc.id);
+        break;
+
     default:
         GAPI_Assert(false);
     }

modules/gapi/src/api/gframe.cpp

@@ -13,16 +13,11 @@
 
 // cv::GFrame public implementation //////////////////////////////////////////////
 cv::GFrame::GFrame()
-    : m_priv(new GOrigin(GShape::GMAT, GNode::Param())) {
-    // N.B.: The shape here is still GMAT as currently cv::Mat is used
-    // as an underlying host type. Will be changed to GFRAME once
-    // GExecutor & GStreamingExecutor & selected backends will be extended
-    // to support cv::MediaFrame.
+    : m_priv(new GOrigin(GShape::GFRAME, GNode::Param())) {
 }
 
 cv::GFrame::GFrame(const GNode &n, std::size_t out)
-    : m_priv(new GOrigin(GShape::GMAT, n, out)) {
-    // N.B.: GMAT is here for the same reason as above ^
+    : m_priv(new GOrigin(GShape::GFRAME, n, out)) {
 }
 
 cv::GOrigin& cv::GFrame::priv() {
@@ -34,7 +29,19 @@ const cv::GOrigin& cv::GFrame::priv() const {
 }
 
 namespace cv {
-std::ostream& operator<<(std::ostream& os, const cv::GFrameDesc &) {
+
+bool GFrameDesc::operator== (const GFrameDesc &rhs) const {
+    return fmt == rhs.fmt && size == rhs.size;
+}
+
+std::ostream& operator<<(std::ostream& os, const cv::GFrameDesc &d) {
+    os << '[';
+    switch (d.fmt) {
+    case MediaFormat::BGR:  os << "BGR"; break;
+    case MediaFormat::NV12: os << "NV12"; break;
+    default: GAPI_Assert(false && "Invalid media format");
+    }
+    os << ' ' << d.size << ']';
     return os;
 }
 

modules/gapi/src/api/gproto.cpp

@@ -122,6 +122,9 @@ cv::GMetaArg cv::descr_of(const cv::GRunArg &arg)
         case GRunArg::index_of<cv::RMat>():
             return cv::GMetaArg(cv::util::get<cv::RMat>(arg).desc());
 
+        case GRunArg::index_of<cv::MediaFrame>():
+            return cv::GMetaArg(cv::util::get<cv::MediaFrame>(arg).desc());
+
         default: util::throw_error(std::logic_error("Unsupported GRunArg type"));
     }
 }
@@ -133,6 +136,7 @@ cv::GMetaArgs cv::descr_of(const cv::GRunArgs &args)
     return metas;
 }
 
+// FIXME: Is it tested for all types?
 cv::GMetaArg cv::descr_of(const cv::GRunArgP &argp)
 {
     switch (argp.index())
@@ -148,6 +152,7 @@ cv::GMetaArg cv::descr_of(const cv::GRunArgP &argp)
     }
 }
 
+// FIXME: Is it tested for all types??
 bool cv::can_describe(const GMetaArg& meta, const GRunArgP& argp)
 {
     switch (argp.index())
@@ -164,6 +169,7 @@ bool cv::can_describe(const GMetaArg& meta, const GRunArgP& argp)
     }
 }
 
+// FIXME: Is it tested for all types??
 bool cv::can_describe(const GMetaArg& meta, const GRunArg& arg)
 {
     switch (arg.index())
@@ -179,6 +185,7 @@ bool cv::can_describe(const GMetaArg& meta, const GRunArg& arg)
     case GRunArg::index_of<cv::gapi::wip::IStreamSource::Ptr>(): return util::holds_alternative<GMatDesc>(meta); // FIXME(?) may be not the best option
     case GRunArg::index_of<cv::RMat>():              return util::holds_alternative<GMatDesc>(meta) &&
                                                             util::get<GMatDesc>(meta).canDescribe(cv::util::get<cv::RMat>(arg));
+    case GRunArg::index_of<cv::MediaFrame>():        return meta == cv::GMetaArg(util::get<cv::MediaFrame>(arg).desc());
     default: util::throw_error(std::logic_error("Unsupported GRunArg type"));
     }
 }
@@ -192,6 +199,8 @@ bool cv::can_describe(const GMetaArgs &metas, const GRunArgs &args)
                      });
 }
 
+// FIXME: Is it tested for all types?
+// FIXME: Where does this validation happen??
 void cv::validate_input_arg(const GRunArg& arg)
 {
     // FIXME: It checks only Mat argument
@@ -248,6 +257,11 @@ std::ostream& operator<<(std::ostream& os, const cv::GMetaArg &arg)
     case cv::GMetaArg::index_of<cv::GOpaqueDesc>():
         os << util::get<cv::GOpaqueDesc>(arg);
         break;
+
+    case cv::GMetaArg::index_of<cv::GFrameDesc>():
+        os << util::get<cv::GFrameDesc>(arg);
+        break;
+
     default:
         GAPI_Assert(false);
     }

modules/gapi/src/api/media.cpp

@@ -22,7 +22,7 @@ cv::GFrameDesc cv::MediaFrame::desc() const {
     return m->adapter->meta();
 }
 
-cv::MediaFrame::View cv::MediaFrame::access(Access code) {
+cv::MediaFrame::View cv::MediaFrame::access(Access code) const {
     return m->adapter->access(code);
 }