Set the mHasSentInitialICECandidates from WebRTCProviderManager

Author: yufengwangca

examples/camera-app/linux/include/webrtc-transport.h

@@ -137,6 +137,9 @@ class WebrtcTransport : public Transport
     void SetRequestArgs(const RequestArgs & args);
     RequestArgs & GetRequestArgs();
 
+    void SetHasSentInitialICECandidates(bool hasSent) { mHasSentInitialICECandidates = hasSent; }
+    bool GetHasSentInitialICECandidates() const { return mHasSentInitialICECandidates; }
+
 private:
     CommandType mCommandType = CommandType::kUndefined;
     State mState             = State::Idle;

examples/camera-app/linux/src/clusters/webrtc-provider/webrtc-provider-manager.cpp

@@ -369,6 +369,10 @@ CHIP_ERROR WebRTCProviderManager::HandleProvideAnswer(uint16_t sessionId, const
     transport->MoveToState(WebrtcTransport::State::SendingICECandidates);
     ScheduleICECandidatesSend(sessionId);
 
+    // Set the flag after successfully handling the answer and scheduling ICE candidates
+    transport->SetHasSentInitialICECandidates(true);
+    ChipLogProgress(Camera, "Initial ICE candidates batch will be sent for sessionID: %u, trickle ICE enabled", sessionId);
+
     return CHIP_NO_ERROR;
 }
 
@@ -409,6 +413,13 @@ CHIP_ERROR WebRTCProviderManager::HandleProvideICECandidates(uint16_t sessionId,
     transport->MoveToState(WebrtcTransport::State::SendingICECandidates);
     ScheduleICECandidatesSend(sessionId);
 
+    if (!transport->GetHasSentInitialICECandidates())
+	{
+        // Set the flag after successfully handling ICE candidates
+        transport->SetHasSentInitialICECandidates(true);
+        ChipLogProgress(Camera, "Initial ICE candidates batch will be sent for sessionID: %u, trickle ICE enabled", sessionId);
+	}
+
     return CHIP_NO_ERROR;
 }
 
@@ -712,6 +723,10 @@ void WebRTCProviderManager::OnDeviceConnected(void * context, Messaging::Exchang
         }
 
         err = self->SendEndCommand(exchangeMgr, sessionHandle, sessionId, endReason);
+
+        // Unset the flag when session closes
+        transport->SetHasSentInitialICECandidates(false);
+
         // Release the Video and Audio Streams from the CameraAVStreamManagement
         // cluster and update the reference counts.
         self->ReleaseAudioVideoStreams(sessionId);

examples/camera-app/linux/src/webrtc-transport.cpp

@@ -128,14 +128,6 @@ const char * WebrtcTransport::GetStateStr() const
 
 void WebrtcTransport::MoveToState(const State targetState)
 {
-    // When transitioning from SendingICECandidates to Idle for the first time, enable trickle ICE mode
-    // (subsequent transitions will be for trickle ICE updates, so we only set the flag once)
-    if (mState == State::SendingICECandidates && targetState == State::Idle && !mHasSentInitialICECandidates)
-    {
-        mHasSentInitialICECandidates = true;
-        ChipLogProgress(Camera, "Initial ICE candidates batch sent for sessionID: %u, trickle ICE enabled", mRequestArgs.sessionId);
-    }
-
     mState = targetState;
     ChipLogProgress(Camera, "WebrtcTransport moving to [ %s ]", GetStateStr());
 }