Add scmirroring_sink_set_display_roi()

[Version] 0.3.1
[Issue type] API

Change-Id: I3889eae0176e93e4ff21f097e5af4f2f4043a67a
Signed-off-by: Youngwoo Cho <young222.cho@samsung.com>

diff --git a/include/scmirroring_private.h b/include/scmirroring_private.h
index 0dee71dd46896bc28d1e8c999b2f97053f880d0c..283396b304da68424d572c8207f2061cef2a5b82 100644 (file)
--- a/include/scmirroring_private.h
+++ b/include/scmirroring_private.h
@@ -275,6 +275,7 @@ int _scmirroring_sink_resume(MMHandleType handle);
 int _scmirroring_sink_disconnect(MMHandleType handle);
 int _scmirroring_sink_set_display(MMHandleType handle, scmirroring_display_type_e type, void *display_surface, mm_display_type_e display_type);
 int _scmirroring_sink_set_display_mode(MMHandleType handle, scmirroring_display_mode_e mode);
+int _scmirroring_sink_set_display_roi(MMHandleType handle, int x, int y, int width, int height);
 int _scmirroring_sink_set_resolution(MMHandleType handle, int resolution);
 int _scmirroring_sink_get_negotiated_video_codec(MMHandleType handle, scmirroring_video_codec_e *codec);
 int _scmirroring_sink_get_negotiated_video_resolution(MMHandleType handle, int *width, int *height);

diff --git a/include/scmirroring_sink.h b/include/scmirroring_sink.h
index bcaa48c4d37045788e78519239f5101c92255237..19d3118d302099d051ddbbd0da87ddc73f900490 100644 (file)
--- a/include/scmirroring_sink.h
+++ b/include/scmirroring_sink.h
@@ -159,6 +159,41 @@ int scmirroring_sink_set_display(scmirroring_sink_h scmirroring_sink, scmirrorin
  */
 int scmirroring_sink_set_display_mode(scmirroring_sink_h scmirroring_sink, scmirroring_display_mode_e mode);
 
+/**
+ * @brief Sets display ROI area of screen mirroring sink.
+ * @details This function sets display roi(region of interest) area of screen mirroring sink with x, y, width, height.
+ *
+ * @since_tizen 10.0
+ *
+ * @remarks This function must be called before scmirroring_sink_prepare().
+ * @remarks The ROI area is valid only in #SCMIRRORING_DISPLAY_MODE_CUSTOM_ROI display mode.
+ * @remarks The minimum value of width and height are 1.
+ * @remarks The minimum value of x and y are 0.
+ * @remarks ROI area can be set before setting ROI display mode.
+ * @remarks This function is related to the following feature:\n
+ *          %http://tizen.org/feature/network.wifi.direct.display\n
+ *
+ * @param[in] scmirroring_sink The handle to the screen mirroring sink
+ * @param[in] x      X coordinate of area
+ * @param[in] y      Y coordinate of area
+ * @param[in] width  Width of area
+ * @param[in] height Height of area
+ * @return @c 0 on success,
+ *         otherwise a negative error value
+ * @retval #SCMIRRORING_ERROR_NONE Successful
+ * @retval #SCMIRRORING_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #SCMIRRORING_ERROR_INVALID_OPERATION Invalid operation
+ * @retval #SCMIRRORING_ERROR_NOT_SUPPORTED Not supported
+ * @retval #SCMIRRORING_ERROR_UNKNOWN Unknown Error
+ *
+ * @pre Create a screen mirroring sink handle by calling scmirroring_sink_create().
+ *
+ * @see scmirroring_sink_create()
+ * @see scmirroring_sink_set_display_mode()
+ * @see scmirroring_sink_prepare()
+ */
+int scmirroring_sink_set_display_roi(scmirroring_sink_h scmirroring_sink, int x, int y, int width, int height);
+
 /**
  * @brief Sets resolutions of screen mirroring sink.
  * @details This function sets resolutions of screen mirroring sink using scmirroring_resolution_e as following.

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index 8bd910327ef97bbc9a2aa7a80685192b4fed8faf..d9a58f838ead09bfe956581214579833a663e732 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.3.0
+Version:    0.3.1
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_sink.c b/src/scmirroring_sink.c
index 4ded5d030677e7117b9611e04679b572c0234d8e..a197e37ead5c00e9a869495c12be8ec9eb185b80 100644 (file)
--- a/src/scmirroring_sink.c
+++ b/src/scmirroring_sink.c
@@ -231,6 +231,19 @@ int scmirroring_sink_set_display_mode(scmirroring_sink_h scmirroring_sink, scmir
        return _scmirroring_sink_set_display_mode(handle->mm_handle, mode);
 }
 
+int scmirroring_sink_set_display_roi(scmirroring_sink_h scmirroring_sink, int x, int y, int width, int height)
+{
+       scmirroring_sink_s *handle = (scmirroring_sink_s *)scmirroring_sink;
+
+       CHECK_FEATURE_SUPPORTED(WIFIDIRECT_DISPLAY_FEATURE);
+
+       scmirroring_error_fenter();
+
+       scmirroring_retvm_if(!__is_valid_handle(handle), SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_sink is invalid");
+
+       return _scmirroring_sink_set_display_roi(handle->mm_handle, x, y, width, height);
+}
+
 int scmirroring_sink_set_resolution(scmirroring_sink_h scmirroring_sink, int resolution)
 {
        scmirroring_sink_s *handle = (scmirroring_sink_s *)scmirroring_sink;

diff --git a/src/scmirroring_util.c b/src/scmirroring_util.c
index 4a97c26448e9dc80e78c66c77f3f235110ae7153..ad30cba31a3d5f180d9e6d102d5ac633b79ce5bc 100644 (file)
--- a/src/scmirroring_util.c
+++ b/src/scmirroring_util.c
@@ -239,6 +239,36 @@ int _scmirroring_sink_set_display_mode(MMHandleType handle, scmirroring_display_
        return _scmirroring_error_convert(__func__, ret);
 }
 
+int _scmirroring_sink_set_display_roi(MMHandleType handle, int x, int y, int width, int height)
+{
+       int ret = SCMIRRORING_ERROR_NONE;
+
+       scmirroring_debug_fenter();
+
+       if ((x < 0) || (y < 0)) {
+               scmirroring_error("Invalid display x[%d] y[%d]", x, y);
+               return SCMIRRORING_ERROR_INVALID_PARAMETER;
+       }
+
+       if ((width < 1) || (height < 1)) {
+               scmirroring_error("Invalid area width[%d] height[%d]", width, height);
+               return SCMIRRORING_ERROR_INVALID_PARAMETER;
+       }
+
+       scmirroring_debug("display roi area x[%d] y[%d] width[%d] height[%d]", x, y, width, height);
+
+       ret = mm_wfd_sink_set_attribute(handle, NULL,
+                               "display_roi_x", x,
+                               "display_roi_y", y,
+                               "display_roi_width", width,
+                               "display_roi_height", height,
+                               NULL);
+       if (ret != MM_ERROR_NONE)
+               scmirroring_error("Fail to Set Display ROI Area");
+
+       return _scmirroring_error_convert(__func__, ret);
+}
+
 int _scmirroring_sink_set_resolution(MMHandleType handle, int resolution)
 {
        int ret = SCMIRRORING_ERROR_NONE;