Skip to content

Commit 2e865bb

Browse files
author
xianing
committed
adapt windows 37200
1 parent 8e3ec0d commit 2e865bb

File tree

31 files changed

+1179
-212
lines changed

31 files changed

+1179
-212
lines changed

‎iOS/APIExample/AgoraVideoProcess.xcframework/Info.plist‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AvailableLibraries</key>
6+
<array>
7+
<dict>
8+
<key>LibraryIdentifier</key>
9+
<string>ios-x86_64-simulator</string>
10+
<key>LibraryPath</key>
11+
<string>AgoraVideoProcess.framework</string>
12+
<key>SupportedArchitectures</key>
13+
<array>
14+
<string>x86_64</string>
15+
</array>
16+
<key>SupportedPlatform</key>
17+
<string>ios</string>
18+
<key>SupportedPlatformVariant</key>
19+
<string>simulator</string>
20+
</dict>
21+
<dict>
22+
<key>LibraryIdentifier</key>
23+
<string>ios-arm64_armv7</string>
24+
<key>LibraryPath</key>
25+
<string>AgoraVideoProcess.framework</string>
26+
<key>SupportedArchitectures</key>
27+
<array>
28+
<string>arm64</string>
29+
<string>armv7</string>
30+
</array>
31+
<key>SupportedPlatform</key>
32+
<string>ios</string>
33+
</dict>
34+
</array>
35+
<key>CFBundlePackageType</key>
36+
<string>XFWK</string>
37+
<key>XCFrameworkFormatVersion</key>
38+
<string>1.0</string>
39+
</dict>
40+
</plist>

‎iOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ class AudioMixingMain: BaseViewController {
198198
let result = agoraKit.startAudioMixing(filepath, loopback: false, replace: false, cycle: -1)
199199
if result != 0 {
200200
self.showAlert(title: "Error", message: "startAudioMixing call failed: \(result), please check your params")
201-
} else {
202-
startProgressTimer()
203-
updateTotalDuration(reset: false)
204201
}
205202
}
206203
}
@@ -380,5 +377,9 @@ extension AudioMixingMain: AgoraRtcEngineDelegate {
380377

381378
func rtcEngine(_ engine: AgoraRtcEngineKit, audioMixingStateChanged state: AgoraAudioMixingStateType, errorCode: AgoraAudioMixingErrorType) {
382379
LogUtils.log(message: "audioMixingStateChanged \(state.rawValue), code: \(errorCode.rawValue)", level: .info)
380+
if state == .playing {
381+
startProgressTimer()
382+
updateTotalDuration(reset: false)
383+
}
383384
}
384385
}

‎macOS/APIExample/Examples/Advanced/AudioMixing/AudioMixing.swift‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,6 @@ class AudioMixing: BaseViewController {
472472
let result = agoraKit.startAudioMixing(filepath, loopback: false, replace: false, cycle: -1)
473473
if result != 0 {
474474
self.showAlert(title: "Error", message: "startAudioMixing call failed: \(result), please check your params")
475-
} else {
476-
startProgressTimer(file: filepath)
477-
updateTotalDuration(reset: false, file: filepath)
478475
}
479476
}
480477
}
@@ -642,5 +639,11 @@ extension AudioMixing: AgoraRtcEngineDelegate {
642639

643640
func rtcEngine(_ engine: AgoraRtcEngineKit, audioMixingStateChanged state: AgoraAudioMixingStateType, errorCode: AgoraAudioMixingErrorType) {
644641
LogUtils.log(message: "audioMixingStateChanged \(state.rawValue), code: \(errorCode.rawValue)", level: .info)
642+
if state == .playing {
643+
if let filepath = Bundle.main.path(forResource: "audiomixing", ofType: "mp3") {
644+
startProgressTimer(file: filepath)
645+
updateTotalDuration(reset: false, file: filepath)
646+
}
647+
}
645648
}
646649
}

‎macOS/APIExample/Examples/Advanced/ScreenShare/ScreenShare.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@ class ScreenShare: BaseViewController {
452452
videoCanvas.view = localVideo.videocanvas
453453
videoCanvas.renderMode = .hidden
454454
videoCanvas.sourceType = isScreenSharing ? .screen : .camera
455+
// changing sourceType need to set mirrorMode accordingly
456+
videoCanvas.mirrorMode = isScreenSharing ? .disabled : .enabled
455457
agoraKit.setupLocalVideo(videoCanvas)
456458
// you have to call startPreview to see local video
457459
agoraKit.startPreview()

‎macOS/APIExample/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ extension JoinChannelAudioMain: AgoraRtcEngineDelegate {
414414
let localVideo = videos[0]
415415
localVideo.uid = uid
416416
let config = AgoraAudioRecordingConfiguration()
417-
config.filePath = "xianing"
417+
let tempPath = NSTemporaryDirectory() as NSString
418+
config.filePath = "\(tempPath)/audio.mp4"
418419
config.fileRecordOption = .mic
419420
config.quality = .high
420421
config.sampleRate = 44100

‎windows/APIExample/APIExample/APIExample.rc‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#undef APSTUDIO_READONLY_SYMBOLS
1818

1919
/////////////////////////////////////////////////////////////////////////////
20-
// Chinese (Simplified, PRC) resources
20+
// ����(���壬�й�) resources
2121

2222
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
2323
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -129,7 +129,7 @@ BEGIN
129129
PUSHBUTTON "RemoveStream",IDC_BUTTON_REMOVE_STREAM,307,370,62,14
130130
PUSHBUTTON "RemoveAll",IDC_BUTTON_REMOVE_ALLSTREAM,376,370,55,15
131131
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
132-
CONTROL "Check1",IDC_CHK_TRANS_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,373,349,63,10
132+
CONTROL "Check1",IDC_CHK_TRANS_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,373,349,78,10
133133
END
134134

135135
IDD_DIALOG_METADATA DIALOGEX 0, 0, 632, 400
@@ -244,6 +244,7 @@ BEGIN
244244
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
245245
LTEXT "scenario",IDC_STATIC_ADUIO_SCENARIO,10,374,48,8
246246
COMBOBOX IDC_COMBO_AUDIO_SCENARIO,71,372,218,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
247+
CONTROL "Recording",IDC_CHK_RECORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,308,346,63,10
247248
END
248249

249250
IDD_DIALOG_AUDIO_MIX DIALOGEX 0, 0, 632, 400
@@ -448,6 +449,8 @@ BEGIN
448449
PUSHBUTTON "Set AudioChange",IDC_BUTTON_REMOVE_CROSS_CHANNEL2,296,381,60,14
449450
PUSHBUTTON "Set AudioChange",IDC_BUTTON_START_MEDIA_RELAY,359,381,60,14
450451
PUSHBUTTON "Set AudioChange",IDC_BUTTON_UPDATE,421,381,60,14
452+
PUSHBUTTON "Resume",IDC_BUTTON_RESUME_MEDIA_RELAY,482,381,60,14
453+
PUSHBUTTON "Pause",IDC_BUTTON_PAUSE_MEDIA_RELAY,544,381,60,14
451454
END
452455

453456
IDD_DIALOG_CUSTOM_ENCRYPT DIALOGEX 0, 0, 632, 400
@@ -834,6 +837,11 @@ BEGIN
834837
0
835838
END
836839

840+
IDD_DIALOG_CROSS_CHANNEL AFX_DIALOG_LAYOUT
841+
BEGIN
842+
0
843+
END
844+
837845

838846
/////////////////////////////////////////////////////////////////////////////
839847
//
@@ -850,12 +858,12 @@ IDB_BITMAP_NETWORK_STATE BITMAP "res\\IDB_NETWORK_QUALITY.bmp"
850858

851859
IDR_TEST_WAVE WAVE "res\\ID_TEST_AUDIO.wav"
852860

853-
#endif // Chinese (Simplified, PRC) resources
861+
#endif // ����(���壬�й�) resources
854862
/////////////////////////////////////////////////////////////////////////////
855863

856864

857865
/////////////////////////////////////////////////////////////////////////////
858-
// English (United States) resources
866+
// Ӣ��(����) resources
859867

860868
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
861869
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -981,7 +989,7 @@ BEGIN
981989
IDS_ABOUTBOX "&About APIExample..."
982990
END
983991

984-
#endif // English (United States) resources
992+
#endif // Ӣ��(����) resources
985993
/////////////////////////////////////////////////////////////////////////////
986994

987995

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectGuid>{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}</ProjectGuid>
2424
<Keyword>MFCProj</Keyword>
2525
<RootNamespace>APIExample</RootNamespace>
26-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -116,9 +116,10 @@
116116
<PostBuildEvent>
117117
<Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\agora_rtc_sdk.dll $(SolutionDir)$(Configuration))
118118
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\libagora_segmentation_extension.dll $(SolutionDir)$(Configuration))
119-
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\libagora_video_process.dll $(SolutionDir)$(Configuration))
119+
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\libagora_video_process_extension.dll $(SolutionDir)$(Configuration))
120120
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\libagora-ffmpeg.dll $(SolutionDir)$(Configuration))
121121
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\libagora-wgc.dll $(SolutionDir)$(Configuration))
122+
if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\bequic.dll $(SolutionDir)$(Configuration))
122123
if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
123124
if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
124125
copy $(SolutionDir)APIExample\Advanced\LocalVideoTranscoding\agora.png $(SolutionDir)$(Configuration)
@@ -263,6 +264,8 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
263264
<ClInclude Include="Advanced\AudioProfile\CAgoraAudioProfile.h" />
264265
<ClInclude Include="Advanced\AudioVolume\CAgoraAudioVolumeDlg.h" />
265266
<ClInclude Include="Advanced\BeautyAudio\CAgoraBeautyAudio.h" />
267+
<ClInclude Include="Advanced\Beauty\CAgoraBeautyDlg.h" />
268+
<ClInclude Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.h" />
266269
<ClInclude Include="Advanced\CustomAudioCapture\CAgoraCaptureAudioDlg.h" />
267270
<ClInclude Include="Advanced\CustomEncrypt\CAgoraCustomEncryptDlg.h" />
268271
<ClInclude Include="Advanced\CustomVideoCapture\CAgoraCaptureVideoDlg.h" />
@@ -277,7 +280,6 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
277280
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h" />
278281
<ClInclude Include="Advanced\RegionConn\CAgoraRegionConnDlg.h" />
279282
<ClInclude Include="Advanced\ReportInCall\CAgoraReportInCallDlg.h" />
280-
<ClInclude Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.h" />
281283
<ClInclude Include="Advanced\RTMPStream\AgoraRtmpStreaming.h" />
282284
<ClInclude Include="Advanced\ScreenShare\AgoraScreenCapture.h" />
283285
<ClInclude Include="Advanced\VideoMetadata\CAgoraMetaDataDlg.h" />
@@ -306,6 +308,8 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
306308
<ClCompile Include="Advanced\AudioProfile\CAgoraAudioProfile.cpp" />
307309
<ClCompile Include="Advanced\AudioVolume\CAgoraAudioVolumeDlg.cpp" />
308310
<ClCompile Include="Advanced\BeautyAudio\CAgoraBeautyAudio.cpp" />
311+
<ClCompile Include="Advanced\Beauty\CAgoraBeautyDlg.cpp" />
312+
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp" />
309313
<ClCompile Include="Advanced\CustomAudioCapture\CAgoraCaptureAudioDlg.cpp" />
310314
<ClCompile Include="Advanced\CustomEncrypt\CAgoraCustomEncryptDlg.cpp" />
311315
<ClCompile Include="Advanced\CustomVideoCapture\CAgoraCaptureVideoDlg.cpp" />
@@ -320,7 +324,6 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
320324
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp" />
321325
<ClCompile Include="Advanced\RegionConn\CAgoraRegionConnDlg.cpp" />
322326
<ClCompile Include="Advanced\ReportInCall\CAgoraReportInCallDlg.cpp" />
323-
<ClCompile Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.cpp" />
324327
<ClCompile Include="Advanced\RTMPStream\AgoraRtmpStreaming.cpp" />
325328
<ClCompile Include="Advanced\ScreenShare\AgoraScreenCapture.cpp" />
326329
<ClCompile Include="Advanced\VideoMetadata\CAgoraMetaDataDlg.cpp" />

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<Filter Include="Advanced\RTMPStream">
2020
<UniqueIdentifier>{fd0133e8-4ed1-4da5-9eb0-2eed02844959}</UniqueIdentifier>
2121
</Filter>
22-
<Filter Include="Advanced\RTMPInject">
23-
<UniqueIdentifier>{0637d784-14a1-4260-901a-caa73030f229}</UniqueIdentifier>
24-
</Filter>
2522
<Filter Include="Advanced\VideoMetadata">
2623
<UniqueIdentifier>{ed782797-3b06-44a9-8894-6b9d93d0dfea}</UniqueIdentifier>
2724
</Filter>
@@ -94,6 +91,12 @@
9491
<Filter Include="Advanced\PreCallTest">
9592
<UniqueIdentifier>{8eb9cb1e-26e2-4f32-8400-956c9457a50b}</UniqueIdentifier>
9693
</Filter>
94+
<Filter Include="Advanced\Beauty">
95+
<UniqueIdentifier>{5a12c4d2-39b2-418a-863d-d192cd8ab690}</UniqueIdentifier>
96+
</Filter>
97+
<Filter Include="Advanced\CrossChannel">
98+
<UniqueIdentifier>{913c1771-80e3-4700-b8a4-ae87b7a99afa}</UniqueIdentifier>
99+
</Filter>
97100
</ItemGroup>
98101
<ItemGroup>
99102
<ClInclude Include="APIExample.h">
@@ -129,9 +132,6 @@
129132
<ClInclude Include="Advanced\CustomVideoCapture\CAgoraCaptureVideoDlg.h">
130133
<Filter>Advanced\CustomVideoCapture</Filter>
131134
</ClInclude>
132-
<ClInclude Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.h">
133-
<Filter>Advanced\RTMPInject</Filter>
134-
</ClInclude>
135135
<ClInclude Include="Advanced\RTMPStream\AgoraRtmpStreaming.h">
136136
<Filter>Advanced\RTMPStream</Filter>
137137
</ClInclude>
@@ -219,6 +219,12 @@
219219
<ClInclude Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.h">
220220
<Filter>Advanced\PreCallTest</Filter>
221221
</ClInclude>
222+
<ClInclude Include="Advanced\Beauty\CAgoraBeautyDlg.h">
223+
<Filter>Advanced\Beauty</Filter>
224+
</ClInclude>
225+
<ClInclude Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.h">
226+
<Filter>Advanced\CrossChannel</Filter>
227+
</ClInclude>
222228
</ItemGroup>
223229
<ItemGroup>
224230
<ClCompile Include="APIExample.cpp">
@@ -245,9 +251,6 @@
245251
<ClCompile Include="Advanced\CustomVideoCapture\CAgoraCaptureVideoDlg.cpp">
246252
<Filter>Advanced\CustomVideoCapture</Filter>
247253
</ClCompile>
248-
<ClCompile Include="Advanced\RTMPinject\AgoraRtmpInjectionDlg.cpp">
249-
<Filter>Advanced\RTMPInject</Filter>
250-
</ClCompile>
251254
<ClCompile Include="Advanced\RTMPStream\AgoraRtmpStreaming.cpp">
252255
<Filter>Advanced\RTMPStream</Filter>
253256
</ClCompile>
@@ -332,6 +335,12 @@
332335
<ClCompile Include="Advanced\PreCallTest\CAgoraPreCallTestDlg.cpp">
333336
<Filter>Advanced\PreCallTest</Filter>
334337
</ClCompile>
338+
<ClCompile Include="Advanced\Beauty\CAgoraBeautyDlg.cpp">
339+
<Filter>Advanced\Beauty</Filter>
340+
</ClCompile>
341+
<ClCompile Include="Advanced\CrossChannel\CAgoraCrossChannelDlg.cpp">
342+
<Filter>Advanced\CrossChannel</Filter>
343+
</ClCompile>
335344
</ItemGroup>
336345
<ItemGroup>
337346
<ResourceCompile Include="APIExample.rc">

0 commit comments

Comments
 (0)