Merge branch 'master' of https://github.com/AgoraIO/Basic-Video-Call

toshish · Mar 26, 2020 · b91a725 · b91a725
2 parents 49a8248 + 23bedf4
commit b91a725
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 23 deletions.
diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/.gitignore b/One-to-One-Video/Agora-Windows-Tutorial-1to1/.gitignore
@@ -352,3 +352,4 @@ ASALocalRun/
 *.exe
 *.out
 *.app
+sdk/
diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial.sln b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial.sln
@@ -8,13 +8,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6348939C-3BB4-45B5-868F-112540AD418E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6348939C-3BB4-45B5-868F-112540AD418E}.Debug|Win32.Build.0 = Debug|Win32
+		{6348939C-3BB4-45B5-868F-112540AD418E}.Debug|x64.ActiveCfg = Debug|x64
+		{6348939C-3BB4-45B5-868F-112540AD418E}.Debug|x64.Build.0 = Debug|x64
 		{6348939C-3BB4-45B5-868F-112540AD418E}.Release|Win32.ActiveCfg = Release|Win32
 		{6348939C-3BB4-45B5-868F-112540AD418E}.Release|Win32.Build.0 = Release|Win32
+		{6348939C-3BB4-45B5-868F-112540AD418E}.Release|x64.ActiveCfg = Release|x64
+		{6348939C-3BB4-45B5-868F-112540AD418E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp
@@ -338,9 +338,9 @@ void CAGEngineEventHandler::onRemoteVideoStats(const RemoteVideoStats& stats)
 	lpData->delay = stats.delay;
 	lpData->width = stats.width;
 	lpData->height = stats.height;
-	lpData->receivedFrameRate = stats.receivedFrameRate;
+	lpData->receivedFrameRate = stats.decoderOutputFrameRate;
 	lpData->receivedBitrate = stats.receivedBitrate;
-	lpData->receivedFrameRate = stats.receivedFrameRate;
+	lpData->receivedFrameRate = stats.decoderOutputFrameRate;
 
 	::PostMessage(m_hMainWnd, WM_MSGID(EID_REMOTE_VIDEO_STAT), (WPARAM)lpData, 0);
 }

diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6348939C-3BB4-45B5-868F-112540AD418E}</ProjectGuid>
@@ -23,10 +31,25 @@
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
@@ -37,16 +60,28 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -70,7 +105,36 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>copy ..\sdk\dll\*.dll ..\Debug\</Command>
+      <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)\$(Configuration)\)</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)\$(Platform)\$(Configuration)\)</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -103,6 +167,47 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <PostBuildEvent>
+      <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)\$(Configuration)\)
+if PlatformToolset == v141 (call release_vs2017.bat)</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0804</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <PostBuildEvent>
+      <Command>if exist $(SolutionDir)sdk (copy $(SolutionDir)sdk\dll\*.dll $(SolutionDir)\$(Platform)\$(Configuration)\)</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AGEngineEventHandler.h" />
@@ -120,7 +225,9 @@
     <ClCompile Include="AgoraTutorialDlg.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/release_vs2017.bat b/One-to-One-Video/Agora-Windows-Tutorial-1to1/release_vs2017.bat
@@ -0,0 +1,18 @@
+pushd Release
+pushd Language
+
+del *.exp
+del *.pdb
+del *.lib
+
+popd Language
+
+del *.pdb
+del *.log
+
+IF NOT EXIST vcruntime140.dll (
+  copy C:\Windows\SysWOW64\VCRuntime140.dll Release\
+)
+
+popd Release
+pause
diff --git a/...ra-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj b/...ra-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		1A8E8D481D396CAA002FA67C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1A8E8D471D396CAA002FA67C /* Assets.xcassets */; };
 		1A8E8D4B1D396CAA002FA67C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A8E8D491D396CAA002FA67C /* LaunchScreen.storyboard */; };
 		38B9A0D123D47AA600CE8C27 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76C269B2386764D0047E150 /* AgoraRtcKit.framework */; };
-		38B9A0D223D47AA600CE8C27 /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A76C269B2386764D0047E150 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		38EF7E942368276A00A6A483 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 38EF7E932368276A00A6A483 /* README.md */; };
 		A758117C24078CD7007EDAD3 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117B24078CD7007EDAD3 /* libresolv.tbd */; };
 		A758117E24078CE0007EDAD3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A758117D24078CE0007EDAD3 /* libc++.tbd */; };
@@ -30,20 +29,6 @@
 		A758119024078D24007EDAD3 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A758118F24078D24007EDAD3 /* Accelerate.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		A76C2694238674600047E150 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				38B9A0D223D47AA600CE8C27 /* AgoraRtcKit.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		1A2655D61D3F3AF700BDBA68 /* AppID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppID.h; sourceTree = "<group>"; };
 		1A2655D71D3F3B2200BDBA68 /* AppID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppID.m; sourceTree = "<group>"; };
@@ -168,7 +153,6 @@
 				1A8E8D341D396CAA002FA67C /* Sources */,
 				1A8E8D351D396CAA002FA67C /* Frameworks */,
 				1A8E8D361D396CAA002FA67C /* Resources */,
-				A76C2694238674600047E150 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -80,3 +80,15 @@ jobs:
       sdkurl: $(WindowsRTCSDK)
       solutionName: 'AgoraTutorial.sln'
       sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
+      Machine: 'win32'
+      ReleasePath: 'Release'
+  - template: cicd/templates/build-Windows.yml
+    parameters:
+      displayName: 'WindowsTutorial64'
+      workingDirectory: 'One-to-One-Video/Agora-Windows-Tutorial-1to1'
+      scheme: 'Agora-Windows-Tutorial-1to1'
+      sdkurl: $(WindowsRTCSDKX64)
+      solutionName: 'AgoraTutorial.sln'
+      sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0_FULL'
+      Machine: 'x64'
+      ReleasePath: 'x64/Release'
diff --git a/cicd/scripts/downloadsdk.ps1 b/cicd/scripts/downloadsdk.ps1
@@ -0,0 +1,2 @@
+param($SDKURL)
+Invoke-WebRequest -Uri "$SDKURL" -OutFile .\AgoraSDK.zip -TimeoutSec 10;
diff --git a/cicd/templates/build-Windows.yml b/cicd/templates/build-Windows.yml
@@ -10,6 +10,8 @@ parameters:
   sdkurl: ''
   solutionName: ''
   sdkunzipPath: ''
+  Machine: ''
+  ReleasePath: ''
 jobs:
   - job: ${{ parameters.displayName }}Build
     displayName: ${{ parameters.displayName }}
@@ -19,7 +21,7 @@ jobs:
 
     variables:
       solution: '${{ parameters.workingDirectory }}/${{ parameters.solutionName }}'
-      buildPlatform: 'win32'
+      buildPlatform: ${{ parameters.Machine }}
       buildConfiguration: 'Release'
 
     steps:
@@ -46,11 +48,10 @@ jobs:
           msbuildArchitecture: 'x86'
 
       - script: cd ${{ parameters.workingDirectory }} && ls
-      - script: cd ${{ parameters.workingDirectory }}/AgoraTutorial/Release && ls
 
       - task: ArchiveFiles@2
         inputs:
-          rootFolderOrFile: '${{ parameters.workingDirectory }}/Release/'
+          rootFolderOrFile: '${{ parameters.workingDirectory }}/${{ parameters.ReleasePath }}/'
           includeRootFolder: true 
           archiveType: 'zip'
           archiveFile: ${{ parameters.workingDirectory }}/${{ parameters.displayName }}.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -352,3 +352,4 @@ ASALocalRun/ @@
     *.exe
     *.out
     *.app
+    sdk/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		param($SDKURL)
		Invoke-WebRequest -Uri "$SDKURL" -OutFile .\AgoraSDK.zip -TimeoutSec 10;