Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit bee51fe

Browse files
CLuChengCLuCheng
committed
add audio effect.
1 parent 75cb4b6 commit bee51fe

15 files changed

Lines changed: 1253 additions & 10 deletions

‎windows/APIExample/APIExample/APIExample.rc‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,20 +358,20 @@ BEGIN
358358
LTEXT "",IDC_STATIC_VIDEO,1,0,483,310,NOT WS_VISIBLE
359359
LISTBOX IDC_LIST_INFO_BROADCASTING,491,0,139,312,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
360360
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,11,328,48,8
361-
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,226,13,ES_AUTOHSCROLL
361+
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,228,13,ES_AUTOHSCROLL
362362
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,60,14
363363
LTEXT "width",IDC_STATIC_VIDEO_WIDTH,11,352,48,8
364364
PUSHBUTTON "Set AudioProfile",IDC_BUTTON_SET_VIDEO_PROFILE,307,361,60,14
365365
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
366366
LTEXT "height",IDC_STATIC_VIDEO_HEIGHT,109,352,48,8
367367
EDITTEXT IDC_EDIT_VIDEO_WIDTH,43,350,58,13,ES_AUTOHSCROLL
368368
EDITTEXT IDC_EDIT_VIDEO_HEIGHT,139,350,58,13,ES_AUTOHSCROLL
369-
LTEXT "fps",IDC_STATIC_VIDEO_FPS,208,352,48,8
369+
LTEXT "fps",IDC_STATIC_VIDEO_FPS,202,352,48,8
370370
LTEXT "bitrate",IDC_STATIC_VIDEO_BITRATE,11,368,48,8
371371
EDITTEXT IDC_EDIT_VIDEO_BITRATE,43,367,58,13,ES_AUTOHSCROLL
372372
LTEXT "bitrate",IDC_STATIC_VIDEO_DEGRADATION_PREFERENCE,109,368,48,8
373373
COMBOBOX IDC_COMBO_DEGRADATION_PREFERENCE,163,367,91,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
374-
COMBOBOX IDC_COMBO_FPS,226,350,71,40,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
374+
COMBOBOX IDC_COMBO_FPS,220,350,79,40,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
375375
END
376376

377377
IDD_DIALOG_MEDIA_ENCRYPT DIALOGEX 0, 0, 632, 400
@@ -407,6 +407,43 @@ BEGIN
407407
COMBOBOX IDC_COMBO_CAPTURE_VIDEO_TYPE,225,353,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
408408
END
409409

410+
IDD_DIALOG_AUDIO_EFFECT DIALOGEX 0, 0, 632, 400
411+
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
412+
FONT 8, "MS Shell Dlg", 400, 0, 0x1
413+
BEGIN
414+
LTEXT "",IDC_STATIC_VIDEO,1,0,483,310,NOT WS_VISIBLE
415+
LISTBOX IDC_LIST_INFO_BROADCASTING,491,0,139,312,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
416+
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,11,328,48,8
417+
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
418+
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,328,60,14
419+
LTEXT "effect path",IDC_STATIC_AUDIO_EFFECT_PATH,11,346,48,8
420+
PUSHBUTTON "Add Effect",IDC_BUTTON_ADD_EFFECT,307,347,60,14
421+
LTEXT "",IDC_STATIC_DETAIL,508,324,122,58
422+
EDITTEXT IDC_EDIT_AUDIO_EFFECT_PATH,71,346,218,13,ES_AUTOHSCROLL
423+
LTEXT "repeat times",IDC_STATIC_AUDIO_REPEAT,11,384,47,8
424+
EDITTEXT IDC_EDIT_AUDIO_REPEAT_TIMES,59,383,44,13,ES_AUTOHSCROLL
425+
LTEXT "gain",IDC_STATIC_AUDIO_AGIN,109,384,18,8
426+
CONTROL "",IDC_SPIN_AGIN,"msctls_updown32",UDS_ARROWKEYS,152,382,10,13
427+
EDITTEXT IDC_EDIT_AUDIO_AGIN,126,383,26,13,ES_AUTOHSCROLL | ES_READONLY
428+
LTEXT "pitch",IDC_STATIC_AUDIO_PITCH,166,384,18,8
429+
CONTROL "",IDC_SPIN_PITCH,"msctls_updown32",UDS_ARROWKEYS,209,382,10,14
430+
EDITTEXT IDC_EDIT_AUDIO_PITCH,183,383,26,14,ES_AUTOHSCROLL | ES_READONLY
431+
COMBOBOX IDC_COMBO_PAN,240,383,34,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
432+
CONTROL "publish",IDC_CHK_PUBLISH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,281,385,38,10
433+
LTEXT "effect",IDC_STATIC_AUDIO_EFFECT,11,364,48,8
434+
COMBOBOX IDC_COMBO2,71,364,218,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
435+
PUSHBUTTON "Remove Effect",IDC_BUTTON_REMOVE,307,364,60,14
436+
PUSHBUTTON "preload",IDC_BUTTON_PRELOAD,377,328,60,14
437+
PUSHBUTTON "play",IDC_BUTTON_PLAY_EFFECT,322,382,60,14
438+
PUSHBUTTON "Pause Effect",IDC_BUTTON_PAUSE_EFFECT,384,383,60,14
439+
PUSHBUTTON "Pause All Effect",IDC_BUTTON_PAUSE_ALL_EFFECT,377,347,60,14
440+
PUSHBUTTON "unPreload",IDC_BUTTON_UNLOAD_EFFECT,441,328,60,14
441+
PUSHBUTTON "Resume Effect",IDC_BUTTON_RESUME_EFFECT,446,383,60,14
442+
PUSHBUTTON "Stop All Effect",IDC_BUTTON_STOP_ALL_EFFECT2,441,347,60,14
443+
LTEXT "pan",IDC_STATIC_AUDIO_PAN,221,384,18,8
444+
PUSHBUTTON "Stop Effect",IDC_BUTTON_STOP_EFFECT,377,364,60,14
445+
END
446+
410447

411448
/////////////////////////////////////////////////////////////////////////////
412449
//
@@ -524,6 +561,12 @@ BEGIN
524561
RIGHTMARGIN, 630
525562
BOTTOMMARGIN, 397
526563
END
564+
565+
IDD_DIALOG_AUDIO_EFFECT, DIALOG
566+
BEGIN
567+
RIGHTMARGIN, 630
568+
BOTTOMMARGIN, 397
569+
END
527570
END
528571
#endif // APSTUDIO_INVOKED
529572

@@ -623,6 +666,11 @@ BEGIN
623666
0
624667
END
625668

669+
IDD_DIALOG_AUDIO_EFFECT AFX_DIALOG_LAYOUT
670+
BEGIN
671+
0
672+
END
673+
626674
#endif // ����(���壬�й�) resources
627675
/////////////////////////////////////////////////////////////////////////////
628676

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
248248
</Manifest>
249249
</ItemDefinitionGroup>
250250
<ItemGroup>
251+
<ClInclude Include="Advanced\AudioEffect\CAgoraEffectDlg.h" />
251252
<ClInclude Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.h" />
252253
<ClInclude Include="Advanced\AudioProfile\CAgoraAudioProfile.h" />
253254
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h" />
@@ -293,6 +294,7 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
293294
<ClInclude Include="targetver.h" />
294295
</ItemGroup>
295296
<ItemGroup>
297+
<ClCompile Include="Advanced\AudioEffect\CAgoraEffectDlg.cpp" />
296298
<ClCompile Include="Advanced\AudioMixing\CAgoraAudioMixingDlg.cpp" />
297299
<ClCompile Include="Advanced\AudioProfile\CAgoraAudioProfile.cpp" />
298300
<ClCompile Include="Advanced\BeautyAudio\CAgoraBeautyAudio.cpp" />

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<Filter Include="dsound">
8686
<UniqueIdentifier>{c384154e-d846-404d-a20c-48ff01c2c11a}</UniqueIdentifier>
8787
</Filter>
88+
<Filter Include="Advanced\AudioEffect">
89+
<UniqueIdentifier>{e1683efe-8fbe-45b1-a676-ffecc6a0aeb0}</UniqueIdentifier>
90+
</Filter>
8891
</ItemGroup>
8992
<ItemGroup>
9093
<ClInclude Include="APIExample.h">
@@ -216,6 +219,9 @@
216219
<ClInclude Include="dsound\DSoundRender.h">
217220
<Filter>dsound</Filter>
218221
</ClInclude>
222+
<ClInclude Include="Advanced\AudioEffect\CAgoraEffectDlg.h">
223+
<Filter>Advanced\AudioEffect</Filter>
224+
</ClInclude>
219225
</ItemGroup>
220226
<ItemGroup>
221227
<ClCompile Include="APIExample.cpp">
@@ -323,6 +329,9 @@
323329
<ClCompile Include="DSoundRender.cpp">
324330
<Filter>dsound</Filter>
325331
</ClCompile>
332+
<ClCompile Include="Advanced\AudioEffect\CAgoraEffectDlg.cpp">
333+
<Filter>Advanced\AudioEffect</Filter>
334+
</ClCompile>
326335
</ItemGroup>
327336
<ItemGroup>
328337
<ResourceCompile Include="APIExample.rc">

‎windows/APIExample/APIExample/APIExampleDlg.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ void CAPIExampleDlg::InitSceneDialog()
220220
m_vecAdvanced.push_back(advancedBeautyAudio);
221221
m_vecAdvanced.push_back(advancedAudioProfile);
222222
m_vecAdvanced.push_back(advancedAudioMixing);
223+
m_vecAdvanced.push_back(advancedAudioEffect);
223224
m_vecAdvanced.push_back(advancedCustomVideoCapture);
224225
m_vecAdvanced.push_back(advancedMediaIOCustomVideoCapture);
225226
m_vecAdvanced.push_back(advancedOriginalVideo);
@@ -274,6 +275,11 @@ void CAPIExampleDlg::InitSceneDialog()
274275
m_pAudioMixingDlg->Create(CAgoraAudioMixingDlg::IDD);
275276
m_pAudioMixingDlg->MoveWindow(&rcWnd);
276277

278+
//audio effect
279+
m_pAudioEffectDlg = new CAgoraEffectDlg(&m_staMainArea);
280+
m_pAudioEffectDlg->Create(CAgoraEffectDlg::IDD);
281+
m_pAudioEffectDlg->MoveWindow(&rcWnd);
282+
277283
//custom video capture
278284
m_pCaputreVideoDlg = new CAgoraCaptureVideoDlg(&m_staMainArea);
279285
m_pCaputreVideoDlg->Create(CAgoraCaptureVideoDlg::IDD);
@@ -493,6 +499,9 @@ void CAPIExampleDlg::CreateScene(CTreeCtrl& treeScene, CString selectedText)
493499
}else if (selectedText.Compare(advancedMediaIOCustomVideoCapture) == 0) {
494500
m_pMediaIOVideoDlg->InitAgora();
495501
m_pMediaIOVideoDlg->ShowWindow(SW_SHOW);
502+
}else if (selectedText.Compare(advancedAudioEffect) == 0) {
503+
m_pAudioEffectDlg->InitAgora();
504+
m_pAudioEffectDlg->ShowWindow(SW_SHOW);
496505
}
497506
}
498507

@@ -554,6 +563,9 @@ void CAPIExampleDlg::ReleaseScene(CTreeCtrl& treeScene, HTREEITEM& hSelectItem)
554563
}else if (str.Compare(advancedMediaIOCustomVideoCapture) == 0) {
555564
m_pMediaIOVideoDlg->UnInitAgora();
556565
m_pMediaIOVideoDlg->ShowWindow(SW_HIDE);
566+
}else if (str.Compare(advancedAudioEffect) == 0) {
567+
m_pAudioEffectDlg->UnInitAgora();
568+
m_pAudioEffectDlg->ShowWindow(SW_HIDE);
557569
}
558570
}
559571

‎windows/APIExample/APIExample/APIExampleDlg.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "Advanced/VideoProfile/CAgoraVideoProfileDlg.h"
2222
#include "Advanced/MediaEncrypt/CAgoraMediaEncryptDlg.h"
2323
#include "Advanced/MediaIOCustomVideoCaptrue/CAgoraMediaIOVideoCaptureDlg.h"
24+
#include "Advanced/AudioEffect/CAgoraEffectDlg.h"
2425

2526
#include <vector>
2627
#include <map>
@@ -84,7 +85,7 @@ class CAPIExampleDlg : public CDialogEx
8485
CAgoraMediaPlayer *m_pmediaPlayerDlg = nullptr;
8586
CAgoraVideoProfileDlg *m_pVideoProfileDlg = nullptr;
8687
CAgoraMediaEncryptDlg *m_pMediaEncryptDlg = nullptr;
87-
88+
CAgoraEffectDlg *m_pAudioEffectDlg = nullptr;
8889

8990
CString m_preSelectedItemText = _T("");
9091
std::vector<CString> m_vecBasic, m_vecAdvanced;

0 commit comments

Comments
 (0)