Merge branch 'dev/4.0.0-GA' of github.com:AgoraIO/API-Examples into dev/4.0.0-GA

Author: zhaoyongqiang

windows/APIExample/APIExample/APIExample.rc

@@ -879,6 +879,10 @@ END
 
 IDB_BITMAP_NETWORK_STATE BITMAP                  "res\\IDB_NETWORK_QUALITY.bmp"
 
+IDB_BITMAP1             BITMAP                  "res\\local.bmp"
+
+IDB_BITMAP2             BITMAP                  "res\\remote.bmp"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -887,6 +891,8 @@ IDB_BITMAP_NETWORK_STATE BITMAP                  "res\\IDB_NETWORK_QUALITY.bmp"
 
 IDR_TEST_WAVE           WAVE                    "res\\ID_TEST_AUDIO.wav"
 
+IDR_WAVE1               WAVE                    "res\\audiomixing.wav"
+
 #endif    // ����(���壬�й�) resources
 /////////////////////////////////////////////////////////////////////////////
 

windows/APIExample/APIExample/APIExample.vcxproj

@@ -51,7 +51,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
@@ -367,8 +367,13 @@ copy $(SolutionDir)APIExample\Advanced\LocalVideoTranscoding\agora.jpg $(Solutio
   <ItemGroup>
     <Image Include="res\APIExample.ico" />
     <Image Include="res\IDB_NETWORK_QUALITY.bmp" />
+    <Image Include="res\local.bmp" />
+    <Image Include="res\remote.bmp" />
   </ItemGroup>
   <ItemGroup>
+    <CopyFileToFolders Include="res\audiomixing.wav">
+      <FileType>Document</FileType>
+    </CopyFileToFolders>
     <Media Include="res\ID_TEST_AUDIO.wav" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

windows/APIExample/APIExample/APIExample.vcxproj.filters

@@ -374,10 +374,21 @@
     <Image Include="res\IDB_NETWORK_QUALITY.bmp">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="res\local.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="res\remote.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Media Include="res\ID_TEST_AUDIO.wav">
       <Filter>Resource Files</Filter>
     </Media>
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="res\audiomixing.wav">
+      <Filter>Resource Files</Filter>
+    </CopyFileToFolders>
+  </ItemGroup>
 </Project>

windows/APIExample/APIExample/Advanced/Beauty/CDlgBeauty.cpp

@@ -98,7 +98,7 @@ void CDlgBeauty::OnBnClickedButtonJoinchannel()
 
 		//join channel
 		agora::rtc::ChannelMediaOptions op;
-		op.publishTrancodedVideoTrack = true;
+		op.publishCameraTrack = true;
 		op.channelProfile = CHANNEL_PROFILE_LIVE_BROADCASTING;
 		op.clientRoleType = agora::rtc::CLIENT_ROLE_BROADCASTER;
 		if (0 == m_rtcEngine->joinChannel(APP_TOKEN, szChannelId.data(), 0, op)) {
@@ -153,7 +153,7 @@ bool CDlgBeauty::InitAgora()
 	strInfo.Format(_T("libagora_segmentation_extension: %d"), ret);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("libagora_segmentation_extension.dll"));
-	ret = m_rtcEngine->enableExtension("agora_segmentation", "PortraitSegmentation", true);
+	ret = m_rtcEngine->enableExtension("agora_video_filters_segmentation", "portrait_segmentation", true);
 	strInfo.Format(_T("enableExtension: %d"), ret);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("agora_segmentation"));

windows/APIExample/APIExample/Advanced/RegionConn/CAgoraRegionConnDlg.cpp

@@ -60,6 +60,13 @@ LRESULT CAgoraRegionConnDlg::OnEIDUserJoined(WPARAM wParam, LPARAM lParam)
 	CString strInfo;
 	strInfo.Format(_T("%u joined"), wParam);
 	m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
+	VideoCanvas canvas;
+	canvas.uid = wParam;
+	canvas.view = m_remoteVideoWnd.GetSafeHwnd();
+	canvas.renderMode = media::base::RENDER_MODE_FIT;
+	//setup remote video in engine to the canvas.
+	m_rtcEngine->setupRemoteVideo(canvas);
+	m_remoteVideoWnd.SetUID(wParam);
 	return TRUE;
 }
 
@@ -220,9 +227,17 @@ BOOL CAgoraRegionConnDlg::OnInitDialog()
 	m_localVideoWnd.Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, CRect(0, 0, 1, 1), this, ID_BASEWND_VIDEO + 100);
 	RECT rcArea;
 	m_staVideoArea.GetClientRect(&rcArea);
+	rcArea.right = rcArea.left + (rcArea.right - rcArea.left) / 2;
 	m_localVideoWnd.MoveWindow(&rcArea);
 	m_localVideoWnd.ShowWindow(SW_SHOW);
 
+	m_remoteVideoWnd.Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, CRect(0, 0, 1, 1), this, ID_BASEWND_VIDEO + 100);
+	RECT rcArea2;
+	m_staVideoArea.GetClientRect(&rcArea2);
+	rcArea2.left = rcArea2.left + (rcArea2.right - rcArea2.left) / 2;
+	m_remoteVideoWnd.MoveWindow(&rcArea2);
+	m_remoteVideoWnd.ShowWindow(SW_SHOW);
+
 	int nIndex = 0;
 
 	m_cmbAreaCode.InsertString(nIndex++, _T("AREA_CODE_GLOBAL"));

windows/APIExample/APIExample/Advanced/RegionConn/CAgoraRegionConnDlg.h

@@ -114,6 +114,7 @@ class CAgoraRegionConnDlg : public CDialogEx
 	bool m_initialize = false;
 	IRtcEngine* m_rtcEngine = nullptr;
 	CAGVideoWnd m_localVideoWnd;
+	CAGVideoWnd m_remoteVideoWnd;
 	CAgoraRegionConnHandler m_eventHandler;
 	std::map<CString,AREA_CODE> m_mapAreaCode;
 protected:

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

@@ -214,7 +214,7 @@ BOOL CAgoraSpatialAudioDlg::OnInitDialog()
 	m_staRemote.MoveWindow(x, y, remoteWidth, remoteWidth);
 	m_staRemote.ShowWindow(SW_SHOW);
 
-	m_audioPath = GetExePath() + _T("\\audiomixing.mp3");
+	m_audioPath = GetExePath() + _T("\\audiomixing.wav");
 
 	int deltaX = abs(rcRemote.left - rcLocal.left);
 	int deltaY = abs(rcRemote.top - rcLocal.top);