Merge pull request #219 from AgoraIO/dev/3.1.0

Dev/3.1.0
AgoraIO · Aug 26, 2020 · dd4c18b · dd4c18b
2 parents f046239 + d8f7d33
commit dd4c18b
Show file tree

Hide file tree

Showing 24 changed files with 291 additions and 78 deletions.
diff --git a/...deo/src/main/java/io/agora/advancedvideo/externvideosource/ExternalVideoInputManager.java b/...deo/src/main/java/io/agora/advancedvideo/externvideosource/ExternalVideoInputManager.java
@@ -18,6 +18,8 @@
 import io.agora.rtc.mediaio.IVideoFrameConsumer;
 import io.agora.rtc.mediaio.IVideoSource;
 import io.agora.rtc.mediaio.MediaIO;
+import io.agora.rtc.mediaio.MediaIO.ContentHint;
+import io.agora.rtc.mediaio.MediaIO.CaptureType;
 
 public class ExternalVideoInputManager implements IVideoSource {
     private static final String TAG = ExternalVideoInputManager.class.getSimpleName();
@@ -125,6 +127,16 @@ public int getBufferType() {
         return MediaIO.BufferType.TEXTURE.intValue();
     }
 
+    @Override
+    public int getCaptureType() {
+        return CaptureType.UNKNOWN.intValue();
+    }
+
+    @Override
+    public int getContentHint() {
+        return ContentHint.NONE.intValue();
+    }
+
     private class ExternalVideoInputThread extends Thread {
         private final String TAG = ExternalVideoInputThread.class.getSimpleName();
         private final int DEFAULT_WAIT_TIME = 1;

diff --git a/Windows/.gitignore b/Windows/.gitignore
@@ -352,4 +352,6 @@ ASALocalRun/
 *.exe
 *.out
 *.app
-English.log
+English.log
+libs/
+sdk/
diff --git a/Windows/Agora-Screen-Sharing-Windows/OpenLive/OpenLive.vcxproj b/Windows/Agora-Screen-Sharing-Windows/OpenLive/OpenLive.vcxproj
@@ -121,6 +121,9 @@
     <PostBuildEvent>
       <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)$(Configuration)\)</Command>
     </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -173,6 +176,9 @@
     <PostBuildEvent>
       <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)$(Configuration)\)</Command>
     </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

diff --git a/Windows/Agora-Screen-Sharing-Windows/ProcessScreenShare/ProcessScreenShare.vcxproj b/Windows/Agora-Screen-Sharing-Windows/ProcessScreenShare/ProcessScreenShare.vcxproj
@@ -59,6 +59,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -84,6 +85,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/Windows/Agora-Screen-Sharing-Windows/prebuild.bat b/Windows/Agora-Screen-Sharing-Windows/prebuild.bat
@@ -0,0 +1,51 @@
+set sdkversion=small
+
+set Machine=%~1
+set absolute_path=%~2
+cd %absolute_path%
+
+if %sdkversion% == origin ( exit )
+
+
+if %sdkversion% == small (
+  set sdkinclude=libs\include
+  set sdkdll=libs\x86
+  set sdklib=libs\x86
+  if %Machine% == x64 (
+    set sdkdll=libs\x86_64
+    set sdklib=libs\x86_64
+  )
+)
+
+if not exist sdk (
+  mkdir sdk
+)
+
+if exist sdk ( 
+  pushd sdk
+  if not exist dll (
+    mkdir dll
+  )
+
+  if not exist lib (
+    mkdir lib
+  )
+  if not exist include (
+    mkdir include
+  )
+  popd
+)
+
+if %sdkversion% == small (
+  if exist %sdkinclude% (
+    copy %sdkinclude%\*.h sdk\include
+  )
+
+  if exist %sdklib% (
+    copy %sdklib%\*.lib sdk\lib /y
+  )
+  if exist %sdkdll% (
+    copy %sdkdll%\*.dll sdk\dll /y
+  )
+)
+pause
diff --git a/Windows/Agora-String-Account-Windows/OpenLive/OpenLive.vcxproj b/Windows/Agora-String-Account-Windows/OpenLive/OpenLive.vcxproj
@@ -103,6 +103,8 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -121,6 +123,9 @@
     <PostBuildEvent>
       <Command>copy ..\sdk\dll\*.dll ..\Debug\</Command>
     </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -153,6 +158,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -170,6 +177,9 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

diff --git a/Windows/Agora-String-Account-Windows/prebuild.bat b/Windows/Agora-String-Account-Windows/prebuild.bat
@@ -0,0 +1,51 @@
+set sdkversion=small
+
+set Machine=%~1
+set absolute_path=%~2
+cd %absolute_path%
+
+if %sdkversion% == origin ( exit )
+
+
+if %sdkversion% == small (
+  set sdkinclude=libs\include
+  set sdkdll=libs\x86
+  set sdklib=libs\x86
+  if %Machine% == x64 (
+    set sdkdll=libs\x86_64
+    set sdklib=libs\x86_64
+  )
+)
+
+if not exist sdk (
+  mkdir sdk
+)
+
+if exist sdk ( 
+  pushd sdk
+  if not exist dll (
+    mkdir dll
+  )
+
+  if not exist lib (
+    mkdir lib
+  )
+  if not exist include (
+    mkdir include
+  )
+  popd
+)
+
+if %sdkversion% == small (
+  if exist %sdkinclude% (
+    copy %sdkinclude%\*.h sdk\include
+  )
+
+  if exist %sdklib% (
+    copy %sdklib%\*.lib sdk\lib /y
+  )
+  if exist %sdkdll% (
+    copy %sdkdll%\*.dll sdk\dll /y
+  )
+)
+pause
diff --git a/Windows/LargeGroupVideoChat-Windows/AgoraOpenLive/AgoraOpenLive.vcxproj b/Windows/LargeGroupVideoChat-Windows/AgoraOpenLive/AgoraOpenLive.vcxproj
@@ -78,6 +78,9 @@
     <PostBuildEvent>
       <Command>copy ..\sdk\dll\*.dll ..\Debug\</Command>
     </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -88,6 +91,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>
+      </AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -105,6 +110,9 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <PreBuildEvent>
+      <Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />

diff --git a/Windows/LargeGroupVideoChat-Windows/prebuild.bat b/Windows/LargeGroupVideoChat-Windows/prebuild.bat
@@ -0,0 +1,51 @@
+set sdkversion=small
+
+set Machine=%~1
+set absolute_path=%~2
+cd %absolute_path%
+
+if %sdkversion% == origin ( exit )
+
+
+if %sdkversion% == small (
+  set sdkinclude=libs\include
+  set sdkdll=libs\x86
+  set sdklib=libs\x86
+  if %Machine% == x64 (
+    set sdkdll=libs\x86_64
+    set sdklib=libs\x86_64
+  )
+)
+
+if not exist sdk (
+  mkdir sdk
+)
+
+if exist sdk ( 
+  pushd sdk
+  if not exist dll (
+    mkdir dll
+  )
+
+  if not exist lib (
+    mkdir lib
+  )
+  if not exist include (
+    mkdir include
+  )
+  popd
+)
+
+if %sdkversion% == small (
+  if exist %sdkinclude% (
+    copy %sdkinclude%\*.h sdk\include
+  )
+
+  if exist %sdklib% (
+    copy %sdklib%\*.lib sdk\lib /y
+  )
+  if exist %sdkdll% (
+    copy %sdkdll%\*.dll sdk\dll /y
+  )
+)
+pause
diff --git a/Windows/cicd/templates/build-Windows.yml b/Windows/cicd/templates/build-Windows.yml
@@ -9,7 +9,7 @@ parameters:
   scheme: ''
   sdkurl: ''
   solutionName: ''
-  sdkunzipPath: ''
+  sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
   Machine: ''
 jobs:
   - job: ${{ parameters.displayName }}Build
@@ -22,7 +22,7 @@ jobs:
       solution: '${{ parameters.workingDirectory }}/${{ parameters.solutionName }}'
       buildPlatform: ${{ parameters.Machine }}
       buildConfiguration: 'Release'
-
+      sdkpathname: 'libs'
     steps:
       - script: echo "${{ parameters.sdkurl }}"
       - powershell: Windows/cicd/script/downloadsdk.ps1 "${{ parameters.sdkurl }}"
@@ -34,8 +34,8 @@ jobs:
 
       - task: CopyFiles@2
         inputs:
-          sourceFolder: ${{ parameters.sdkunzipPath }}/sdk
-          targetFolder: ${{ parameters.workingDirectory }}/sdk
+          sourceFolder: ${{ parameters.sdkunzipPath }}/$(sdkpathname)
+          targetFolder: ${{ parameters.workingDirectory }}/$(sdkpathname)
       - script: cd ${{ parameters.workingDirectory }} && ls
 
       - task: VSBuild@1

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,16 +5,16 @@
 
 trigger:
 #- master
-#- dev/*
-- 3.0.0
+- dev/*
+# - 3.0.0
 
 pool:
   vmImage: 'macos-latest'
 
 variables:
-  iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_1_FULL.zip?_ga=2.39937186.1429354637.1591107319-5559409.1503304822'
-  MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_1_FULL.zip?_ga=2.49505318.1429354637.1591107319-5559409.1503304822'
-  WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows(x86)_v3_0_0_FULL.zip'
+  iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
+  MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
+  WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_1_0_FULL.zip?_ga=2.145291316.1493357375.1597372715-269570672.1596526126'
   ConnectionName: sbd021
   RepoName: sbd021
 
@@ -87,7 +87,7 @@ jobs:
     scheme: 'Agora-String-Account-Windows'
     sdkurl: $(WindowsRTCSDK)
     solutionName: 'OpenLive.sln'
-    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
+    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
 
 - template: Windows/cicd/templates/build-Windows.yml
   parameters:
@@ -96,7 +96,7 @@ jobs:
     scheme: 'LargeGroupVideoChat-Windowss'
     sdkurl: $(WindowsRTCSDK)
     solutionName: 'AgoraOpenLive.sln'
-    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
+    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
 
 - template: Windows/cicd/templates/build-Windows.yml
   parameters:
@@ -105,7 +105,7 @@ jobs:
     scheme: 'Agora-Screen-Sharing-Windows'
     sdkurl: $(WindowsRTCSDK)
     solutionName: 'OpenLive.sln'
-    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
+    sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_FULL'
 
 #hook demo
 - template: Windows/cicd/templates/build-Windows-Hook.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -352,4 +352,6 @@ ASALocalRun/ @@
     *.exe
     *.out
     *.app
-    English.log
+    English.log
+    libs/
+    sdk/