Skip to content

Commit b823f60

Browse files
author
xianing
committed
Merge remote-tracking branch 'origin/4.0.0-preview' into 4.0.0-preview
2 parents a3ac20d + 37fd21c commit b823f60

8 files changed

Lines changed: 75 additions & 69 deletions

File tree

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
274274
<ClInclude Include="Advanced\MultiVideoSource\CAgoraMutilVideoSourceDlg.h" />
275275
<ClInclude Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.h" />
276276
<ClInclude Include="Advanced\OriginalVideo\CAgoraOriginalVideoDlg.h" />
277-
<ClInclude Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.h" />
277+
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h" />
278278
<ClInclude Include="Advanced\RegionConn\CAgoraRegionConnDlg.h" />
279279
<ClInclude Include="Advanced\ReportInCall\CAgoraReportInCallDlg.h" />
280280
<ClInclude Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.h" />
@@ -317,7 +317,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
317317
<ClCompile Include="Advanced\MultiVideoSource\CAgoraMutilVideoSourceDlg.cpp" />
318318
<ClCompile Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.cpp" />
319319
<ClCompile Include="Advanced\OriginalVideo\CAgoraOriginalVideoDlg.cpp" />
320-
<ClCompile Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.cpp" />
320+
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp" />
321321
<ClCompile Include="Advanced\RegionConn\CAgoraRegionConnDlg.cpp" />
322322
<ClCompile Include="Advanced\ReportInCall\CAgoraReportInCallDlg.cpp" />
323323
<ClCompile Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.cpp" />

‎windows/APIExample/APIExample/APIExample.vcxproj.filters‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
<Filter Include="Advanced\AudioEffect">
6868
<UniqueIdentifier>{a73869e1-71be-40ec-a096-29ee6d0f789f}</UniqueIdentifier>
6969
</Filter>
70-
<Filter Include="Advanced\PerCallTest">
71-
<UniqueIdentifier>{8eb9cb1e-26e2-4f32-8400-956c9457a50b}</UniqueIdentifier>
72-
</Filter>
7370
<Filter Include="Advanced\AudioVolume">
7471
<UniqueIdentifier>{adcc6879-96dd-4408-bb97-a2e4aaa35d07}</UniqueIdentifier>
7572
</Filter>
@@ -94,6 +91,9 @@
9491
<Filter Include="Advanced\BeautyAudio">
9592
<UniqueIdentifier>{262801a0-7955-4125-99d3-8d892334588d}</UniqueIdentifier>
9693
</Filter>
94+
<Filter Include="Advanced\PreCallTest">
95+
<UniqueIdentifier>{8eb9cb1e-26e2-4f32-8400-956c9457a50b}</UniqueIdentifier>
96+
</Filter>
9797
</ItemGroup>
9898
<ItemGroup>
9999
<ClInclude Include="APIExample.h">
@@ -189,9 +189,6 @@
189189
<ClInclude Include="Advanced\AudioEffect\CAgoraEffectDlg.h">
190190
<Filter>Advanced\AudioEffect</Filter>
191191
</ClInclude>
192-
<ClInclude Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.h">
193-
<Filter>Advanced\PerCallTest</Filter>
194-
</ClInclude>
195192
<ClInclude Include="AGVideoTestWnd.h">
196193
<Filter>Header Files</Filter>
197194
</ClInclude>
@@ -219,6 +216,9 @@
219216
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h">
220217
<Filter>Advanced\BeautyAudio</Filter>
221218
</ClInclude>
219+
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h">
220+
<Filter>Advanced\PreCallTest</Filter>
221+
</ClInclude>
222222
</ItemGroup>
223223
<ItemGroup>
224224
<ClCompile Include="APIExample.cpp">
@@ -302,9 +302,6 @@
302302
<ClCompile Include="Advanced\AudioEffect\CAgoraEffectDlg.cpp">
303303
<Filter>Advanced\AudioEffect</Filter>
304304
</ClCompile>
305-
<ClCompile Include="Advanced\PerCallTest\CAgoraPerCallTestDlg.cpp">
306-
<Filter>Advanced\PerCallTest</Filter>
307-
</ClCompile>
308305
<ClCompile Include="AGVideoTestWnd.cpp">
309306
<Filter>Source Files</Filter>
310307
</ClCompile>
@@ -332,6 +329,9 @@
332329
<ClCompile Include="Advanced\BeautyAudio\CAgoraBeautyAudio.cpp">
333330
<Filter>Advanced\BeautyAudio</Filter>
334331
</ClCompile>
332+
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp">
333+
<Filter>Advanced\PreCallTest</Filter>
334+
</ClCompile>
335335
</ItemGroup>
336336
<ItemGroup>
337337
<ResourceCompile Include="APIExample.rc">

‎windows/APIExample/APIExample/APIExampleDlg.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ void CAPIExampleDlg::InitSceneDialog()
310310
m_pmediaPlayerDlg->MoveWindow(&rcWnd);
311311

312312
//per call test
313-
m_pPerCallTestDlg = new CAgoraPerCallTestDlg(&m_staMainArea);
314-
m_pPerCallTestDlg->Create(CAgoraPerCallTestDlg::IDD);
313+
m_pPerCallTestDlg = new CAgoraPreCallTestDlg(&m_staMainArea);
314+
m_pPerCallTestDlg->Create(CAgoraPreCallTestDlg::IDD);
315315
m_pPerCallTestDlg->MoveWindow(&rcWnd);
316316

317317
m_pAudioVolumeDlg = new CAgoraAudioVolumeDlg(&m_staMainArea);

‎windows/APIExample/APIExample/APIExampleDlg.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "Advanced/CustomEncrypt/CAgoraCustomEncryptDlg.h"
1818
#include "Advanced/MultiChannel/CAgoraMultiChannelDlg.h"
1919
#include "Advanced/MultiVideoSource/CAgoraMutilVideoSourceDlg.h"
20-
#include "Advanced/PerCallTest/CAgoraPerCallTestDlg.h"
20+
#include "Advanced/PreCallTest/CAgoraPreCallTestDlg.h"
2121
#include "Advanced/AudioVolume/CAgoraAudioVolumeDlg.h"
2222
#include "Advanced/ReportInCall/CAgoraReportInCallDlg.h"
2323
#include "Advanced/RegionConn/CAgoraRegionConnDlg.h"
@@ -85,7 +85,7 @@ class CAPIExampleDlg : public CDialogEx
8585
CAgoraCustomEncryptDlg *m_pCustomEncryptDlg = nullptr;
8686
CAgoraMultiChannelDlg *m_pMultiChannelDlg = nullptr;
8787
CAgoraMutilVideoSourceDlg *m_pMultiVideoSourceDlg = nullptr;
88-
CAgoraPerCallTestDlg *m_pPerCallTestDlg = nullptr;
88+
CAgoraPreCallTestDlg *m_pPerCallTestDlg = nullptr;
8989
CAgoraReportInCallDlg *m_pReportInCallDlg = nullptr;
9090
CAgoraRegionConnDlg *m_pRegionConnDlg = nullptr;
9191
CAgoraMediaEncryptDlg *m_pMediaEncrptDlg = nullptr;

windows/APIExample/APIExample/Advanced/PerCallTest/CAgoraPerCallTestDlg.cpp renamed to windows/APIExample/APIExample/Advanced/PreCallTest/CAgoraPreCallTestDlg.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#include "stdafx.h"
22
#include "APIExample.h"
3-
#include "CAgoraPerCallTestDlg.h"
3+
#include "CAgoraPreCallTestDlg.h"
44

55

66

7-
IMPLEMENT_DYNAMIC(CAgoraPerCallTestDlg, CDialogEx)
7+
IMPLEMENT_DYNAMIC(CAgoraPreCallTestDlg, CDialogEx)
88

9-
CAgoraPerCallTestDlg::CAgoraPerCallTestDlg(CWnd* pParent /*=nullptr*/)
9+
CAgoraPreCallTestDlg::CAgoraPreCallTestDlg(CWnd* pParent /*=nullptr*/)
1010
: CDialogEx(IDD_DIALOG_PERCALL_TEST, pParent)
1111
{
1212

1313
}
1414

15-
CAgoraPerCallTestDlg::~CAgoraPerCallTestDlg()
15+
CAgoraPreCallTestDlg::~CAgoraPreCallTestDlg()
1616
{
1717
}
1818

19-
void CAgoraPerCallTestDlg::DoDataExchange(CDataExchange* pDX)
19+
void CAgoraPreCallTestDlg::DoDataExchange(CDataExchange* pDX)
2020
{
2121
CDialogEx::DoDataExchange(pDX);
2222
DDX_Control(pDX, IDC_STATIC_ADUIO_INPUT, m_staAudioInput);
@@ -38,22 +38,22 @@ void CAgoraPerCallTestDlg::DoDataExchange(CDataExchange* pDX)
3838
}
3939

4040

41-
BEGIN_MESSAGE_MAP(CAgoraPerCallTestDlg, CDialogEx)
41+
BEGIN_MESSAGE_MAP(CAgoraPreCallTestDlg, CDialogEx)
4242
ON_WM_SHOWWINDOW()
43-
ON_BN_CLICKED(IDC_BUTTON_AUDIO_INPUT_TEST, &CAgoraPerCallTestDlg::OnBnClickedButtonAudioInputTest)
44-
ON_BN_CLICKED(IDC_BUTTON_AUDIO_OUTPUT_TEST, &CAgoraPerCallTestDlg::OnBnClickedButtonAudioOutputTest)
45-
ON_BN_CLICKED(IDC_BUTTON_CAMERA, &CAgoraPerCallTestDlg::OnBnClickedButtonCamera)
46-
ON_LBN_SELCHANGE(IDC_LIST_INFO_BROADCASTING, &CAgoraPerCallTestDlg::OnSelchangeListInfoBroadcasting)
47-
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_INPUT_VOL, &CAgoraPerCallTestDlg::OnReleasedcaptureSliderInputVol)
48-
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_OUTPUT_VOL, &CAgoraPerCallTestDlg::OnReleasedcaptureSliderOutputVol)
49-
ON_MESSAGE(WM_MSGID(EID_LASTMILE_PROBE_RESULT), &CAgoraPerCallTestDlg::OnEIDLastmileProbeResult)
50-
ON_MESSAGE(WM_MSGID(EID_LASTMILE_QUAILTY), &CAgoraPerCallTestDlg::OnEIDLastmileQuality)
51-
ON_MESSAGE(WM_MSGID(EID_AUDIO_VOLUME_INDICATION), &CAgoraPerCallTestDlg::OnEIDAudioVolumeIndication)
43+
ON_BN_CLICKED(IDC_BUTTON_AUDIO_INPUT_TEST, &CAgoraPreCallTestDlg::OnBnClickedButtonAudioInputTest)
44+
ON_BN_CLICKED(IDC_BUTTON_AUDIO_OUTPUT_TEST, &CAgoraPreCallTestDlg::OnBnClickedButtonAudioOutputTest)
45+
ON_BN_CLICKED(IDC_BUTTON_CAMERA, &CAgoraPreCallTestDlg::OnBnClickedButtonCamera)
46+
ON_LBN_SELCHANGE(IDC_LIST_INFO_BROADCASTING, &CAgoraPreCallTestDlg::OnSelchangeListInfoBroadcasting)
47+
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_INPUT_VOL, &CAgoraPreCallTestDlg::OnReleasedcaptureSliderInputVol)
48+
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_OUTPUT_VOL, &CAgoraPreCallTestDlg::OnReleasedcaptureSliderOutputVol)
49+
ON_MESSAGE(WM_MSGID(EID_LASTMILE_PROBE_RESULT), &CAgoraPreCallTestDlg::OnEIDLastmileProbeResult)
50+
ON_MESSAGE(WM_MSGID(EID_LASTMILE_QUAILTY), &CAgoraPreCallTestDlg::OnEIDLastmileQuality)
51+
ON_MESSAGE(WM_MSGID(EID_AUDIO_VOLUME_INDICATION), &CAgoraPreCallTestDlg::OnEIDAudioVolumeIndication)
5252
ON_WM_PAINT()
5353
END_MESSAGE_MAP()
5454

5555
//init ctrl text.
56-
void CAgoraPerCallTestDlg::InitCtrlText()
56+
void CAgoraPreCallTestDlg::InitCtrlText()
5757
{
5858
m_staVideo.SetWindowText(PerCallTestCtrlCamera);
5959
m_staAudioInput.SetWindowText(PerCallTestCtrlAudioInput);
@@ -66,7 +66,7 @@ void CAgoraPerCallTestDlg::InitCtrlText()
6666
}
6767

6868
//Initialize the Agora SDK
69-
bool CAgoraPerCallTestDlg::InitAgora()
69+
bool CAgoraPreCallTestDlg::InitAgora()
7070
{
7171
//create Agora RTC engine
7272
m_rtcEngine = createAgoraRtcEngine();
@@ -102,7 +102,7 @@ bool CAgoraPerCallTestDlg::InitAgora()
102102
return true;
103103
}
104104

105-
void CAgoraPerCallTestDlg::UnInitAgora()
105+
void CAgoraPreCallTestDlg::UnInitAgora()
106106
{
107107
if (m_rtcEngine) {
108108
//release device manager.
@@ -120,7 +120,7 @@ void CAgoraPerCallTestDlg::UnInitAgora()
120120

121121

122122
//resume status.
123-
void CAgoraPerCallTestDlg::ResumeStatus()
123+
void CAgoraPreCallTestDlg::ResumeStatus()
124124
{
125125
InitCtrlText();
126126
m_netQuality = 0;
@@ -137,7 +137,7 @@ void CAgoraPerCallTestDlg::ResumeStatus()
137137
}
138138

139139

140-
void CAgoraPerCallTestDlg::UpdateViews()
140+
void CAgoraPreCallTestDlg::UpdateViews()
141141
{
142142
char szDeviceName[1024];
143143
char szDeviceId[1024];
@@ -185,7 +185,7 @@ void CAgoraPerCallTestDlg::UpdateViews()
185185

186186

187187

188-
void CAgoraPerCallTestDlg::OnShowWindow(BOOL bShow, UINT nStatus)
188+
void CAgoraPreCallTestDlg::OnShowWindow(BOOL bShow, UINT nStatus)
189189
{
190190
CDialogEx::OnShowWindow(bShow, nStatus);
191191
if (bShow)
@@ -199,7 +199,7 @@ void CAgoraPerCallTestDlg::OnShowWindow(BOOL bShow, UINT nStatus)
199199
}
200200

201201

202-
BOOL CAgoraPerCallTestDlg::OnInitDialog()
202+
BOOL CAgoraPreCallTestDlg::OnInitDialog()
203203
{
204204
CDialogEx::OnInitDialog();
205205
RECT rcArea;
@@ -218,7 +218,7 @@ BOOL CAgoraPerCallTestDlg::OnInitDialog()
218218
}
219219

220220
//last mile quality notify
221-
LRESULT CAgoraPerCallTestDlg::OnEIDLastmileQuality(WPARAM wparam, LPARAM lparam)
221+
LRESULT CAgoraPreCallTestDlg::OnEIDLastmileQuality(WPARAM wparam, LPARAM lparam)
222222
{
223223
int quality = wparam;
224224
m_netQuality = quality;
@@ -230,14 +230,14 @@ LRESULT CAgoraPerCallTestDlg::OnEIDLastmileQuality(WPARAM wparam, LPARAM lparam)
230230
return TRUE;
231231
}
232232

233-
LRESULT CAgoraPerCallTestDlg::OnEIDLastmileProbeResult(WPARAM wparam, LPARAM lparam)
233+
LRESULT CAgoraPreCallTestDlg::OnEIDLastmileProbeResult(WPARAM wparam, LPARAM lparam)
234234
{
235235
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("OnLastmileProbeResult"));
236236
return TRUE;
237237
}
238238

239239
//audio volume indication message handler
240-
LRESULT CAgoraPerCallTestDlg::OnEIDAudioVolumeIndication(WPARAM wparam, LPARAM lparam)
240+
LRESULT CAgoraPreCallTestDlg::OnEIDAudioVolumeIndication(WPARAM wparam, LPARAM lparam)
241241
{
242242
//set audio volume to show test window.
243243
m_VideoTest.SetCurVol(wparam);
@@ -246,7 +246,7 @@ LRESULT CAgoraPerCallTestDlg::OnEIDAudioVolumeIndication(WPARAM wparam, LPARAM l
246246

247247

248248

249-
BOOL CAgoraPerCallTestDlg::PreTranslateMessage(MSG* pMsg)
249+
BOOL CAgoraPreCallTestDlg::PreTranslateMessage(MSG* pMsg)
250250
{
251251
if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_RETURN) {
252252
return TRUE;
@@ -255,7 +255,7 @@ BOOL CAgoraPerCallTestDlg::PreTranslateMessage(MSG* pMsg)
255255
}
256256

257257

258-
void CAgoraPerCallTestDlg::OnBnClickedButtonAudioInputTest()
258+
void CAgoraPreCallTestDlg::OnBnClickedButtonAudioInputTest()
259259
{
260260
int nSel = m_cmbAudioInput.GetCurSel();
261261
if (nSel < 0)return;
@@ -291,7 +291,7 @@ void CAgoraPerCallTestDlg::OnBnClickedButtonAudioInputTest()
291291

292292

293293

294-
void CAgoraPerCallTestDlg::OnBnClickedButtonAudioOutputTest()
294+
void CAgoraPreCallTestDlg::OnBnClickedButtonAudioOutputTest()
295295
{
296296
TCHAR szWavPath[MAX_PATH];
297297
int nSel = m_cmbAudioInput.GetCurSel();
@@ -327,7 +327,7 @@ void CAgoraPerCallTestDlg::OnBnClickedButtonAudioOutputTest()
327327
}
328328

329329

330-
void CAgoraPerCallTestDlg::OnBnClickedButtonCamera()
330+
void CAgoraPreCallTestDlg::OnBnClickedButtonCamera()
331331
{
332332
int nSel = m_cmbAudioInput.GetCurSel();
333333
if (nSel < 0)return;
@@ -360,7 +360,7 @@ void CAgoraPerCallTestDlg::OnBnClickedButtonCamera()
360360
}
361361

362362

363-
void CAgoraPerCallTestDlg::OnSelchangeListInfoBroadcasting()
363+
void CAgoraPreCallTestDlg::OnSelchangeListInfoBroadcasting()
364364
{
365365
int sel = m_lstInfo.GetCurSel();
366366
if (sel < 0)return;
@@ -370,7 +370,7 @@ void CAgoraPerCallTestDlg::OnSelchangeListInfoBroadcasting()
370370
}
371371

372372

373-
void CAgoraPerCallTestDlg::OnReleasedcaptureSliderInputVol(NMHDR *pNMHDR, LRESULT *pResult)
373+
void CAgoraPreCallTestDlg::OnReleasedcaptureSliderInputVol(NMHDR *pNMHDR, LRESULT *pResult)
374374
{
375375
LPNMCUSTOMDRAW pNMCD = reinterpret_cast<LPNMCUSTOMDRAW>(pNMHDR);
376376
int vol = m_sldAudioInputVol.GetPos();
@@ -380,7 +380,7 @@ void CAgoraPerCallTestDlg::OnReleasedcaptureSliderInputVol(NMHDR *pNMHDR, LRESUL
380380
}
381381

382382

383-
void CAgoraPerCallTestDlg::OnReleasedcaptureSliderOutputVol(NMHDR *pNMHDR, LRESULT *pResult)
383+
void CAgoraPreCallTestDlg::OnReleasedcaptureSliderOutputVol(NMHDR *pNMHDR, LRESULT *pResult)
384384
{
385385
LPNMCUSTOMDRAW pNMCD = reinterpret_cast<LPNMCUSTOMDRAW>(pNMHDR);
386386
int vol = m_sldAudioOutputVol.GetPos();
@@ -390,7 +390,7 @@ void CAgoraPerCallTestDlg::OnReleasedcaptureSliderOutputVol(NMHDR *pNMHDR, LRESU
390390
}
391391

392392

393-
void CAgoraPerCallTestDlg::OnPaint()
393+
void CAgoraPreCallTestDlg::OnPaint()
394394
{
395395
CPaintDC dc(this);
396396
//draw quality bitmap

windows/APIExample/APIExample/Advanced/PerCallTest/CAgoraPerCallTestDlg.h renamed to windows/APIExample/APIExample/Advanced/PreCallTest/CAgoraPreCallTestDlg.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "AGVideoTestWnd.h"
33

4-
class CAgoraPerCallTestEvnetHandler :public IRtcEngineEventHandler
4+
class CAgoraPreCallTestEvnetHandler :public IRtcEngineEventHandler
55
{
66
public:
77
void SetMsgReceiver(HWND hWnd) { m_hMsgHanlder = hWnd; }
@@ -62,13 +62,13 @@ class CAgoraPerCallTestEvnetHandler :public IRtcEngineEventHandler
6262
};
6363

6464

65-
class CAgoraPerCallTestDlg : public CDialogEx
65+
class CAgoraPreCallTestDlg : public CDialogEx
6666
{
67-
DECLARE_DYNAMIC(CAgoraPerCallTestDlg)
67+
DECLARE_DYNAMIC(CAgoraPreCallTestDlg)
6868

6969
public:
70-
CAgoraPerCallTestDlg(CWnd* pParent = nullptr);
71-
virtual ~CAgoraPerCallTestDlg();
70+
CAgoraPreCallTestDlg(CWnd* pParent = nullptr);
71+
virtual ~CAgoraPreCallTestDlg();
7272

7373
enum { IDD = IDD_DIALOG_PERCALL_TEST };
7474

@@ -90,7 +90,7 @@ class CAgoraPerCallTestDlg : public CDialogEx
9090
CImageList m_imgNetQuality;
9191
int m_netQuality;
9292
CAGVideoTestWnd m_VideoTest;
93-
CAgoraPerCallTestEvnetHandler m_eventHandler;
93+
CAgoraPreCallTestEvnetHandler m_eventHandler;
9494
AAudioDeviceManager * m_audioDeviceManager;
9595
AVideoDeviceManager * m_videoDeviceManager;
9696
std::map<CString, std::string> m_mapAudioInput;

0 commit comments

Comments
 (0)