Add new render primitives

modules/gapi/include/opencv2/gapi/render.hpp

@@ -2,7 +2,7 @@
 // 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) 2018 Intel Corporation
+// Copyright (C) 2018-2019 Intel Corporation
 
 
 #ifndef OPENCV_GAPI_RENDER_HPP
@@ -11,6 +11,8 @@
 #include <string>
 #include <vector>
 
+#include <opencv2/gapi.hpp>
+
 #include <opencv2/gapi/opencv_includes.hpp>
 #include <opencv2/gapi/util/variant.hpp>
 #include <opencv2/gapi/own/exports.hpp>
@@ -20,6 +22,9 @@ namespace cv
 {
 namespace gapi
 {
+
+namespace ocv { GAPI_EXPORTS cv::gapi::GKernelPackage kernels(); }
+
 namespace wip
 {
 namespace draw
@@ -78,7 +83,38 @@ struct Line
     int        thick;  //!< The thickness of line
     int        lt;     //!< The Type of the line. See #LineTypes
     int        shift;  //!< The number of fractional bits in the point coordinates
+};
 
+/**
+ * A structure to represent parameters for drawing a mosaic
+ */
+struct Mosaic
+{
+    cv::Rect   mos;    //!< Coordinates of the mosaic
+    int        cellSz; //!< Cell size (same for X, Y). Note: mos size must be multiple of cell size
+    int        decim;  //!< Decimation (0 stands for no decimation)
+};
+
+/**
+ * A structure to represent parameters for drawing an image
+ */
+struct Image
+{
+    cv::Point org;   //!< The bottom-left corner of the image
+    cv::Mat   img;   //!< Image to draw
+    cv::Mat   alpha; //!< Alpha channel for image to draw (same size and number of channels)
+};
+
+/**
+ * A structure to represent parameters for drawing a polygon
+ */
+struct Poly
+{
+    std::vector<cv::Point> points;  //!< Points to connect
+    cv::Scalar             color;   //!< The line color
+    int                    thick;   //!< The thickness of line
+    int                    lt;      //!< The Type of the line. See #LineTypes
+    int                    shift;   //!< The number of fractional bits in the point coordinates
 };
 
 using Prim  = util::variant
@@ -86,27 +122,56 @@ using Prim  = util::variant
     , Rect
     , Circle
     , Line
+    , Mosaic
+    , Image
+    , Poly
     >;
 
-using Prims = std::vector<Prim>;
+using Prims     = std::vector<Prim>;
+using GMat2     = std::tuple<cv::GMat,cv::GMat>;
+using GMatDesc2 = std::tuple<cv::GMatDesc,cv::GMatDesc>;
+
+G_TYPED_KERNEL_M(GRenderNV12, <GMat2(cv::GMat,cv::GMat,cv::GArray<wip::draw::Prim>)>, "org.opencv.render.nv12")
+{
+     static GMatDesc2 outMeta(GMatDesc y_plane, GMatDesc uv_plane, GArrayDesc)
+     {
+         return std::make_tuple(y_plane, uv_plane);
+     }
+};
+
+G_TYPED_KERNEL(GRenderBGR, <cv::GMat(cv::GMat,cv::GArray<wip::draw::Prim>)>, "org.opencv.render.bgr")
+{
+     static GMatDesc outMeta(GMatDesc bgr, GArrayDesc)
+     {
+         return bgr;
+     }
+};
 
 /** @brief The function renders on the input image passed drawing primitivies
 
 @param bgr input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
 @param prims vector of drawing primitivies
+@param pkg contains render kernel implementation
 */
-GAPI_EXPORTS void render(cv::Mat& bgr, const Prims& prims);
+GAPI_EXPORTS void render(cv::Mat& bgr,
+                         const Prims& prims,
+                         const cv::gapi::GKernelPackage& pkg = ocv::kernels());
 
 /** @brief The function renders on two NV12 planes passed drawing primitivies
 
 @param y_plane input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
 @param uv_plane input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
 @param prims vector of drawing primitivies
+@param pkg contains render kernel implementation
 */
-GAPI_EXPORTS void render(cv::Mat& y_plane, cv::Mat& uv_plane , const Prims& prims);
+GAPI_EXPORTS void render(cv::Mat& y_plane,
+                         cv::Mat& uv_plane,
+                         const Prims& prims,
+                         const cv::gapi::GKernelPackage& pkg = ocv::kernels());
 
 } // namespace draw
 } // namespace wip
+
 } // namespace gapi
 } // namespace cv