Add coupled sink apis and remove video test codes in secondary sink test suite.

- Add ‘scmirroring_primary_sink_set_coupled_sink’, ‘scmirroring_secondary_sink_set_coupled_sink’ apis each.
- Remove 'scmirroring_sink_set_coupled_sink'.
-- R1 sink doesn't support coupled sink function.
- Remove ‘status’ parameter on set coupled sink because user doen't need to set it.
* As 'mm_wfd_primary_sink_create' and 'mm_wfd_secondary_sink_create' are changed to 'mm_wfd_sink_create_r2', i applied it on this patch.
Change-Id: I7890a87b78498f313c7f79169d1cd3fbfa601d11
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/include/scmirroring_internal.h b/include/scmirroring_internal.h
index 2a726c2a9c91db876ef218d235bfb772eb701a54..b4763e9a9471778ad06a99bbb792b0d19f4d7548 100644 (file)
--- a/include/scmirroring_internal.h
+++ b/include/scmirroring_internal.h
@@ -74,19 +74,33 @@ typedef enum {
 typedef void(*scmirroring_state_cb)(scmirroring_error_e error, scmirroring_state_e state, void *user_data);
 
 /**
- * @brief Called when user wants to set 'stats' and 'address' of coupled sink.
+ * @brief Called when user wants to set 'address' of screen mirroring sink.
  *
- * @details This callback is called for state and error of screen mirroring.
+ * @details It sets MAC address to screen mirroring sink's property.
+ *
+ * @param[in] scmirroring_sink     Screen mirroring sink handle
+ * @param[in] address              Mac address of coupled screen mirroring sink.
+ *
+ * @pre scmirroring_sink_create()
+ *
+ * @see scmirroring_sink_create()
+ */
+int scmirroring_primary_sink_set_coupled_sink(scmirroring_primary_sink_h scmirroring_primary_sink, gchar* address);
+
+/**
+ * @brief Called when user wants to set 'address' of screen mirroring sink.
+ *
+ * @details It sets MAC address to screen mirroring sink's property.
  *
  * @param[in] scmirroring_sink     Screen mirroring sink handle
- * @param[in] status               Status which indicates whether primary sink is coupled or not.
- * @param[in] address              Mac address of coupled sink.
+ * @param[in] address              Mac address of coupled screen mirroring sink.
  *
  * @pre scmirroring_sink_create()
  *
  * @see scmirroring_sink_create()
  */
-int scmirroring_sink_set_coupled_sink(scmirroring_sink_h scmirroring_sink, gint status, gchar* address);
+int scmirroring_secondary_sink_set_coupled_sink(scmirroring_secondary_sink_h scmirroring_secondary_sink, gchar* address);
+
 
 #ifdef __cplusplus
 }

diff --git a/src/scmirroring_primary_sink.c b/src/scmirroring_primary_sink.c
index a73da9d2d36bfae957c07e3f27d746b75a605657..e917111d4e8f40609e240f3c3570045c5fb3205c 100644 (file)
--- a/src/scmirroring_primary_sink.c
+++ b/src/scmirroring_primary_sink.c
@@ -136,7 +136,7 @@ int scmirroring_primary_sink_create(scmirroring_primary_sink_h *scmirroring_prim
        handle->scmirroring_sink_state_cb = NULL;
        handle->magic_num = SCMIRRORING_MAGIC_NUMBER;
 
-       ret = mm_wfd_sink_create(&handle->mm_handle);
+       ret = mm_wfd_sink_create_r2(&handle->mm_handle);
        if (ret != MM_ERROR_NONE) {
                SCMIRRORING_SAFE_FREE(handle);
                scmirroring_error("Fail to Create");
@@ -729,7 +729,7 @@ int scmirroring_primary_sink_get_current_state(scmirroring_primary_sink_h scmirr
        return __scmirroring_primary_sink_error_convert(__func__, result);
 }
 
-int scmirroring_primary_sink_set_coupled_sink(scmirroring_primary_sink_h scmirroring_primary_sink, gint status, gchar* address)
+int scmirroring_primary_sink_set_coupled_sink(scmirroring_primary_sink_h scmirroring_primary_sink, gchar* address)
 {
        int ret = SCMIRRORING_ERROR_NONE;
        scmirroring_debug_fenter();
@@ -737,10 +737,11 @@ int scmirroring_primary_sink_set_coupled_sink(scmirroring_primary_sink_h scmirro
 
        scmirroring_retvm_if(handle == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_primary_sink is NULL");
        scmirroring_retvm_if(handle->magic_num != SCMIRRORING_MAGIC_NUMBER, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_primary_sink is invalid handle");
+       scmirroring_retvm_if(address, SCMIRRORING_ERROR_INVALID_PARAMETER, "MAC address is invalid");
 
-       scmirroring_debug("address [%s], status[%d]", address, status);
+       scmirroring_debug("address [%s]", address);
 
-       ret = mm_wfd_sink_set_coupled_sink(handle->mm_handle, status, address);
+       ret = mm_wfd_sink_set_coupled_sink(handle->mm_handle, address);
        if (ret != MM_ERROR_NONE) {
                scmirroring_error("Fail to Set Coupled IP");
                return __scmirroring_primary_sink_error_convert(__func__, ret);

diff --git a/src/scmirroring_secondary_sink.c b/src/scmirroring_secondary_sink.c
index ab3d0199e9a6dd790087602e9c72deb233e5d230..4cc135bf31921e8bb57d69af87666d200acd510a 100755 (executable)
--- a/src/scmirroring_secondary_sink.c
+++ b/src/scmirroring_secondary_sink.c
@@ -124,7 +124,7 @@ int scmirroring_secondary_sink_create(scmirroring_secondary_sink_h *scmirroring_
        handle->scmirroring_sink_state_cb = NULL;
        handle->magic_num = SCMIRRORING_MAGIC_NUMBER;
 
-       ret = mm_wfd_sink_create(&handle->mm_handle);
+       ret = mm_wfd_sink_create_r2(&handle->mm_handle);
        if (ret != MM_ERROR_NONE) {
                SCMIRRORING_SAFE_FREE(handle);
                scmirroring_error("Fail to Create");
@@ -552,7 +552,7 @@ int scmirroring_secondary_sink_get_current_state(scmirroring_secondary_sink_h sc
        return __scmirroring_secondary_sink_error_convert(__func__, result);
 }
 
-int scmirroring_secondary_sink_set_coupled_sink(scmirroring_secondary_sink_h scmirroring_secondary_sink, gint status, gchar* address)
+int scmirroring_secondary_sink_set_coupled_sink(scmirroring_secondary_sink_h scmirroring_secondary_sink, gchar* address)
 {
        int ret = SCMIRRORING_ERROR_NONE;
        scmirroring_debug_fenter();
@@ -560,10 +560,11 @@ int scmirroring_secondary_sink_set_coupled_sink(scmirroring_secondary_sink_h scm
 
        scmirroring_retvm_if(handle == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_secondary_sink is NULL");
        scmirroring_retvm_if(handle->magic_num != SCMIRRORING_MAGIC_NUMBER, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_secondary_sink is invalid handle");
+       scmirroring_retvm_if(address, SCMIRRORING_ERROR_INVALID_PARAMETER, "MAC address is invalid");
 
-       scmirroring_debug("status [%d], address[%s]", status, address);
+       scmirroring_debug("address[%s]", address);
 
-       ret = mm_wfd_sink_set_coupled_sink(handle->mm_handle, status, address);
+       ret = mm_wfd_sink_set_coupled_sink(handle->mm_handle, address);
 
        if (ret != MM_ERROR_NONE) {
                scmirroring_error("Fail to Set Coupled sink");

diff --git a/src/scmirroring_sink.c b/src/scmirroring_sink.c
index 4f85b3c5e5cfa18664cf44f26930cfafc72a6361..0faac238c4dffafc4775ccec60c07b3536a6f6ca 100644 (file)
--- a/src/scmirroring_sink.c
+++ b/src/scmirroring_sink.c
@@ -716,27 +716,3 @@ int scmirroring_sink_get_current_state(scmirroring_sink_h scmirroring_sink, scmi
        scmirroring_debug_fleave();
        return __scmirroring_sink_error_convert(__func__, result);
 }
-
-int scmirroring_sink_set_coupled_sink(scmirroring_sink_h scmirroring_sink, gint status, gchar* address)
-{
-       int ret = SCMIRRORING_ERROR_NONE;
-       scmirroring_debug_fenter();
-       scmirroring_sink_s *handle = (scmirroring_sink_s *)scmirroring_sink;
-
-       scmirroring_retvm_if(handle == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_sink is NULL");
-       scmirroring_retvm_if(handle->magic_num != SCMIRRORING_MAGIC_NUMBER, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring_sink is invalid handle");
-
-       scmirroring_debug("status [%d], address[%s]", status, address);
-
-       ret = mm_wfd_sink_set_coupled_sink(handle->mm_handle, status, address);
-
-       if (ret != MM_ERROR_NONE) {
-               scmirroring_error("Fail to Set Coupled IP");
-               return __scmirroring_sink_error_convert(__func__, ret);
-       }
-       ret = __scmirroring_sink_error_convert(__func__, ret);
-
-       scmirroring_debug_fleave();
-
-       return ret;
-}