Merge pull request #5097 from yuvaramachandran-gurusamy/sprint/24Q2_M…

…iracast_Fixes RDK-48709 - Synchronizing the enable/disbable the MiracastService discovery
rdkcentral · Apr 3, 2024 · 9aa6c40 · 9aa6c40
2 parents 9b89039 + e6a1723
commit 9aa6c40
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Miracast/MiracastService/MiracastController.cpp b/Miracast/MiracastService/MiracastController.cpp
@@ -637,7 +637,6 @@ void MiracastController::Controller_Thread(void *args)
     CONTROLLER_MSGQ_STRUCT controller_msgq_data = {0};
     bool    new_thunder_req_client_connection_sent = false,
             another_thunder_req_client_connection_sent = false,
-            start_discovering_enabled = false,
             session_restart_required = false,
             p2p_group_instance_alive = false;
 
@@ -1067,7 +1066,7 @@ void MiracastController::Controller_Thread(void *args)
                                 m_notify_handler->onMiracastServiceClientConnectionError( mac_address , device_name , error_code );
                             }
                             MIRACASTLOG_INFO("!!! Restarting Session !!!");
-                            restart_session(start_discovering_enabled);
+                            restart_session(m_start_discovering_enabled);
                             session_restart_required = false;
                         }
                     }
@@ -1140,14 +1139,14 @@ void MiracastController::Controller_Thread(void *args)
                         MIRACASTLOG_INFO("CONTROLLER_START_DISCOVERING Received\n");
                         set_WFDParameters();
                         discover_devices();
-                        start_discovering_enabled = true;
+                        m_start_discovering_enabled = true;
                     }
                     break;
                     case CONTROLLER_STOP_DISCOVERING:
                     {
                         MIRACASTLOG_INFO("CONTROLLER_STOP_DISCOVERING Received\n");
                         stop_session(true);
-                        start_discovering_enabled = false;
+                        m_start_discovering_enabled = false;
                     }
                     break;
                     case CONTROLLER_RESTART_DISCOVERING:
@@ -1163,7 +1162,7 @@ void MiracastController::Controller_Thread(void *args)
                             reset_NewSourceName();
                             MIRACASTLOG_INFO("[%s] Cached Device info removed...",cached_mac_address.c_str());
                         }
-                        restart_session(start_discovering_enabled);
+                        restart_session(m_start_discovering_enabled);
                         new_thunder_req_client_connection_sent = false;
                         another_thunder_req_client_connection_sent = false;
                         session_restart_required = true;
@@ -1244,7 +1243,7 @@ void MiracastController::Controller_Thread(void *args)
                     {
                         MIRACASTLOG_INFO("TEARDOWN request sent to RTSP handler\n");
                         //stop_streaming(CONTROLLER_TEARDOWN_REQ_FROM_THUNDER);
-                        restart_session(start_discovering_enabled);
+                        restart_session(m_start_discovering_enabled);
                     }
                     break;
                     default:
@@ -1557,16 +1556,22 @@ void MiracastController::send_thundermsg_to_controller_thread(MIRACAST_SERVICE_S
 
 void MiracastController::set_enable(bool is_enabled)
 {
-    MIRACAST_SERVICE_STATES state = MIRACAST_SERVICE_WFD_STOP;
-
     MIRACASTLOG_TRACE("Entering...");
 
     if ( true == is_enabled)
     {
-        state = MIRACAST_SERVICE_WFD_START;
+        MIRACASTLOG_INFO("MIRACAST_SERVICE_WFD_START Received");
+        set_WFDParameters();
+        discover_devices();
+        m_start_discovering_enabled = true;
     }
-
-    send_thundermsg_to_controller_thread(state);
+    else
+    {
+        MIRACASTLOG_INFO("MIRACAST_SERVICE_WFD_STOP Received");
+        stop_session(true);
+        m_start_discovering_enabled = false;
+    }
+    //send_thundermsg_to_controller_thread(state);
     MIRACASTLOG_TRACE("Exiting...");
 }
 

diff --git a/Miracast/P2P/MiracastP2P.cpp b/Miracast/P2P/MiracastP2P.cpp
@@ -457,7 +457,7 @@ void MiracastP2P::reset_WFDParameters(void)
 MiracastError MiracastP2P::discover_devices(void)
 {
     MiracastError ret = MIRACAST_FAIL;
-    std::string command, retBuffer,opt_flag_buffer;
+    std::string command, retBuffer;
     MIRACASTLOG_TRACE("Entering..");
 
     /*Start Passive Scanning*/
@@ -479,12 +479,14 @@ MiracastError MiracastP2P::stop_discover_devices(void)
     MIRACASTLOG_TRACE("Entering...");
 
     /*Stop Passive Scanning*/
-    command = "P2P_EXT_LISTEN 0 0";
+    command = "P2P_STOP_FIND";
+
     ret = executeCommand(command, NON_GLOBAL_INTERFACE, retBuffer);
     if (ret != MIRACAST_OK)
     {
         MIRACASTLOG_ERROR("Failed to Stop discovering devices");
     }
+
     MIRACASTLOG_TRACE("Exiting...");
     return ret;
 }

diff --git a/Miracast/include/MiracastController.h b/Miracast/include/MiracastController.h
@@ -137,6 +137,7 @@ class MiracastController
     GroupInfo *m_groupInfo;
     bool m_connectionStatus;
     bool m_p2p_backend_discovery{false};
+    bool m_start_discovering_enabled{false};
     std::string  m_current_device_name;
     std::string  m_current_device_mac_addr;