Merge pull request #213 from AgoraIO/dev/3.5.0.3

Dev/3.5.0.3

Author: xia ning

iOS/APIExample/Common/KeyCenter.swift

@@ -8,7 +8,7 @@
 
 struct KeyCenter {
     static let AppId: String = <#Your App Id#>
-    
+
     // assign token to nil if you have not enabled app certificate
     static var Token: String? = <#Temp Access Token#>
 }

windows/APIExample/APIExample/APIExample.vcxproj

@@ -129,6 +129,9 @@ if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\A
     <ManifestResourceCompile>
       <ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
     </ManifestResourceCompile>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)installThirdParty.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -338,7 +341,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
     <ClCompile Include="CSceneDialog.cpp" />
     <ClCompile Include="d3d\D3DRender.cpp" />
     <ClCompile Include="DirectShow\AGDShowAudioCapture.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="DirectShow\AGDShowVideoCapture.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

windows/APIExample/APIExample/APIExampleDlg.cpp

@@ -86,6 +86,8 @@ BEGIN_MESSAGE_MAP(CAPIExampleDlg, CDialogEx)
     //ON_MESSAGE(WM_MSGID(EID_JOINCHANNEL_SUCCESS), &CAPIExampleDlg::OnEIDJoinLeaveChannel)
     ON_NOTIFY(TVN_SELCHANGING, IDC_LIST_ADVANCED, &CAPIExampleDlg::OnSelchangingListAdvanced)
     ON_BN_CLICKED(IDC_BUTTON_DOCUMENT_WEBSITE, &CAPIExampleDlg::OnBnClickedButtonDocumentWebsite)
+	ON_WM_DESTROY()
+	ON_WM_CLOSE()
 END_MESSAGE_MAP()
 
 
@@ -671,3 +673,29 @@ BOOL CAPIExampleDlg::PreTranslateMessage(MSG* pMsg)
 	}
 	return CDialogEx::PreTranslateMessage(pMsg);
 }
+
+
+void CAPIExampleDlg::OnDestroy()
+{
+	CDialogEx::OnDestroy();
+
+	
+}
+
+
+void CAPIExampleDlg::OnClose()
+{
+	// TODO: Add your message handler code here and/or call default
+
+	CDialogEx::OnClose();
+	HTREEITEM hItem = m_lstBasicScene.GetSelectedItem();
+	if (hItem) {
+		ReleaseScene(m_lstBasicScene, hItem);
+		return;
+	}
+
+	hItem = m_lstAdvanced.GetSelectedItem();
+	if (hItem) {
+		ReleaseScene(m_lstBasicScene, hItem);
+	}
+}

windows/APIExample/APIExample/APIExampleDlg.h

@@ -101,7 +101,7 @@ class CAPIExampleDlg : public CDialogEx
     CString m_preSelectedItemText = _T("");
     std::vector<CString> m_vecBasic, m_vecAdvanced;
 
-
+	CString m_curSelectedItemText = _T("");
 
     BOOL m_bJoinChannel = FALSE;
 public:
@@ -127,5 +127,7 @@ class CAPIExampleDlg : public CDialogEx
     CButton m_btnDocWebsite;
     CStatic m_grpDoc;
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnDestroy();
+	afx_msg void OnClose();
 };
 

windows/APIExample/APIExample/Advanced/CustomAudioCapture/CAgoraCaptureAudioDlg.cpp

@@ -91,6 +91,8 @@ LRESULT CAgoraCaptureAduioDlg::OnEIDRemoteVideoStateChanged(WPARAM wParam, LPARA
 
 CAgoraCaptureAduioDlg::CAgoraCaptureAduioDlg(CWnd* pParent /*=nullptr*/)
 	: CDialogEx(IDD_DIALOG_CUSTOM_CAPTURE_AUDIO, pParent)
+	, m_capAudioInfo{48000, 2}
+	, m_renderAudioInfo {48000, 2}
 {
 	m_audioFrame.buffer = new BYTE[48000 * 4 * 4];
 }
@@ -123,6 +125,7 @@ bool CAgoraCaptureAduioDlg::InitAgora()
 	context.eventHandler = &m_eventHandler;
 	//initialize the Agora RTC engine context.  
 	int ret = m_rtcEngine->initialize(context);
+	mediaEngine.queryInterface(m_rtcEngine, agora::AGORA_IID_MEDIA_ENGINE);
 	if (ret != 0) {
 		m_initialize = false;
 		CString strInfo;
@@ -164,6 +167,8 @@ void CAgoraCaptureAduioDlg::UnInitAgora()
 		//disable video in the engine.
 		m_rtcEngine->disableVideo();
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("disableVideo"));
+		m_agAudioCaptureDevice.Stop();
+		mediaEngine->release();
 		//release engine.
 		m_rtcEngine->release(true);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
@@ -282,8 +287,6 @@ void CAgoraCaptureAduioDlg::EnableCaputre(BOOL bEnable) {
 		m_audioFrame.samplesPerSec = waveFormat.nSamplesPerSec;
 		m_audioFrame.samples = m_audioFrame.samplesPerSec / 100;
 
-		//set recording audio frame parameters in the engine.
-		m_rtcEngine->setRecordingAudioFrameParameters(waveFormat.nSamplesPerSec, waveFormat.nChannels, RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, waveFormat.nSamplesPerSec * waveFormat.nChannels / 100);
 		//create audio capture filter.
 		if (!m_agAudioCaptureDevice.CreateCaptureFilter())
 			return;
@@ -297,6 +300,15 @@ void CAgoraCaptureAduioDlg::EnableCaputre(BOOL bEnable) {
 	m_extenalCaptureAudio = !m_extenalCaptureAudio;
 }
 
+void CAgoraCaptureAduioDlg::PushAudioFrame(uint8_t* data, int size, uint64_t ts)
+{
+	if (m_extenalCaptureAudio && mediaEngine) {
+		memcpy(m_audioFrame.buffer, data, size);
+		m_audioFrame.renderTimeMs = ts;
+		mediaEngine->pushAudioFrame(&m_audioFrame);
+	}
+}
+
 void CAgoraCaptureAduioDlg::PushAudioFrameThread(CAgoraCaptureAduioDlg * self)
 {
 	agora::util::AutoPtr<agora::media::IMediaEngine> mediaEngine;
@@ -308,8 +320,7 @@ void CAgoraCaptureAduioDlg::PushAudioFrameThread(CAgoraCaptureAduioDlg * self)
 		SIZE_T nSize = self->m_audioFrame.samples * self->m_audioFrame.channels * self->m_audioFrame.bytesPerSample;
 		unsigned int readByte = 0;
 		int timestamp = 0;
-		if (!CircleBuffer::GetInstance()->readBuffer(self->m_audioFrame.buffer, nSize, &readByte, timestamp))
-		{
+		if (!CircleBuffer::GetInstance()->readBuffer(self->m_audioFrame.buffer, nSize, &readByte, timestamp)){
 			Sleep(1);
 			continue;
 		}
@@ -364,8 +375,9 @@ void CAgoraCaptureAduioDlg::OnBnClickedButtonStartCaputre()
 		EnableExtendAudioCapture(TRUE);
 		//start capture
 		EnableCaputre(TRUE);
-		CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)PushAudioFrameThread, this, 0, NULL);
+		//CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)PushAudioFrameThread, this, 0, NULL);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("use external audio source"));
+		m_agAudioCaptureDevice.SetCaptureDlg(this);
 	}
 	else {
 		m_btnSetAudioCtx.SetWindowText(customAudioCaptureCtrlSetExternlCapture);
@@ -374,6 +386,7 @@ void CAgoraCaptureAduioDlg::OnBnClickedButtonStartCaputre()
 		//stop capture.
 		EnableCaputre(FALSE);
 		m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("use inner audio source"));
+		m_agAudioCaptureDevice.SetCaptureDlg(nullptr);
 	}
 
 }

windows/APIExample/APIExample/Advanced/CustomAudioCapture/CAgoraCaptureAudioDlg.h

@@ -129,7 +129,7 @@ class CAgoraCaptureAduioDlg : public CDialogEx
 	// start or stop capture.
 	// if bEnable is true start capture otherwise stop capture.
 	void EnableCaputre(BOOL bEnable);
-
+	void PushAudioFrame(uint8_t* data, int size, uint64_t ts);
 
 
 	bool m_joinChannel = false;
@@ -138,6 +138,8 @@ class CAgoraCaptureAduioDlg : public CDialogEx
 	bool m_extenalCaptureAudio = false;
 	bool m_extenalRenderAudio = false;
     IRtcEngine* m_rtcEngine = nullptr;
+	agora::util::AutoPtr<agora::media::IMediaEngine> mediaEngine;
+	
 	CAGVideoWnd m_localVideoWnd;
     CAgoraCaptureAduioDlgEngineEventHandler		m_eventHandler;
     CAGDShowAudioCapture						m_agAudioCaptureDevice;

windows/APIExample/APIExample/DirectShow/AGDShowAudioCapture.cpp

@@ -1,8 +1,9 @@
+#include "stdafx.h"
 #include "AGDShowAudioCapture.h"
 #include "DShowHelper.h"
 #include "CircleBuffer.hpp"
 #include <Dvdmedia.h>
-
+#include "..\Advanced\CustomAudioCapture\CAgoraCaptureAudioDlg.h"
 
 
 
@@ -629,7 +630,10 @@ void CAGDShowAudioCapture::Receive(bool video, IMediaSample *sample)
     if (FAILED(sample->GetPointer(&pBuffer)))
         return;
 
-    CircleBuffer::GetInstance()->writeBuffer(pBuffer, size, GetTickCount());
+	if (dlgCapture) {
+		dlgCapture->PushAudioFrame(pBuffer, size, GetTickCount64());
+	}
+    //CircleBuffer::GetInstance()->writeBuffer(pBuffer, size, GetTickCount());
 }
 
 void CAGDShowAudioCapture::GetDeviceName(LPTSTR deviceName, SIZE_T *nDeviceLen)
@@ -707,4 +711,8 @@ BOOL CAGDShowAudioCapture::DisconnectPins()
     }
     ATLASSERT(SUCCEEDED(hr));
     return TRUE;
-}
+}
+void CAGDShowAudioCapture::SetCaptureDlg(CAgoraCaptureAduioDlg* dlg)
+{
+	dlgCapture = dlg;
+}

windows/APIExample/APIExample/DirectShow/AGDShowAudioCapture.h

@@ -5,6 +5,7 @@
 #include <DShow.h>
 #include "IAGDShowDevice.h"
 #include "capture-filter.hpp"
+class CAgoraCaptureAduioDlg;
 class CAGDShowAudioCapture
     : public IDShowCaptureDevice
 {
@@ -43,7 +44,7 @@ class CAGDShowAudioCapture
 
     virtual BOOL GetAudioCap(int nIndex, WAVEFORMATEX *lpWaveInfo);
     virtual BOOL GetCurrentAudioCap(WAVEFORMATEX *lpWaveInfo);
-
+	void SetCaptureDlg(CAgoraCaptureAduioDlg* dlg);
 protected:
     BOOL ConnectFilters();
     BOOL ConnectPins(const GUID &category, const GUID &type,
@@ -52,13 +53,14 @@ class CAGDShowAudioCapture
     void Receive(bool video, IMediaSample *sample);
     void GetDeviceName(LPTSTR deviceName, SIZE_T *nDeviceLen);
     BOOL FindPin(IPin **ppInputPin, IPin **ppOutputPin);
+	
 private:
 	TCHAR						m_szActiveDeviceID[MAX_PATH];
 	CAtlList<AGORA_DEVICE_INFO> m_listDeviceInfo;
 
 	AUDIO_STREAM_CONFIG_CAPS	m_ascStreamCfgCaps;
 	int							m_nCapSelected;
-
+	CAgoraCaptureAduioDlg*     dlgCapture = nullptr;
 	// private dshow object
 private:
 	CComPtr<IGraphBuilder>			m_ptrGraphBuilder;

windows/APIExample/APIExample/d3d/D3DRender.cpp

@@ -36,17 +36,11 @@ int D3DRender::Init(HWND hwnd, unsigned int nWidth, unsigned int nHeight, bool i
 	if (FAILED(lRet))
 		return -1;
 
-	if (isYuv) {
-		lRet = m_pDirect3DDevice->CreateOffscreenPlainSurface(nWidth, nHeight, (D3DFORMAT)'21VY', D3DPOOL_DEFAULT, &m_pDirect3DSurfaceRender, NULL);
-		if (FAILED(lRet))
-			return -1;
-	}
-	else {
-		lRet = m_pDirect3DDevice->CreateOffscreenPlainSurface(nWidth, nHeight, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &m_pDirect3DSurfaceRender, NULL);
-		if (FAILED(lRet))
-			return -1;
-	}
-
+	D3DFORMAT format = isYuv ? (D3DFORMAT)'21VY' : D3DFMT_X8R8G8B8;
+	lRet = m_pDirect3DDevice->CreateOffscreenPlainSurface(nWidth, nHeight, format, D3DPOOL_DEFAULT, &m_pDirect3DSurfaceRender, NULL);
+	if (FAILED(lRet))
+		return -1;
+	
 	m_nWidth = nWidth;
 	m_nHeight = nHeight;
 	m_bIsYuv = isYuv;

windows/APIExample/installThirdParty.bat

@@ -1,4 +1,10 @@
 cd /d %~dp0
 
+if not exist .\libs (
+    if exist ..\..\..\libs (
+        echo d | xcopy ..\..\..\libs .\libs /Y /E /Q
+    )
+)
+
 powershell.exe -command ^
   "& {set-executionpolicy Remotesigned -Scope Process; ./'install.ps1'}"