Skip to content

Commit 8c4331f

Browse files
author
qinhui
committed
Merge branch 'dev/4.6.0' of https://github.com/AgoraIO/API-Examples into dev/4.6.0
# Conflicts: # iOS/APIExample/APIExample.xcodeproj/project.pbxproj # iOS/APIExample/Podfile # iOS/APIExample/SimpleFilter/VideoProcessor.hpp
2 parents 34f9f9e + 77420b3 commit 8c4331f

53 files changed

Lines changed: 4159 additions & 55 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎iOS/APIExample-Audio/APIExample-Audio.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -987,9 +987,9 @@
987987
CODE_SIGN_ENTITLEMENTS = "";
988988
CODE_SIGN_IDENTITY = "Apple Development";
989989
CODE_SIGN_STYLE = Automatic;
990-
CURRENT_PROJECT_VERSION = 2;
990+
CURRENT_PROJECT_VERSION = 3;
991991
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
992-
DEVELOPMENT_TEAM = YS397FG5PA;
992+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
993993
ENABLE_BITCODE = NO;
994994
FRAMEWORK_SEARCH_PATHS = (
995995
"$(inherited)",
@@ -1001,7 +1001,7 @@
10011001
"$(inherited)",
10021002
"@executable_path/Frameworks",
10031003
);
1004-
MARKETING_VERSION = 4.0.0;
1004+
MARKETING_VERSION = 4.6.0;
10051005
OTHER_LDFLAGS = (
10061006
"$(inherited)",
10071007
"-ObjC",
@@ -1058,8 +1058,8 @@
10581058
CODE_SIGN_ENTITLEMENTS = "";
10591059
CODE_SIGN_IDENTITY = "Apple Development";
10601060
CODE_SIGN_STYLE = Automatic;
1061-
CURRENT_PROJECT_VERSION = 2;
1062-
DEVELOPMENT_TEAM = YS397FG5PA;
1061+
CURRENT_PROJECT_VERSION = 3;
1062+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
10631063
ENABLE_BITCODE = NO;
10641064
FRAMEWORK_SEARCH_PATHS = (
10651065
"$(inherited)",
@@ -1071,7 +1071,7 @@
10711071
"$(inherited)",
10721072
"@executable_path/Frameworks",
10731073
);
1074-
MARKETING_VERSION = 4.0.0;
1074+
MARKETING_VERSION = 4.6.0;
10751075
OTHER_LDFLAGS = (
10761076
"$(inherited)",
10771077
"-ObjC",

‎iOS/APIExample-Audio/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ target 'APIExample-Audio' do
77

88
pod 'Floaty', '~> 4.2.0'
99
pod 'AGEVideoLayout', '~> 1.0.2'
10-
pod 'AgoraAudio_iOS', '4.5.2'
11-
# pod 'sdk', :path => 'sdk.podspec'
10+
# pod 'AgoraAudio_iOS', '4.5.2'
11+
pod 'sdk', :path => 'sdk.podspec'
1212
end
1313

1414
pre_install do |installer|

‎iOS/APIExample-OC/APIExample-OC.xcodeproj/project.pbxproj‎

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
/* Begin PBXBuildFile section */
1010
749177BD2429C778B3C6D520 /* Pods_APIExample_OC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D931C433C0CD269F3C3323D /* Pods_APIExample_OC.framework */; };
1111
961E8DCA7B4A6B12564DDC18 /* Pods_SimpleFilter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D0773F7A8BA9611CF846635 /* Pods_SimpleFilter.framework */; };
12+
AB8474172DF9CD7900B4DB73 /* Multipath.m in Sources */ = {isa = PBXBuildFile; fileRef = AB84740C2DF9CD7900B4DB73 /* Multipath.m */; };
13+
AB8474182DF9CD7900B4DB73 /* Simulcast.m in Sources */ = {isa = PBXBuildFile; fileRef = AB8474122DF9CD7900B4DB73 /* Simulcast.m */; };
14+
AB8474192DF9CD7900B4DB73 /* Multipath.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB84740F2DF9CD7900B4DB73 /* Multipath.storyboard */; };
15+
AB84741A2DF9CD7900B4DB73 /* Simulcast.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AB8474152DF9CD7900B4DB73 /* Simulcast.storyboard */; };
1216
C2C764A5CC78FAC392BE5584 /* Pods_Agora_ScreenShare_Extension_OC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A6720DD8507EB2C642C0FD /* Pods_Agora_ScreenShare_Extension_OC.framework */; };
1317
DD8A1F7F2CA50749001CEC51 /* AgoraPCMPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8A1F7E2CA50749001CEC51 /* AgoraPCMPlayer.m */; };
1418
E70ADDF12A5D004F009947CF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E70ADDF02A5D004F009947CF /* AppDelegate.m */; };
@@ -176,6 +180,14 @@
176180
6D0773F7A8BA9611CF846635 /* Pods_SimpleFilter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SimpleFilter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
177181
6E437BC9AAAA1A6431B353C9 /* Pods-APIExample-OC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample-OC.debug.xcconfig"; path = "Target Support Files/Pods-APIExample-OC/Pods-APIExample-OC.debug.xcconfig"; sourceTree = "<group>"; };
178182
A0C8D95022D679A807C9CA1F /* Pods-APIExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-APIExample.debug.xcconfig"; path = "Target Support Files/Pods-APIExample/Pods-APIExample.debug.xcconfig"; sourceTree = "<group>"; };
183+
AB84740B2DF9CD7900B4DB73 /* Multipath.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Multipath.h; sourceTree = "<group>"; };
184+
AB84740C2DF9CD7900B4DB73 /* Multipath.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Multipath.m; sourceTree = "<group>"; };
185+
AB84740D2DF9CD7900B4DB73 /* Multipath.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Multipath.storyboard; path = Base.lproj/Multipath.storyboard; sourceTree = "<group>"; };
186+
AB8474112DF9CD7900B4DB73 /* Simulcast.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Simulcast.h; sourceTree = "<group>"; };
187+
AB8474122DF9CD7900B4DB73 /* Simulcast.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Simulcast.m; sourceTree = "<group>"; };
188+
AB8474132DF9CD7900B4DB73 /* Simulcast.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Simulcast.storyboard; path = Base.lproj/Simulcast.storyboard; sourceTree = "<group>"; };
189+
AB84741C2DF9CD9300B4DB73 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Multipath.strings; sourceTree = "<group>"; };
190+
AB84741E2DF9CD9B00B4DB73 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Simulcast.strings; sourceTree = "<group>"; };
179191
B653B1910F3D2DB664FFCA69 /* Pods-Agora-ScreenShare-Extension-OC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Agora-ScreenShare-Extension-OC.debug.xcconfig"; path = "Target Support Files/Pods-Agora-ScreenShare-Extension-OC/Pods-Agora-ScreenShare-Extension-OC.debug.xcconfig"; sourceTree = "<group>"; };
180192
BBBCB16091148F518866D952 /* Pods-SimpleFilter.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SimpleFilter.release.xcconfig"; path = "Target Support Files/Pods-SimpleFilter/Pods-SimpleFilter.release.xcconfig"; sourceTree = "<group>"; };
181193
C4F0E8C20AFE260912A60198 /* Pods-Agora-ScreenShare-Extension-OC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Agora-ScreenShare-Extension-OC.release.xcconfig"; path = "Target Support Files/Pods-Agora-ScreenShare-Extension-OC/Pods-Agora-ScreenShare-Extension-OC.release.xcconfig"; sourceTree = "<group>"; };
@@ -401,6 +413,26 @@
401413
/* End PBXFrameworksBuildPhase section */
402414

403415
/* Begin PBXGroup section */
416+
AB8474102DF9CD7900B4DB73 /* Multipath */ = {
417+
isa = PBXGroup;
418+
children = (
419+
AB84740B2DF9CD7900B4DB73 /* Multipath.h */,
420+
AB84740C2DF9CD7900B4DB73 /* Multipath.m */,
421+
AB84740F2DF9CD7900B4DB73 /* Multipath.storyboard */,
422+
);
423+
path = Multipath;
424+
sourceTree = "<group>";
425+
};
426+
AB8474162DF9CD7900B4DB73 /* Simulcast */ = {
427+
isa = PBXGroup;
428+
children = (
429+
AB8474112DF9CD7900B4DB73 /* Simulcast.h */,
430+
AB8474122DF9CD7900B4DB73 /* Simulcast.m */,
431+
AB8474152DF9CD7900B4DB73 /* Simulcast.storyboard */,
432+
);
433+
path = Simulcast;
434+
sourceTree = "<group>";
435+
};
404436
E70ADDE32A5D004F009947CF = {
405437
isa = PBXGroup;
406438
children = (
@@ -467,6 +499,8 @@
467499
E70ADE0A2A5D009D009947CF /* Advanced */ = {
468500
isa = PBXGroup;
469501
children = (
502+
AB8474102DF9CD7900B4DB73 /* Multipath */,
503+
AB8474162DF9CD7900B4DB73 /* Simulcast */,
470504
E72F62072A78B31B00C963D2 /* MutliCamera */,
471505
E72F62012A77A63D00C963D2 /* ContentInspect */,
472506
E72F61F72A778ADC00C963D2 /* SpatialAudio */,
@@ -1138,6 +1172,8 @@
11381172
E70ADE362A5D41C9009947CF /* VideoView.xib in Resources */,
11391173
E7361F532A6E5C2100925BD6 /* VideoViewMetal.xib in Resources */,
11401174
E7361F652A6E64FB00925BD6 /* PictureInPicture.storyboard in Resources */,
1175+
AB8474192DF9CD7900B4DB73 /* Multipath.storyboard in Resources */,
1176+
AB84741A2DF9CD7900B4DB73 /* Simulcast.storyboard in Resources */,
11411177
E72F618E2A70F9B700C963D2 /* StreamEncryption.storyboard in Resources */,
11421178
E70ADE172A5D026E009947CF /* audiomixing.mp3 in Resources */,
11431179
E72F61EA2A73A25F00C963D2 /* CreateDataStream.storyboard in Resources */,
@@ -1265,6 +1301,8 @@
12651301
E70ADEE22A6A7177009947CF /* CustomAudioRender.m in Sources */,
12661302
E7361F482A6E4CF500925BD6 /* CircularBuffer.c in Sources */,
12671303
E72F61DB2A7258F800C963D2 /* VideoProcess.m in Sources */,
1304+
AB8474172DF9CD7900B4DB73 /* Multipath.m in Sources */,
1305+
AB8474182DF9CD7900B4DB73 /* Simulcast.m in Sources */,
12681306
E70ADE1F2A5D0368009947CF /* MediaUtils.m in Sources */,
12691307
E70ADEDD2A6A2D7D009947CF /* AgoraPCMSourcePush.m in Sources */,
12701308
E70ADE202A5D0368009947CF /* BundleUtil.m in Sources */,
@@ -1353,6 +1391,24 @@
13531391
/* End PBXTargetDependency section */
13541392

13551393
/* Begin PBXVariantGroup section */
1394+
AB84740F2DF9CD7900B4DB73 /* Multipath.storyboard */ = {
1395+
isa = PBXVariantGroup;
1396+
children = (
1397+
AB84740D2DF9CD7900B4DB73 /* Multipath.storyboard */,
1398+
AB84741C2DF9CD9300B4DB73 /* en */,
1399+
);
1400+
name = Multipath.storyboard;
1401+
sourceTree = "<group>";
1402+
};
1403+
AB8474152DF9CD7900B4DB73 /* Simulcast.storyboard */ = {
1404+
isa = PBXVariantGroup;
1405+
children = (
1406+
AB8474132DF9CD7900B4DB73 /* Simulcast.storyboard */,
1407+
AB84741E2DF9CD9B00B4DB73 /* en */,
1408+
);
1409+
name = Simulcast.storyboard;
1410+
sourceTree = "<group>";
1411+
};
13561412
E70ADDF82A5D004F009947CF /* Main.storyboard */ = {
13571413
isa = PBXVariantGroup;
13581414
children = (
@@ -1573,7 +1629,7 @@
15731629
CODE_SIGN_IDENTITY = "Apple Development";
15741630
CODE_SIGN_STYLE = Automatic;
15751631
CURRENT_PROJECT_VERSION = 1;
1576-
DEVELOPMENT_TEAM = G726234S43;
1632+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
15771633
ENABLE_BITCODE = NO;
15781634
GENERATE_INFOPLIST_FILE = YES;
15791635
INFOPLIST_FILE = "APIExample-OC/Info.plist";
@@ -1615,7 +1671,7 @@
16151671
CODE_SIGN_IDENTITY = "Apple Development";
16161672
CODE_SIGN_STYLE = Automatic;
16171673
CURRENT_PROJECT_VERSION = 1;
1618-
DEVELOPMENT_TEAM = G726234S43;
1674+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
16191675
ENABLE_BITCODE = NO;
16201676
GENERATE_INFOPLIST_FILE = YES;
16211677
INFOPLIST_FILE = "APIExample-OC/Info.plist";
@@ -1653,7 +1709,7 @@
16531709
CODE_SIGN_IDENTITY = "Apple Development";
16541710
CODE_SIGN_STYLE = Automatic;
16551711
CURRENT_PROJECT_VERSION = 1;
1656-
DEVELOPMENT_TEAM = G726234S43;
1712+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
16571713
ENABLE_BITCODE = NO;
16581714
GENERATE_INFOPLIST_FILE = YES;
16591715
INFOPLIST_FILE = "Agora-ScreenShare-Extension-OC/Info.plist";
@@ -1682,7 +1738,7 @@
16821738
CODE_SIGN_IDENTITY = "Apple Development";
16831739
CODE_SIGN_STYLE = Automatic;
16841740
CURRENT_PROJECT_VERSION = 1;
1685-
DEVELOPMENT_TEAM = G726234S43;
1741+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
16861742
ENABLE_BITCODE = NO;
16871743
GENERATE_INFOPLIST_FILE = YES;
16881744
INFOPLIST_FILE = "Agora-ScreenShare-Extension-OC/Info.plist";
@@ -1715,7 +1771,7 @@
17151771
CODE_SIGN_STYLE = Automatic;
17161772
CURRENT_PROJECT_VERSION = 1;
17171773
DEFINES_MODULE = YES;
1718-
DEVELOPMENT_TEAM = G726234S43;
1774+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
17191775
DYLIB_COMPATIBILITY_VERSION = 1;
17201776
DYLIB_CURRENT_VERSION = 1;
17211777
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1762,7 +1818,7 @@
17621818
CODE_SIGN_STYLE = Automatic;
17631819
CURRENT_PROJECT_VERSION = 1;
17641820
DEFINES_MODULE = YES;
1765-
DEVELOPMENT_TEAM = G726234S43;
1821+
DEVELOPMENT_TEAM = 48TB6ZZL5S;
17661822
DYLIB_COMPATIBILITY_VERSION = 1;
17671823
DYLIB_CURRENT_VERSION = 1;
17681824
DYLIB_INSTALL_NAME_BASE = "@rpath";

0 commit comments

Comments
 (0)