jira: NMS-6012 NMS-6014

Author: zhangqianze

windows/APIExample/APIExample/APIExample.vcxproj

@@ -23,7 +23,7 @@
     <ProjectGuid>{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}</ProjectGuid>
     <Keyword>MFCProj</Keyword>
     <RootNamespace>APIExample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -44,7 +44,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>

windows/APIExample/APIExample/Advanced/ReportInCall/CAgoraReportInCallDlg.h

@@ -212,7 +212,7 @@ class CAgoraReportInCallHandler : public IRtcEngineEventHandler
 	 *
 	 * @param stats Statistics of the local video stream. See LocalVideoStats.
 	 */
-	virtual void onLocalVideoStats(const LocalVideoStats& stats) override {
+	virtual void onLocalVideoStats(VIDEO_SOURCE_TYPE source, const LocalVideoStats& stats) override {
 		if (m_hMsgHanlder)
 			::PostMessage(m_hMsgHanlder, WM_MSGID(EID_LOCAL_VIDEO_STATS), (WPARAM)new LocalVideoStats(stats), 0);
 	}
@@ -223,7 +223,7 @@ class CAgoraReportInCallHandler : public IRtcEngineEventHandler
 	 @param localVideoState State type #LOCAL_VIDEO_STREAM_STATE. When the state is LOCAL_VIDEO_STREAM_STATE_FAILED (3), see the `error` parameter for details.
 	 @param error The detailed error information: #LOCAL_VIDEO_STREAM_ERROR.
 	 */
-	virtual void onLocalVideoStateChanged(LOCAL_VIDEO_STREAM_STATE localVideoState, LOCAL_VIDEO_STREAM_ERROR error)override {
+	virtual void onLocalVideoStateChanged(VIDEO_SOURCE_TYPE source, LOCAL_VIDEO_STREAM_STATE localVideoState, LOCAL_VIDEO_STREAM_ERROR error)override {
 		(void)localVideoState;
 		(void)error;
 	}

windows/APIExample/APIExample/Advanced/SpatialAudio/CAgoraSpatialAudioDlg.cpp

@@ -373,7 +373,7 @@ void CAgoraSpatialAudioDlg::OnBnClickedButtonStart()
 	CString strInfo;
 	strInfo.Format(_T("startEchoTest %d seconds"), 10);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
-	m_rtcEngine->startAudioMixing(cs2utf8(m_audioPath).c_str(),  false, true, 1, 0);
+	m_rtcEngine->startAudioMixing(cs2utf8(m_audioPath).c_str(),  false, 1, 0);
 	strInfo.Format(_T("startAudioMixing"));
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
 

windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.cpp

@@ -297,9 +297,6 @@ bool CLiveBroadcastingDlg::InitAgora()
     m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("enable video"));
 
     m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("live broadcasting"));
-    //set client role in the engine to the CLIENT_ROLE_BROADCASTER.
-    m_rtcEngine->setClientRole(CLIENT_ROLE_BROADCASTER);
-    m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("setClientRole broadcaster"));
     return true;
 }
 
@@ -356,6 +353,20 @@ void CLiveBroadcastingDlg::RenderLocalVideo()
     }
 }
 
+void CLiveBroadcastingDlg::StopLocalVideo()
+{
+	if (m_rtcEngine) {
+		//start preview in the engine.
+		m_rtcEngine->stopPreview();
+		VideoCanvas canvas;
+		canvas.uid = 0;
+		canvas.view = NULL;
+		//setup local video in the engine to the canvas. 
+		m_rtcEngine->setupLocalVideo(canvas);
+		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("stop local video"));
+	}
+}
+
 
 void CLiveBroadcastingDlg::OnSelchangeComboPersons()
 {
@@ -367,7 +378,15 @@ void CLiveBroadcastingDlg::OnSelchangeComboPersons()
 void CLiveBroadcastingDlg::OnSelchangeComboRole()
 {
     if (m_rtcEngine) {
-        m_rtcEngine->setClientRole(CLIENT_ROLE_TYPE(m_cmbRole.GetCurSel() + 1));
+        m_rtcEngine->setClientRole(m_cmbRole.GetCurSel() == 0 ? CLIENT_ROLE_BROADCASTER : CLIENT_ROLE_AUDIENCE);
+
+		if (m_cmbRole.GetCurSel() == 0) {
+			// start video and render local video
+			RenderLocalVideo();
+		} else {
+			// stop video and unbind local video
+			StopLocalVideo();
+		}
 
         m_lstInfo.InsertString(m_lstInfo.GetCount(), m_cmbRole.GetCurSel() == 0 ? _T("setClientRole broadcaster"): _T("setClientRole Audience"));
     }
@@ -396,7 +415,7 @@ void CLiveBroadcastingDlg::OnBnClickedButtonJoinchannel()
 
 		ChannelMediaOptions options;
 		options.channelProfile = CHANNEL_PROFILE_LIVE_BROADCASTING;
-		options.clientRoleType = CLIENT_ROLE_BROADCASTER;
+		options.clientRoleType = CLIENT_ROLE_TYPE(m_cmbRole.GetCurSel() + 1);
 		options.autoSubscribeAudio = true;
 		options.autoSubscribeVideo = true;
         //join channel in the engine.

windows/APIExample/APIExample/Basic/LiveBroadcasting/CLiveBroadcastingDlg.h

@@ -236,6 +236,8 @@ class CLiveBroadcastingDlg : public CDialogEx
     void ShowVideoWnds();
     //render local video from SDK local capture.
     void RenderLocalVideo();
+	//stop local video capture from SDK
+	void StopLocalVideo();
 
 
     IRtcEngine* m_rtcEngine = nullptr;