modify enum policy 'ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT' to 'ESPLUSPLAYER_RS...

diff --git a/include/esplusplayer_capi/esplusplayer_capi.h b/include/esplusplayer_capi/esplusplayer_capi.h
index bdc5b5b42632b2c02da9aee25bf584373947825a..9c81ac4dc00dcd6c778fadeef6d2ead4d5bb7d55 100644 (file)
--- a/include/esplusplayer_capi/esplusplayer_capi.h
+++ b/include/esplusplayer_capi/esplusplayer_capi.h
@@ -412,8 +412,14 @@ typedef enum esplusplayer_rsc_alloc_policy {
    * resources.
    * @version 6.0
    */
-  ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT
-} esplusplayer_rsc_alloc_policy;
+  ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT,
+  /**
+   * @description inapp multiview policy, RM will return available
+   * resources.
+   * @version 6.0
+   */
+  ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW
+};
 
 /**
  * @brief Enumerations for the status of getting decoded video frame

diff --git a/src/esplusplayer/src/esplusplayer_capi.cpp b/src/esplusplayer/src/esplusplayer_capi.cpp
index 209385e109b1a1d264f263f38fe846f52facb725..58bf7229e7237d2a98fbfaeeb8eb46e6197da8af 100644 (file)
--- a/src/esplusplayer/src/esplusplayer_capi.cpp
+++ b/src/esplusplayer/src/esplusplayer_capi.cpp
@@ -2293,7 +2293,10 @@ int esplusplayer_set_resource_allocate_policy(
   LOG_ENTER_P(cast_(handle))
   if (is_null_(handle)) return ESPLUSPLAYER_ERROR_TYPE_INVALID_PARAMETER;
   LOG_INFO("policy: %d", static_cast<int>(policy));
-
+  if(policy == ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW) {
+    LOG_INFO("change policy ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW to ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT");
+    policy = ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT;
+  }
   auto ret = cast_(handle)->SetResourceAllocatePolicy(
       static_cast<RscAllocPolicy>(policy));
   return convert_return_type_(ret);

diff --git a/ut/src/esplusplayer/ut_inapp_multiview.cpp b/ut/src/esplusplayer/ut_inapp_multiview.cpp
index 51a408f6e454fc74765f77f0822e8d26166e555e..9ea49a995ee7613d1c6a7848b9ffd32c0f139c63 100644 (file)
--- a/ut/src/esplusplayer/ut_inapp_multiview.cpp
+++ b/ut/src/esplusplayer/ut_inapp_multiview.cpp
@@ -110,7 +110,7 @@ esplusplayer_handle EsInAppMultiViewTest::esplayer2_ = nullptr;
 
 TEST_P(
     EsInAppMultiViewTest,
-    vdapi_inappmultiview_esplusplayer_set_resource_allocate_policy_no_explicit_p_1) {
+    vdapi_inappmultiview_esplusplayer_set_resource_allocate_policy_inapp_multiview_p_1) {
   ASSERT_EQ(esplusplayer_open(esplayer1_), ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(
       esplusplayer_set_display(esplayer1_, ESPLUSPLAYER_DISPLAY_TYPE_OVERLAY,
@@ -123,7 +123,7 @@ TEST_P(
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_TRUE(video_reader1_->SetStreamInfo(esplayer1_));
   ASSERT_EQ(esplusplayer_set_resource_allocate_policy(
-                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT),
+                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(esplusplayer_prepare_async(esplayer1_),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
@@ -141,7 +141,7 @@ TEST_P(
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_TRUE(video_reader2_->SetStreamInfo(esplayer2_));
   ASSERT_EQ(esplusplayer_set_resource_allocate_policy(
-                esplayer2_, ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT),
+                esplayer2_, ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(esplusplayer_prepare_async(esplayer2_),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
@@ -155,7 +155,7 @@ TEST_P(
 
 TEST_P(
     EsInAppMultiViewTest,
-    vdapi_inappmultiview_esplusplayer_set_alternative_video_resource_no_explicit_n_1) {
+    vdapi_inappmultiview_esplusplayer_set_alternative_video_resource_inapp_multiview_n_1) {
   ASSERT_EQ(esplusplayer_open(esplayer1_), ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(
       esplusplayer_set_display(esplayer1_, ESPLUSPLAYER_DISPLAY_TYPE_OVERLAY,
@@ -168,7 +168,7 @@ TEST_P(
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_TRUE(video_reader1_->SetStreamInfo(esplayer1_));
   ASSERT_EQ(esplusplayer_set_resource_allocate_policy(
-                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT),
+                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(esplusplayer_set_alternative_video_resource(esplayer1_, 2),
             ESPLUSPLAYER_ERROR_TYPE_INVALID_OPERATION);
@@ -183,13 +183,13 @@ TEST_P(
 
 TEST_P(
     EsInAppMultiViewTest,
-    vdapi_inappmultiview_esplusplayer_set_alternative_audio_resource_no_explicit_n_1) {
+    vdapi_inappmultiview_esplusplayer_set_alternative_audio_resource_inapp_multiview_n_1) {
   ASSERT_EQ(esplusplayer_open(esplayer1_), ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_TRUE(audio_reader1_->SetStreamInfo(esplayer1_));
   ASSERT_EQ(esplusplayer_deactivate_audio(esplayer1_),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(esplusplayer_set_resource_allocate_policy(
-                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE_NO_EXPLICIT),
+                esplayer1_, ESPLUSPLAYER_RSC_ALLOC_INAPP_MULTIVIEW),
             ESPLUSPLAYER_ERROR_TYPE_NONE);
   ASSERT_EQ(esplusplayer_set_alternative_audio_resource(
                 esplayer1_, ESPLUSPLAYER_AUDIO_RESOURCE_MAIN),