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

Commit

Permalink
Merge a34e832 into cf71bc9
Browse files Browse the repository at this point in the history
  • Loading branch information
@plutoless
plutoless authored Jun 3, 2020
2 parents cf71bc9 + a34e832 commit 9409fd7
Show file tree
Hide file tree
Showing 10 changed files with 133 additions and 220 deletions.
2 changes: 1 addition & 1 deletion Android/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ The SDK must be integrated into the sample project before it can opened and buil
...
dependencies {
...
implementation 'io.agora.rtc:full-sdk:3.0.0'
implementation 'io.agora.rtc:full-sdk:3.0.1'
}
```

Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pool:
vmImage: 'macos-latest'

variables:
iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_0_FULL.zip?_ga=2.79185814.368877217.1583320605-5559409.1503304822'
MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_0_FULL.zip?_ga=2.78400662.368877217.1583320605-5559409.1503304822'
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'
ConnectionName: sbd021
RepoName: sbd021
Expand Down
32 changes: 18 additions & 14 deletions iOS&macOS/17-Multistream-macOS/17-Multistream.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,25 @@
075589781D7967CB004B0DEA /* VideoSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075589761D7967CB004B0DEA /* VideoSession.swift */; };
075589A61D7D44C8004B0DEA /* ReplacementSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075589A51D7D44C8004B0DEA /* ReplacementSegue.swift */; };
384C9AF62181965E00921076 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 384C9AF52181965E00921076 /* README.md */; };
A773BCA42408BDEF003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13312181A12C0091F5CD /* Accelerate.framework */; };
A773BCA52408BDF5003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13332181A13F0091F5CD /* VideoToolbox.framework */; };
A773BCA62408BDFD003ECBFD /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13372181A1670091F5CD /* CoreWLAN.framework */; };
A773BCA72408BE03003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13352181A1560091F5CD /* libc++.tbd */; };
A773BCA82408BE0B003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D29C401E9E1ABD00C3583C /* libresolv.tbd */; };
A773BCA92408BE16003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F282E7A1FF4F8E100D8F573 /* SystemConfiguration.framework */; };
A7584B5C24869B9A0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; };
A7584B5D24869B9A0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A79A7DDF23B1E17500335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DDE23B1E17500335021 /* KeyCenter.swift */; };
A79A7DE223B1E25100335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
A7584B5E24869B9A0088FACB /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
A7584B5D24869B9A0088FACB /* AgoraRtcKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
071CE22D1D79362D00B82401 /* 17-Multistream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "17-Multistream.app"; sourceTree = BUILT_PRODUCTS_DIR; };
071CE2301D79362D00B82401 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -58,13 +67,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A773BCA72408BE03003ECBFD /* libc++.tbd in Frameworks */,
A773BCA52408BDF5003ECBFD /* VideoToolbox.framework in Frameworks */,
A773BCA42408BDEF003ECBFD /* Accelerate.framework in Frameworks */,
A773BCA82408BE0B003ECBFD /* libresolv.tbd in Frameworks */,
A79A7DE223B1E25100335021 /* AgoraRtcKit.framework in Frameworks */,
A773BCA62408BDFD003ECBFD /* CoreWLAN.framework in Frameworks */,
A773BCA92408BE16003ECBFD /* SystemConfiguration.framework in Frameworks */,
A7584B5C24869B9A0088FACB /* AgoraRtcKit.framework in Frameworks */,
0565F321D90292467D84D0CF /* Pods_17_Multistream.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -153,6 +156,7 @@
071CE22A1D79362D00B82401 /* Frameworks */,
071CE22B1D79362D00B82401 /* Resources */,
4FE84A8C36E21A90D51BA956 /* [CP] Embed Pods Frameworks */,
A7584B5E24869B9A0088FACB /* Embed Frameworks */,
);
buildRules = (
);
Expand Down
42 changes: 18 additions & 24 deletions iOS&macOS/17-Multistream/17-Multistream.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,26 @@
0F240F821F7FA72C001B0AC6 /* VideoSessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F240F811F7FA72C001B0AC6 /* VideoSessionView.swift */; };
0F7ED6B61F7FA7A000B5329E /* VideoSessionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F7ED6B51F7FA7A000B5329E /* VideoSessionView.xib */; };
384C9A942179792100921076 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 384C9A932179792100921076 /* README.md */; };
A773BC952408BCD2003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F80CD3A217867D900131A5E /* Accelerate.framework */; };
A773BC972408BCDA003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC962408BCDA003ECBFD /* AudioToolbox.framework */; };
A773BC982408BCE1003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9B21797A6500921076 /* VideoToolbox.framework */; };
A773BC9A2408BCEA003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC992408BCEA003ECBFD /* AVFoundation.framework */; };
A773BC9B2408BCF7003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF29225CC2240065A2E1 /* CoreML.framework */; };
A773BC9E2408BCF7003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC9C2408BCF7003ECBFD /* CoreMedia.framework */; };
A773BC9F2408BCF7003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC9D2408BCF7003ECBFD /* CoreMotion.framework */; };
A773BCA02408BCFD003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9D21797A7800921076 /* libc++.tbd */; };
A773BCA12408BD05003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745273C1E9E050C0054D2D4 /* libresolv.tbd */; };
A773BCA22408BD0C003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9921797A5D00921076 /* SystemConfiguration.framework */; };
A773BCA32408BD7E003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9721797A5700921076 /* CoreTelephony.framework */; };
A7584B5624869B4E0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; };
A7584B5724869B4E0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A79A7DD323B1E08600335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD223B1E08600335021 /* KeyCenter.swift */; };
A79A7DF923B1E65200335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; };
D505C60A26A6C7379BF2AFA2 /* Pods_17_Multistream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8143D2CDDB7B483556178C5A /* Pods_17_Multistream.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
A7584B5824869B4E0088FACB /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
A7584B5724869B4E0088FACB /* AgoraRtcKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
0745273C1E9E050C0054D2D4 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
078012E91D1E57730093DE24 /* 17-Multistream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "17-Multistream.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -69,19 +73,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A773BC9E2408BCF7003ECBFD /* CoreMedia.framework in Frameworks */,
A773BC9F2408BCF7003ECBFD /* CoreMotion.framework in Frameworks */,
A773BC952408BCD2003ECBFD /* Accelerate.framework in Frameworks */,
A773BCA12408BD05003ECBFD /* libresolv.tbd in Frameworks */,
A773BC9B2408BCF7003ECBFD /* CoreML.framework in Frameworks */,
A79A7DF923B1E65200335021 /* AgoraRtcKit.framework in Frameworks */,
A773BC9A2408BCEA003ECBFD /* AVFoundation.framework in Frameworks */,
A773BCA02408BCFD003ECBFD /* libc++.tbd in Frameworks */,
A773BCA32408BD7E003ECBFD /* CoreTelephony.framework in Frameworks */,
A773BC982408BCE1003ECBFD /* VideoToolbox.framework in Frameworks */,
A7584B5624869B4E0088FACB /* AgoraRtcKit.framework in Frameworks */,
D505C60A26A6C7379BF2AFA2 /* Pods_17_Multistream.framework in Frameworks */,
A773BCA22408BD0C003ECBFD /* SystemConfiguration.framework in Frameworks */,
A773BC972408BCDA003ECBFD /* AudioToolbox.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -175,6 +168,7 @@
078012E61D1E57730093DE24 /* Frameworks */,
078012E71D1E57730093DE24 /* Resources */,
86126748B5EC1C3CCE405185 /* [CP] Embed Pods Frameworks */,
A7584B5824869B4E0088FACB /* Embed Frameworks */,
);
buildRules = (
);
Expand Down
42 changes: 18 additions & 24 deletions iOS&macOS/Agora-Custom-Media-Device/Agora-Custom-Media-Device.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,26 @@
07D8BA111FE91A1600E8B4E2 /* AgoraMetalShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA0F1FE91A1600E8B4E2 /* AgoraMetalShader.metal */; };
07D8BA121FE91A1600E8B4E2 /* AgoraRenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA101FE91A1600E8B4E2 /* AgoraRenderView.swift */; };
07D8BA141FE91A2500E8B4E2 /* AgoraCamera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA131FE91A2500E8B4E2 /* AgoraCamera.swift */; };
A773BCAA2408BEC0003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7047EFCB2194193B00FAA24C /* Accelerate.framework */; };
A773BCAB2408BED0003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8B9FF1FE90C1E00E8B4E2 /* AudioToolbox.framework */; };
A773BCAC2408BED8003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8B9FD1FE90C1900E8B4E2 /* VideoToolbox.framework */; };
A773BCAE2408BEDD003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCAD2408BEDD003ECBFD /* AVFoundation.framework */; };
A773BCAF2408BEE7003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA051FE90C2F00E8B4E2 /* SystemConfiguration.framework */; };
A773BCB02408BEF2003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA031FE90C2B00E8B4E2 /* CoreMedia.framework */; };
A773BCB12408BEF2003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF25225CC1590065A2E1 /* CoreML.framework */; };
A773BCB32408BEF3003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCB22408BEF3003ECBFD /* CoreMotion.framework */; };
A773BCB42408BEF8003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA011FE90C2300E8B4E2 /* libc++.tbd */; };
A773BCB52408BEFF003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA091FE90C3C00E8B4E2 /* libresolv.tbd */; };
A773BCB62408BF59003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA071FE90C3700E8B4E2 /* CoreTelephony.framework */; };
A7584B5924869B900088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; };
A7584B5A24869B900088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A79A7DAC23B0AAB700335021 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A79A7DAB23B0AAB700335021 /* README.md */; };
A79A7DD523B1E0AA00335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD423B1E0A900335021 /* KeyCenter.swift */; };
A79A7DFB23B1E66000335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
A7584B5B24869B900088FACB /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
A7584B5A24869B900088FACB /* AgoraRtcKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
07D8B9CF1FE8EF9800E8B4E2 /* Agora-Custom-Media-Device.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-Custom-Media-Device.app"; sourceTree = BUILT_PRODUCTS_DIR; };
07D8B9D21FE8EF9800E8B4E2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -69,18 +73,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A773BCAC2408BED8003ECBFD /* VideoToolbox.framework in Frameworks */,
A773BCB32408BEF3003ECBFD /* CoreMotion.framework in Frameworks */,
A79A7DFB23B1E66000335021 /* AgoraRtcKit.framework in Frameworks */,
A773BCB52408BEFF003ECBFD /* libresolv.tbd in Frameworks */,
A773BCB62408BF59003ECBFD /* CoreTelephony.framework in Frameworks */,
A773BCAE2408BEDD003ECBFD /* AVFoundation.framework in Frameworks */,
A773BCAA2408BEC0003ECBFD /* Accelerate.framework in Frameworks */,
A773BCAF2408BEE7003ECBFD /* SystemConfiguration.framework in Frameworks */,
A773BCB42408BEF8003ECBFD /* libc++.tbd in Frameworks */,
A773BCAB2408BED0003ECBFD /* AudioToolbox.framework in Frameworks */,
A773BCB12408BEF2003ECBFD /* CoreML.framework in Frameworks */,
A773BCB02408BEF2003ECBFD /* CoreMedia.framework in Frameworks */,
A7584B5924869B900088FACB /* AgoraRtcKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -170,6 +163,7 @@
07D8B9CB1FE8EF9800E8B4E2 /* Sources */,
07D8B9CC1FE8EF9800E8B4E2 /* Frameworks */,
07D8B9CD1FE8EF9800E8B4E2 /* Resources */,
A7584B5B24869B900088FACB /* Embed Frameworks */,
);
buildRules = (
);
Expand Down
Loading

0 comments on commit 9409fd7

Please sign in to comment.