Skip to content

[feat]4.6.0 windows #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev/4.6.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 42 additions & 4 deletions windows/APIExample/APIExample/APIExample.rc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// 中文(简体,中国) resources
// 锟斤拷锟斤拷(锟斤拷锟藉,锟叫癸拷) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
Expand Down Expand Up @@ -839,6 +839,44 @@ BEGIN
CONTROL "",IDC_SLIDER__SHAPE_AREA_INTENSITY,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,346,35,100,15
END

IDD_DIALOG_MULTIPATH DIALOGEX 0, 0, 632, 400
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Role:",IDC_STATIC_ROLE,14,14,25,8
COMBOBOX IDC_COMBO_ROLE,45,12,80,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Channel:",IDC_STATIC_CHANNELNAME,14,35,35,8
EDITTEXT IDC_EDIT_CHANNELNAME,55,33,100,14,ES_AUTOHSCROLL
PUSHBUTTON "Join Channel",IDC_BUTTON_JOINCHANNEL,170,32,70,16
LTEXT "Multipath Mode:",IDC_STATIC_MULTIPATH_MODE,14,56,60,8
COMBOBOX IDC_COMBO_MULTIPATH_MODE,80,54,80,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Enable Multipath:",IDC_STATIC_ENABLE_MULTIPATH,170,56,60,8
CONTROL "",IDC_CHECK_ENABLE_MULTIPATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,55,15,10
CONTROL "",IDC_STATIC_VIDEO,"Static",SS_BLACKFRAME,14,80,400,200
LISTBOX IDC_LIST_INFO_MULTIPATH,430,80,180,200,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END

IDD_DIALOG_SIMULCAST DIALOGEX 0, 0, 632, 400
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "",IDC_STATIC_VIDEO,0,0,483,283
LISTBOX IDC_LIST_INFO_SIMULCAST,495,0,137,283,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_ROLE,52,323,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Client Role",IDC_STATIC_ROLE,7,324,41,10
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,16,298,48,8
EDITTEXT IDC_EDIT_CHANNELNAME,75,296,129,12,ES_AUTOHSCROLL
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,211,295,50,14

LTEXT "Simulcast Layers:",IDC_STATIC_LAYER_TITLE,130,324,70,8
CONTROL "Layer 1 (High)",IDC_CHECK_LAYER1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,320,70,10
CONTROL "Layer 2 (Medium)",IDC_CHECK_LAYER2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,290,320,80,10
CONTROL "Layer 3 (Low)",IDC_CHECK_LAYER3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,335,70,10
CONTROL "Layer 4 (Ultra Low)",IDC_CHECK_LAYER4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,290,335,80,10

LTEXT "Select Layer:",IDC_STATIC_LAYER_SELECT,130,324,50,8
COMBOBOX IDC_COMBO_LAYER_SELECT,190,322,80,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END

/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -1374,12 +1412,12 @@ IDR_TEST_WAVE WAVE "res\\ID_TEST_AUDIO.wav"

IDR_WAVE1 WAVE "res\\audiomixing.wav"

#endif // 中文(简体,中国) resources
#endif // 锟斤拷锟斤拷(锟斤拷锟藉,锟叫癸拷) resources
/////////////////////////////////////////////////////////////////////////////


/////////////////////////////////////////////////////////////////////////////
// 英语(美国) resources
// 英锟斤拷(锟斤拷锟斤拷) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
Expand Down Expand Up @@ -1505,7 +1543,7 @@ BEGIN
IDS_ABOUTBOX "&About APIExample..."
END

#endif // 英语(美国) resources
#endif // 英锟斤拷(锟斤拷锟斤拷) resources
/////////////////////////////////////////////////////////////////////////////


Expand Down
8 changes: 8 additions & 0 deletions windows/APIExample/APIExample/APIExample.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,12 @@ if exist $(SolutionDir)APIExample\res\hdr_1280_720.yuv (copy $(SolutionDir)APIEx
<ClInclude Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.h" />
<ClInclude Include="Advanced\AudioProfile\CAgoraAudioProfile.h" />
<ClInclude Include="Advanced\AudioVolume\CAgoraAudioVolumeDlg.h" />
<ClInclude Include="Advanced\Beauty2.0\CDlgBeauty2.0.h" />
<ClInclude Include="Advanced\Beauty2.0\CDlgBeautyEx2.0.h" />
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h" />
<ClInclude Include="Advanced\Beauty\CDlgBeauty.h" />
<ClCompile Include="Advanced\Beauty2.0\CDlgBeauty2.0.cpp" />
<ClCompile Include="Advanced\Beauty2.0\CDlgBeautyEx2.0.cpp" />
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp" />
<ClInclude Include="Advanced\Beauty\CDlgBeautyEx.h" />
<ClInclude Include="Advanced\CustomAudioCapture\CAgoraCaptureAudioDlg.h" />
Expand All @@ -294,6 +298,7 @@ if exist $(SolutionDir)APIExample\res\hdr_1280_720.yuv (copy $(SolutionDir)APIEx
<ClInclude Include="Advanced\MediaRecorder\CAgoraMediaRecorder.h" />
<ClInclude Include="Advanced\Metadata\CAgoraMetaDataDlg.h" />
<ClInclude Include="Advanced\MultiChannel\CAgoraMultiChannelDlg.h" />
<ClInclude Include="Advanced\Multipath\CMultipathDlg.h" />
<ClInclude Include="Advanced\MultiVideoSourceTracks\MultiVideoSourceTracks.h" />
<ClInclude Include="Advanced\MultiVideoSource\CAgoraMutilVideoSourceDlg.h" />
<ClInclude Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.h" />
Expand All @@ -306,6 +311,7 @@ if exist $(SolutionDir)APIExample\res\hdr_1280_720.yuv (copy $(SolutionDir)APIEx
<ClInclude Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.h" />
<ClInclude Include="Advanced\RTMPStream\AgoraRtmpStreaming.h" />
<ClInclude Include="Advanced\ScreenShare\AgoraScreenCapture.h" />
<ClInclude Include="Advanced\Simulcast\CSimulcastDlg.h" />
<ClInclude Include="Advanced\SpatialAudio\CAgoraSpatialAudioDlg.h" />
<ClInclude Include="Advanced\TransparentBg\TransparentBgDialog.h" />
<ClInclude Include="AGVideoTestWnd.h" />
Expand Down Expand Up @@ -351,6 +357,7 @@ if exist $(SolutionDir)APIExample\res\hdr_1280_720.yuv (copy $(SolutionDir)APIEx
<ClCompile Include="Advanced\MediaRecorder\CAgoraMediaRecorder.cpp" />
<ClCompile Include="Advanced\Metadata\CAgoraMetaDataDlg.cpp" />
<ClCompile Include="Advanced\MultiChannel\CAgoraMultiChannelDlg.cpp" />
<ClCompile Include="Advanced\Multipath\CMultipathDlg.cpp" />
<ClCompile Include="Advanced\MultiVideoSourceTracks\MultiVideoSourceTracks.cpp" />
<ClCompile Include="Advanced\MultiVideoSource\CAgoraMutilVideoSourceDlg.cpp" />
<ClCompile Include="Advanced\OriginalAudio\CAgoraOriginalAudioDlg.cpp" />
Expand All @@ -363,6 +370,7 @@ if exist $(SolutionDir)APIExample\res\hdr_1280_720.yuv (copy $(SolutionDir)APIEx
<ClCompile Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.cpp" />
<ClCompile Include="Advanced\RTMPStream\AgoraRtmpStreaming.cpp" />
<ClCompile Include="Advanced\ScreenShare\AgoraScreenCapture.cpp" />
<ClCompile Include="Advanced\Simulcast\CSimulcastDlg.cpp" />
<ClCompile Include="Advanced\SpatialAudio\CAgoraSpatialAudioDlg.cpp" />
<ClCompile Include="Advanced\TransparentBg\TransparentBgDialog.cpp" />
<ClCompile Include="AGVideoTestWnd.cpp" />
Expand Down
39 changes: 39 additions & 0 deletions windows/APIExample/APIExample/APIExample.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@
<Filter Include="Advanced\TransparentBg">
<UniqueIdentifier>{2a74c488-9982-4577-8594-8320c71beb6d}</UniqueIdentifier>
</Filter>
<Filter Include="Advanced\Beauty2.0">
<UniqueIdentifier>{221f9de2-f7b5-4d9f-8275-a660d1259cf0}</UniqueIdentifier>
</Filter>
<Filter Include="Advanced\Multipath">
<UniqueIdentifier>{97807267-2591-43c9-b24c-03042bf71158}</UniqueIdentifier>
</Filter>
<Filter Include="Advanced\Simulcast">
<UniqueIdentifier>{3be0c114-2815-4e14-885d-a666411338db}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="APIExample.h">
Expand Down Expand Up @@ -282,6 +291,18 @@
<ClInclude Include="Advanced\Beauty\CDlgBeautyEx.h">
<Filter>Advanced\Beauty</Filter>
</ClInclude>
<ClInclude Include="Advanced\Beauty2.0\CDlgBeauty2.0.h">
<Filter>Advanced\Beauty2.0</Filter>
</ClInclude>
<ClInclude Include="Advanced\Beauty2.0\CDlgBeautyEx2.0.h">
<Filter>Advanced\Beauty2.0</Filter>
</ClInclude>
<ClInclude Include="Advanced\Multipath\CMultipathDlg.h">
<Filter>Advanced\Multipath</Filter>
</ClInclude>
<ClInclude Include="Advanced\Simulcast\CSimulcastDlg.h">
<Filter>Advanced\Simulcast</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="APIExample.cpp">
Expand Down Expand Up @@ -440,6 +461,24 @@
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Advanced\Beauty2.0\CDlgBeauty2.0.cpp">
<Filter>Advanced\Beauty2.0</Filter>
</ClCompile>
<ClCompile Include="Advanced\Beauty2.0\CDlgBeautyEx2.0.cpp">
<Filter>Advanced\Beauty2.0</Filter>
</ClCompile>
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Advanced\Multipath\CMultipathDlg.cpp">
<Filter>Advanced\Multipath</Filter>
</ClCompile>
<ClCompile Include="Advanced\Simulcast\CSimulcastDlg.cpp">
<Filter>Advanced\Simulcast</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="APIExample.rc">
Expand Down
42 changes: 41 additions & 1 deletion windows/APIExample/APIExample/APIExampleDlg.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// APIExampleDlg.cpp : implementation file
//

Expand Down Expand Up @@ -250,6 +249,7 @@ void CAPIExampleDlg::InitSceneDialog()
m_vecAdvanced.push_back(advancedMediaEncrypt);
m_vecAdvanced.push_back(AdvancedLocalVideoTranscoding);
m_vecAdvanced.push_back(beautyFace);
m_vecAdvanced.push_back(beautyFace2);
m_vecAdvanced.push_back(advancedBeautyAudio);
m_vecAdvanced.push_back(SpatialAudio);
m_pMultiChannelDlg = new CAgoraMultiChannelDlg(&m_staMainArea);
Expand All @@ -259,6 +259,8 @@ void CAPIExampleDlg::InitSceneDialog()
//transparent bg
m_vecAdvanced.push_back(TransparentBackground);
m_vecAdvanced.push_back(RteUrlPlayer);
m_vecAdvanced.push_back(Multipath);
m_vecAdvanced.push_back(advancedSimulcast);

//inject
m_pRtmpInjectDlg = new CAgoraRtmpInjectionDlg(&m_staMainArea);
Expand Down Expand Up @@ -374,6 +376,10 @@ void CAPIExampleDlg::InitSceneDialog()
m_pDlgBeauty->Create(CDlgBeauty::IDD);
m_pDlgBeauty->MoveWindow(&rcWnd);

m_pDlgBeauty2 = new CDlgBeauty2(&m_staMainArea);
m_pDlgBeauty2->Create(CDlgBeauty2::IDD);
m_pDlgBeauty2->MoveWindow(&rcWnd);


// spatial audio
m_pSpatialAudioDlg = new CAgoraSpatialAudioDlg(&m_staMainArea);
Expand Down Expand Up @@ -401,6 +407,16 @@ void CAPIExampleDlg::InitSceneDialog()
m_RtePlayer = new CRtePlayerDlg(&m_staMainArea);
m_RtePlayer->Create(CRtePlayerDlg::IDD);
m_RtePlayer->MoveWindow(&rcWnd);

// mulit path
m_pMultipathDlg = new CMultipathDlg(&m_staMainArea);
m_pMultipathDlg->Create(CMultipathDlg::IDD);
m_pMultipathDlg->MoveWindow(&rcWnd);

// simulcast
m_pSimulcastDlg = new CSimulcastDlg(&m_staMainArea);
m_pSimulcastDlg->Create(CSimulcastDlg::IDD);
m_pSimulcastDlg->MoveWindow(&rcWnd);

}

Expand Down Expand Up @@ -640,6 +656,10 @@ void CAPIExampleDlg::CreateScene(CTreeCtrl& treeScene, CString selectedText)
m_pDlgBeauty->InitAgora();
m_pDlgBeauty->ShowWindow(SW_SHOW);
}
else if (selectedText.Compare(beautyFace2) == 0) {
m_pDlgBeauty2->InitAgora();
m_pDlgBeauty2->ShowWindow(SW_SHOW);
}
else if (selectedText.Compare(SpatialAudio) == 0) {
m_pSpatialAudioDlg->InitAgora();
m_pSpatialAudioDlg->ShowWindow(SW_SHOW);
Expand All @@ -656,6 +676,14 @@ void CAPIExampleDlg::CreateScene(CTreeCtrl& treeScene, CString selectedText)
m_RtePlayer->InitAgora();
m_RtePlayer->ShowWindow(SW_SHOW);
}
else if (selectedText.Compare(Multipath) == 0) {
m_pMultipathDlg->InitAgora();
m_pMultipathDlg->ShowWindow(SW_SHOW);
}
else if (selectedText.Compare(advancedSimulcast) == 0) {
m_pSimulcastDlg->InitAgora();
m_pSimulcastDlg->ShowWindow(SW_SHOW);
}

//Sleep(500);
}
Expand Down Expand Up @@ -777,6 +805,10 @@ void CAPIExampleDlg::ReleaseScene(CTreeCtrl& treeScene, HTREEITEM& hSelectItem)
m_pDlgBeauty->UnInitAgora();
m_pDlgBeauty->ShowWindow(SW_HIDE);
}
else if (str.Compare(beautyFace2) == 0) {
m_pDlgBeauty2->UnInitAgora();
m_pDlgBeauty2->ShowWindow(SW_HIDE);
}
else if (str.Compare(SpatialAudio) == 0) {
m_pSpatialAudioDlg->UnInitAgora();
m_pSpatialAudioDlg->ShowWindow(SW_HIDE);
Expand All @@ -793,6 +825,14 @@ void CAPIExampleDlg::ReleaseScene(CTreeCtrl& treeScene, HTREEITEM& hSelectItem)
m_RtePlayer->UnInitAgora();
m_RtePlayer->ShowWindow(SW_HIDE);
}
else if (str.Compare(Multipath) == 0) {
m_pMultipathDlg->UnInitAgora();
m_pMultipathDlg->ShowWindow(SW_HIDE);
}
else if (str.Compare(advancedSimulcast) == 0) {
m_pSimulcastDlg->UnInitAgora();
m_pSimulcastDlg->ShowWindow(SW_HIDE);
}
//Sleep(500);
}

Expand Down
6 changes: 6 additions & 0 deletions windows/APIExample/APIExample/APIExampleDlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "Advanced/MediaPlayer/CAgoraMediaPlayer.h"
#include "Advanced/LocalVideoTranscoding/CLocalVideoTranscodingDlg.h"
#include "Advanced/Beauty/CDlgBeauty.h"
#include "Advanced/Beauty2.0/CDlgBeauty2.0.h"
#include "Advanced/BeautyAudio/CAgoraBeautyAudio.h"
#include "Advanced/SpatialAudio/CAgoraSpatialAudioDlg.h"
#include "Advanced/MediaRecorder/CAgoraMediaRecorder.h"
Expand All @@ -36,6 +37,8 @@
#include "Advanced/TransparentBg/TransparentBgDialog.h"
#include "Advanced/RtePlayer/RtePlayerDlg.h"
#include "Advanced/CrossChannel/CAgoraCrossChannelDlg.h"
#include "Advanced/Multipath/CMultipathDlg.h"
#include "Advanced/Simulcast/CSimulcastDlg.h"
#include <mutex>
#include <vector>
#include <map>
Expand Down Expand Up @@ -111,7 +114,10 @@ class CAPIExampleDlg : public CDialogEx
MultiVideoSourceTracks *m_pMultiVideoSourceTracks = nullptr;
CAgoraFaceCaptureDlg *m_pAgoraFaceCaptureDlg = nullptr;
CAgoraCrossChannelDlg *m_pAgoraCrossChannelDlg = nullptr;
CMultipathDlg *m_pMultipathDlg = nullptr;
CSimulcastDlg *m_pSimulcastDlg = nullptr;
CDlgBeauty * m_pDlgBeauty = nullptr;
CDlgBeauty2 * m_pDlgBeauty2 = nullptr;
CTransparentBgDlg* m_TransparentDlg = nullptr;
CRtePlayerDlg* m_RtePlayer = nullptr;
CString m_preSelectedItemText = _T("");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void CAgoraEffectDlg::UnInitAgora()
m_rtcEngine->disableVideo();
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("disableVideo"));
//release engine.
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
m_rtcEngine = NULL;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void CAgoraAudioMixingDlg::UnInitAgora()
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("disableVideo"));
//release engine.
if (m_initialize) {
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
}
m_rtcEngine = NULL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void CAgoraAudioProfile::UnInitAgora()
// release engine.
if (m_initialize)
{
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
}
m_rtcEngine = NULL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void CAgoraAudioVolumeDlg::UnInitAgora()
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("disableVideo"));
//release engine.
if (m_initialize) {
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
}
m_rtcEngine = NULL;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void CAgoraBeautyDlg::UnInitAgora()
m_rtcEngine->disableVideo();
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("disableVideo"));
//release engine.
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
m_rtcEngine = NULL;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void CDlgBeauty::UnInitAgora()

//release engine.
if (m_initialize) {
m_rtcEngine->release(true);
m_rtcEngine->release(nullptr);
m_lstInfo.InsertString(m_lstInfo.GetCount(), _T("release rtc engine"));
}

Expand Down
Loading
Loading