Skip to content
This repository was archived by the owner on Dec 22, 2020. It is now read-only.

Commit dd4c18b

Browse files
plutolessplutoless
authored
Merge pull request #219 from AgoraIO/dev/3.1.0
Dev/3.1.0
2 parents f046239 + d8f7d33 commit dd4c18b

File tree

24 files changed

+291
-78
lines changed

24 files changed

+291
-78
lines changed

‎Android/lib-external-video/src/main/java/io/agora/advancedvideo/externvideosource/ExternalVideoInputManager.java

+12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import io.agora.rtc.mediaio.IVideoFrameConsumer;
1919
import io.agora.rtc.mediaio.IVideoSource;
2020
import io.agora.rtc.mediaio.MediaIO;
21+
import io.agora.rtc.mediaio.MediaIO.ContentHint;
22+
import io.agora.rtc.mediaio.MediaIO.CaptureType;
2123

2224
public class ExternalVideoInputManager implements IVideoSource {
2325
private static final String TAG = ExternalVideoInputManager.class.getSimpleName();
@@ -125,6 +127,16 @@ public int getBufferType() {
125127
return MediaIO.BufferType.TEXTURE.intValue();
126128
}
127129

130+
@Override
131+
public int getCaptureType() {
132+
return CaptureType.UNKNOWN.intValue();
133+
}
134+
135+
@Override
136+
public int getContentHint() {
137+
return ContentHint.NONE.intValue();
138+
}
139+
128140
private class ExternalVideoInputThread extends Thread {
129141
private final String TAG = ExternalVideoInputThread.class.getSimpleName();
130142
private final int DEFAULT_WAIT_TIME = 1;

‎Windows/.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -352,4 +352,6 @@ ASALocalRun/
352352
*.exe
353353
*.out
354354
*.app
355-
English.log
355+
English.log
356+
libs/
357+
sdk/

‎Windows/Agora-Screen-Sharing-Windows/OpenLive/OpenLive.vcxproj

+6
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@
121121
<PostBuildEvent>
122122
<Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)$(Configuration)\)</Command>
123123
</PostBuildEvent>
124+
<PreBuildEvent>
125+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
126+
</PreBuildEvent>
124127
</ItemDefinitionGroup>
125128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
126129
<ClCompile>
@@ -173,6 +176,9 @@
173176
<PostBuildEvent>
174177
<Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)$(Configuration)\)</Command>
175178
</PostBuildEvent>
179+
<PreBuildEvent>
180+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
181+
</PreBuildEvent>
176182
</ItemDefinitionGroup>
177183
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
178184
<ClCompile>

‎Windows/Agora-Screen-Sharing-Windows/ProcessScreenShare/ProcessScreenShare.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<Optimization>Disabled</Optimization>
6060
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6161
<SDLCheck>true</SDLCheck>
62+
<AdditionalIncludeDirectories>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</AdditionalIncludeDirectories>
6263
</ClCompile>
6364
<Link>
6465
<SubSystem>Windows</SubSystem>
@@ -84,6 +85,7 @@
8485
<IntrinsicFunctions>true</IntrinsicFunctions>
8586
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8687
<SDLCheck>true</SDLCheck>
88+
<AdditionalIncludeDirectories>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</AdditionalIncludeDirectories>
8789
</ClCompile>
8890
<Link>
8991
<SubSystem>Windows</SubSystem>

‎Windows/Agora-Screen-Sharing-Windows/prebuild.bat

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
set sdkversion=small
2+
3+
set Machine=%~1
4+
set absolute_path=%~2
5+
cd %absolute_path%
6+
7+
if %sdkversion% == origin ( exit )
8+
9+
10+
if %sdkversion% == small (
11+
set sdkinclude=libs\include
12+
set sdkdll=libs\x86
13+
set sdklib=libs\x86
14+
if %Machine% == x64 (
15+
set sdkdll=libs\x86_64
16+
set sdklib=libs\x86_64
17+
)
18+
)
19+
20+
if not exist sdk (
21+
mkdir sdk
22+
)
23+
24+
if exist sdk (
25+
pushd sdk
26+
if not exist dll (
27+
mkdir dll
28+
)
29+
30+
if not exist lib (
31+
mkdir lib
32+
)
33+
if not exist include (
34+
mkdir include
35+
)
36+
popd
37+
)
38+
39+
if %sdkversion% == small (
40+
if exist %sdkinclude% (
41+
copy %sdkinclude%\*.h sdk\include
42+
)
43+
44+
if exist %sdklib% (
45+
copy %sdklib%\*.lib sdk\lib /y
46+
)
47+
if exist %sdkdll% (
48+
copy %sdkdll%\*.dll sdk\dll /y
49+
)
50+
)
51+
pause

‎Windows/Agora-String-Account-Windows/OpenLive/OpenLive.vcxproj

+10
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
<Optimization>Disabled</Optimization>
104104
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105105
<SDLCheck>true</SDLCheck>
106+
<AdditionalIncludeDirectories>
107+
</AdditionalIncludeDirectories>
106108
</ClCompile>
107109
<Link>
108110
<SubSystem>Windows</SubSystem>
@@ -121,6 +123,9 @@
121123
<PostBuildEvent>
122124
<Command>copy ..\sdk\dll\*.dll ..\Debug\</Command>
123125
</PostBuildEvent>
126+
<PreBuildEvent>
127+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
128+
</PreBuildEvent>
124129
</ItemDefinitionGroup>
125130
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
126131
<ClCompile>
@@ -153,6 +158,8 @@
153158
<IntrinsicFunctions>true</IntrinsicFunctions>
154159
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155160
<SDLCheck>true</SDLCheck>
161+
<AdditionalIncludeDirectories>
162+
</AdditionalIncludeDirectories>
156163
</ClCompile>
157164
<Link>
158165
<SubSystem>Windows</SubSystem>
@@ -170,6 +177,9 @@
170177
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171178
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
172179
</ResourceCompile>
180+
<PreBuildEvent>
181+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
182+
</PreBuildEvent>
173183
</ItemDefinitionGroup>
174184
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
175185
<ClCompile>

‎Windows/Agora-String-Account-Windows/prebuild.bat

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
set sdkversion=small
2+
3+
set Machine=%~1
4+
set absolute_path=%~2
5+
cd %absolute_path%
6+
7+
if %sdkversion% == origin ( exit )
8+
9+
10+
if %sdkversion% == small (
11+
set sdkinclude=libs\include
12+
set sdkdll=libs\x86
13+
set sdklib=libs\x86
14+
if %Machine% == x64 (
15+
set sdkdll=libs\x86_64
16+
set sdklib=libs\x86_64
17+
)
18+
)
19+
20+
if not exist sdk (
21+
mkdir sdk
22+
)
23+
24+
if exist sdk (
25+
pushd sdk
26+
if not exist dll (
27+
mkdir dll
28+
)
29+
30+
if not exist lib (
31+
mkdir lib
32+
)
33+
if not exist include (
34+
mkdir include
35+
)
36+
popd
37+
)
38+
39+
if %sdkversion% == small (
40+
if exist %sdkinclude% (
41+
copy %sdkinclude%\*.h sdk\include
42+
)
43+
44+
if exist %sdklib% (
45+
copy %sdklib%\*.lib sdk\lib /y
46+
)
47+
if exist %sdkdll% (
48+
copy %sdkdll%\*.dll sdk\dll /y
49+
)
50+
)
51+
pause

‎Windows/LargeGroupVideoChat-Windows/AgoraOpenLive/AgoraOpenLive.vcxproj

+8
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
<PostBuildEvent>
7979
<Command>copy ..\sdk\dll\*.dll ..\Debug\</Command>
8080
</PostBuildEvent>
81+
<PreBuildEvent>
82+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
83+
</PreBuildEvent>
8184
</ItemDefinitionGroup>
8285
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8386
<ClCompile>
@@ -88,6 +91,8 @@
8891
<IntrinsicFunctions>true</IntrinsicFunctions>
8992
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9093
<SDLCheck>true</SDLCheck>
94+
<AdditionalIncludeDirectories>
95+
</AdditionalIncludeDirectories>
9196
</ClCompile>
9297
<Link>
9398
<SubSystem>Windows</SubSystem>
@@ -105,6 +110,9 @@
105110
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106111
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107112
</ResourceCompile>
113+
<PreBuildEvent>
114+
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
115+
</PreBuildEvent>
108116
</ItemDefinitionGroup>
109117
<ItemGroup>
110118
<Text Include="ReadMe.txt" />

‎Windows/LargeGroupVideoChat-Windows/prebuild.bat

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
set sdkversion=small
2+
3+
set Machine=%~1
4+
set absolute_path=%~2
5+
cd %absolute_path%
6+
7+
if %sdkversion% == origin ( exit )
8+
9+
10+
if %sdkversion% == small (
11+
set sdkinclude=libs\include
12+
set sdkdll=libs\x86
13+
set sdklib=libs\x86
14+
if %Machine% == x64 (
15+
set sdkdll=libs\x86_64
16+
set sdklib=libs\x86_64
17+
)
18+
)
19+
20+
if not exist sdk (
21+
mkdir sdk
22+
)
23+
24+
if exist sdk (
25+
pushd sdk
26+
if not exist dll (
27+
mkdir dll
28+
)
29+
30+
if not exist lib (
31+
mkdir lib
32+
)
33+
if not exist include (
34+
mkdir include
35+
)
36+
popd
37+
)
38+
39+
if %sdkversion% == small (
40+
if exist %sdkinclude% (
41+
copy %sdkinclude%\*.h sdk\include
42+
)
43+
44+
if exist %sdklib% (
45+
copy %sdklib%\*.lib sdk\lib /y
46+
)
47+
if exist %sdkdll% (
48+
copy %sdkdll%\*.dll sdk\dll /y
49+
)
50+
)
51+
pause

‎Windows/cicd/templates/build-Windows.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
scheme: ''
1010
sdkurl: ''
1111
solutionName: ''
12-
sdkunzipPath: ''
12+
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
1313
Machine: ''
1414
jobs:
1515
- job: ${{ parameters.displayName }}Build
@@ -22,7 +22,7 @@ jobs:
2222
solution: '${{ parameters.workingDirectory }}/${{ parameters.solutionName }}'
2323
buildPlatform: ${{ parameters.Machine }}
2424
buildConfiguration: 'Release'
25-
25+
sdkpathname: 'libs'
2626
steps:
2727
- script: echo "${{ parameters.sdkurl }}"
2828
- powershell: Windows/cicd/script/downloadsdk.ps1 "${{ parameters.sdkurl }}"
@@ -34,8 +34,8 @@ jobs:
3434

3535
- task: CopyFiles@2
3636
inputs:
37-
sourceFolder: ${{ parameters.sdkunzipPath }}/sdk
38-
targetFolder: ${{ parameters.workingDirectory }}/sdk
37+
sourceFolder: ${{ parameters.sdkunzipPath }}/$(sdkpathname)
38+
targetFolder: ${{ parameters.workingDirectory }}/$(sdkpathname)
3939
- script: cd ${{ parameters.workingDirectory }} && ls
4040

4141
- task: VSBuild@1

‎azure-pipelines.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
trigger:
77
#- master
8-
#- dev/*
9-
- 3.0.0
8+
- dev/*
9+
# - 3.0.0
1010

1111
pool:
1212
vmImage: 'macos-latest'
1313

1414
variables:
15-
iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_1_FULL.zip?_ga=2.39937186.1429354637.1591107319-5559409.1503304822'
16-
MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_1_FULL.zip?_ga=2.49505318.1429354637.1591107319-5559409.1503304822'
17-
WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows(x86)_v3_0_0_FULL.zip'
15+
iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
16+
MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
17+
WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
1818
ConnectionName: sbd021
1919
RepoName: sbd021
2020

@@ -87,7 +87,7 @@ jobs:
8787
scheme: 'Agora-String-Account-Windows'
8888
sdkurl: $(WindowsRTCSDK)
8989
solutionName: 'OpenLive.sln'
90-
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
90+
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
9191

9292
- template: Windows/cicd/templates/build-Windows.yml
9393
parameters:
@@ -96,7 +96,7 @@ jobs:
9696
scheme: 'LargeGroupVideoChat-Windowss'
9797
sdkurl: $(WindowsRTCSDK)
9898
solutionName: 'AgoraOpenLive.sln'
99-
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
99+
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
100100

101101
- template: Windows/cicd/templates/build-Windows.yml
102102
parameters:
@@ -105,7 +105,7 @@ jobs:
105105
scheme: 'Agora-Screen-Sharing-Windows'
106106
sdkurl: $(WindowsRTCSDK)
107107
solutionName: 'OpenLive.sln'
108-
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
108+
sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
109109

110110
#hook demo
111111
- template: Windows/cicd/templates/build-Windows-Hook.yml

0 commit comments

Comments
 (0)