feat: support new startPreview

Author: plutoless

windows/APIExample/APIExample/Advanced/MultiCamera/CMultiCameraDlg.cpp

@@ -339,7 +339,7 @@ void CMultiCameraDlg::UnInitAgora()
 		if (m_bStartCapture2)
 			m_rtcEngine->stopSecondaryCameraCapture();
 		if (m_bStartCapture1)
-			m_rtcEngine->stopPreview();
+			m_rtcEngine->stopPreview(VIDEO_SOURCE_CAMERA_PRIMARY);
 
 		if (m_bScecondJoin) {
 			//stop secondary camera capture
@@ -522,7 +522,7 @@ void CMultiCameraDlg::OnBnClickedButtonCamera1()
 		m_rtcEngine->setupLocalVideo(canvas);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("setupLocalVideo primary camera"));
 		//startPreview
-		m_rtcEngine->startPreview();
+		m_rtcEngine->startPreview(VIDEO_SOURCE_CAMERA_PRIMARY);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("startpreview primary camera"));
 		//show video wnds
 		ShowVideoWnds();

windows/APIExample/APIExample/Advanced/MultiVideoSource/CAgoraMutilVideoSourceDlg.cpp

@@ -104,7 +104,7 @@ void CAgoraMutilVideoSourceDlg::UnInitAgora()
 		}
 		m_bPublishScreen = false;
 		//stop preview in the engine.
-		m_rtcEngine->stopPreview();
+		m_rtcEngine->stopPreview(VIDEO_SOURCE_CAMERA_PRIMARY);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("stopPreview"));
 		//disable video in the engine.
 		m_rtcEngine->disableVideo();
@@ -239,7 +239,7 @@ void CAgoraMutilVideoSourceDlg::OnBnClickedButtonJoinchannel()
 		optionsCamera.publishCameraTrack = true;
 		optionsCamera.publishScreenTrack = false;
 		optionsCamera.clientRoleType = CLIENT_ROLE_BROADCASTER;
-		m_rtcEngine->startPreview();
+		m_rtcEngine->startPreview(VIDEO_SOURCE_CAMERA_PRIMARY);
 
 		//join channel in the engine.
 		if (0 == m_rtcEngine->joinChannel(APP_TOKEN, szChannelId.data(), 0, optionsCamera)) {
@@ -280,7 +280,7 @@ void CAgoraMutilVideoSourceDlg::OnBnClickedButtonPublish()
 		eventHandlerScreen.SetConnectionId(10086);
 		eventHandlerScreen.SetMsgReceiver(GetSafeHwnd());
 		m_rtcEngine->joinChannelEx(APP_TOKEN, connection, options, &eventHandlerScreen);//updateChannelMediaOptionsEx(options, connection);
-		m_rtcEngine->startPreview();
+		m_rtcEngine->startPreview(VIDEO_SOURCE_SCREEN_PRIMARY);
 		VideoCanvas canvas;
 		canvas.uid = 0;
 		canvas.sourceType = VIDEO_SOURCE_SCREEN_PRIMARY;
@@ -298,7 +298,7 @@ void CAgoraMutilVideoSourceDlg::OnBnClickedButtonPublish()
 		options.publishCameraTrack = false;
 		options.clientRoleType = CLIENT_ROLE_BROADCASTER;
 		//m_rtcEngine->updateChannelMediaOptionsEx(options, connection);
-		m_rtcEngine->stopPreview();
+		m_rtcEngine->stopPreview(VIDEO_SOURCE_SCREEN_PRIMARY);
 		m_rtcEngine->leaveChannelEx(connection);
 		m_btnPublish.SetWindowText(MultiVideoSourceCtrlPublish);
 		m_videoWnds[1].Invalidate();

windows/APIExample/APIExample/Advanced/OriginalAudio/CAgoraOriginalAudioDlg.cpp

@@ -121,6 +121,11 @@ bool COriginalAudioProcFrameObserver::onPlaybackAudioFrameBeforeMixing(const cha
 {
 	return true;
 }
+
+bool COriginalAudioProcFrameObserver::onEarMonitoringAudioFrame(AudioFrame& audioFrame)
+{
+	return true;
+}
 //Initialize the Ctrl Text.
 void CAgoraOriginalAudioDlg::InitCtrlText()
 {

windows/APIExample/APIExample/Advanced/OriginalAudio/CAgoraOriginalAudioDlg.h

@@ -74,6 +74,7 @@ class COriginalAudioProcFrameObserver :
 	*/
 	virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, media::base::user_id_t uid, AudioFrame& audioFrame)override;
 	virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, rtc::uid_t uid, AudioFrame& audioFrame) override;
+	virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override;
 };