Skip to content

Commit 68f12e0

Browse files
author
HeZhengQing
committed
Merge branch 'dev/4.6.0' of github.com:AgoraIO/API-Examples into dev/4.6.0
2 parents b9ca1c1 + 1cd4bf3 commit 68f12e0

86 files changed

Lines changed: 3194 additions & 2 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.

macOS/APIExample.xcodeproj/project.pbxproj

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,11 @@
156156
E7AD0E0029CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.strings in Resources */ = {isa = PBXBuildFile; fileRef = E7AD0DFB29CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.strings */; };
157157
E7AD0E0129CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E7AD0DFD29CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.storyboard */; };
158158
E7AD0E0229CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7AD0DFF29CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.swift */; };
159+
F7453DBC2E03BCA5008DDFC8 /* beauty_material.bundle in Resources */ = {isa = PBXBuildFile; fileRef = F7453DBB2E03BCA5008DDFC8 /* beauty_material.bundle */; };
160+
F7F28B922E03BADD003B150D /* VideoProcess.strings in Resources */ = {isa = PBXBuildFile; fileRef = F7F28B902E03BADD003B150D /* VideoProcess.strings */; };
161+
F7F28B932E03BADD003B150D /* AgoraBeauty.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7F28B8B2E03BADD003B150D /* AgoraBeauty.storyboard */; };
162+
F7F28B942E03BADD003B150D /* AgoraBeautyManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F28B8D2E03BADD003B150D /* AgoraBeautyManager.swift */; };
163+
F7F28B952E03BADD003B150D /* AgoraBeauty.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F28B8C2E03BADD003B150D /* AgoraBeauty.swift */; };
159164
/* End PBXBuildFile section */
160165

161166
/* Begin PBXCopyFilesBuildPhase section */
@@ -359,6 +364,12 @@
359364
E7AD0DFC29CDA4F100C9A4B0 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/CustomVideoSourcePushMulti.strings"; sourceTree = "<group>"; };
360365
E7AD0DFE29CDA4F100C9A4B0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CustomVideoSourcePushMulti.storyboard; sourceTree = "<group>"; };
361366
E7AD0DFF29CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomVideoSourcePushMulti.swift; sourceTree = "<group>"; };
367+
F7453DBB2E03BCA5008DDFC8 /* beauty_material.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = beauty_material.bundle; sourceTree = "<group>"; };
368+
F7F28B8A2E03BADD003B150D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/AgoraBeauty.storyboard; sourceTree = "<group>"; };
369+
F7F28B8C2E03BADD003B150D /* AgoraBeauty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgoraBeauty.swift; sourceTree = "<group>"; };
370+
F7F28B8D2E03BADD003B150D /* AgoraBeautyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgoraBeautyManager.swift; sourceTree = "<group>"; };
371+
F7F28B8E2E03BADD003B150D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/VideoProcess.strings; sourceTree = "<group>"; };
372+
F7F28B8F2E03BADD003B150D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/VideoProcess.strings"; sourceTree = "<group>"; };
362373
/* End PBXFileReference section */
363374

364375
/* Begin PBXFrameworksBuildPhase section */
@@ -538,6 +549,7 @@
538549
034C629D25297ABB00296ECF /* Resources */ = {
539550
isa = PBXGroup;
540551
children = (
552+
F7453DBB2E03BCA5008DDFC8 /* beauty_material.bundle */,
541553
DD33C1AF2CBFBF4E0046F50C /* hlg-hdr.yuv */,
542554
E7AD0DF829CD84F800C9A4B0 /* sample.mov */,
543555
E77D54D528F56D3A00D51C1E /* sample.yuv */,
@@ -563,6 +575,7 @@
563575
036D3AA524FB797700B1D8DC /* Advanced */ = {
564576
isa = PBXGroup;
565577
children = (
578+
F7F28B912E03BADD003B150D /* AgoraBeauty */,
566579
ABB399D92DF9559000AF5033 /* Multipath */,
567580
ABB399DE2DF9559000AF5033 /* Simulcast */,
568581
DD33C1A92CBF9DEA0046F50C /* RtePlayer */,
@@ -962,6 +975,17 @@
962975
name = Frameworks;
963976
sourceTree = "<group>";
964977
};
978+
F7F28B912E03BADD003B150D /* AgoraBeauty */ = {
979+
isa = PBXGroup;
980+
children = (
981+
F7F28B8B2E03BADD003B150D /* AgoraBeauty.storyboard */,
982+
F7F28B8C2E03BADD003B150D /* AgoraBeauty.swift */,
983+
F7F28B8D2E03BADD003B150D /* AgoraBeautyManager.swift */,
984+
F7F28B902E03BADD003B150D /* VideoProcess.strings */,
985+
);
986+
path = AgoraBeauty;
987+
sourceTree = "<group>";
988+
};
965989
/* End PBXGroup section */
966990

967991
/* Begin PBXHeadersBuildPhase section */
@@ -1094,6 +1118,8 @@
10941118
033A9FC2252EB02D00BC26E1 /* CustomAudioSource.storyboard in Resources */,
10951119
57AF3981259B329B00601E02 /* RawAudioData.storyboard in Resources */,
10961120
E7AD0E0129CDA4F100C9A4B0 /* CustomVideoSourcePushMulti.storyboard in Resources */,
1121+
F7F28B922E03BADD003B150D /* VideoProcess.strings in Resources */,
1122+
F7F28B932E03BADD003B150D /* AgoraBeauty.storyboard in Resources */,
10971123
E7AD0DF729CAF78C00C9A4B0 /* LocalCompositeGraph.storyboard in Resources */,
10981124
033A9FE5252EB59000BC26E1 /* VoiceChanger.storyboard in Resources */,
10991125
033A9FBD252EB02600BC26E1 /* CustomAudioRender.storyboard in Resources */,
@@ -1117,6 +1143,7 @@
11171143
E7883AE02B046CB8003CCF44 /* FaceCapture.strings in Resources */,
11181144
671BD67127DF478A0076D5E1 /* CustomVideoRender.storyboard in Resources */,
11191145
DD33C1AA2CBF9DEA0046F50C /* RtePlayer.storyboard in Resources */,
1146+
F7453DBC2E03BCA5008DDFC8 /* beauty_material.bundle in Resources */,
11201147
E702C1E728B4DB4800D7C7ED /* LiveStreaming.storyboard in Resources */,
11211148
57A635F42593544600EDC2F7 /* effectA.wav in Resources */,
11221149
E7AD0DEB29CAAF2B00C9A4B0 /* JoinChannelVideoRecorder.storyboard in Resources */,
@@ -1237,6 +1264,8 @@
12371264
034C626425257EA600296ECF /* GlobalSettings.swift in Sources */,
12381265
036D3A9A24FA395E00B1D8DC /* KeyCenter.swift in Sources */,
12391266
57AF397B259B31AA00601E02 /* RawAudioData.swift in Sources */,
1267+
F7F28B942E03BADD003B150D /* AgoraBeautyManager.swift in Sources */,
1268+
F7F28B952E03BADD003B150D /* AgoraBeauty.swift in Sources */,
12401269
0336A1CB25034F4700D61B7F /* AudioController.m in Sources */,
12411270
034C62672525857200296ECF /* JoinChannelAudio.swift in Sources */,
12421271
5770E2DF258CDCA600812A80 /* Picker.swift in Sources */,
@@ -1652,6 +1681,23 @@
16521681
name = CustomVideoSourcePushMulti.storyboard;
16531682
sourceTree = "<group>";
16541683
};
1684+
F7F28B8B2E03BADD003B150D /* AgoraBeauty.storyboard */ = {
1685+
isa = PBXVariantGroup;
1686+
children = (
1687+
F7F28B8A2E03BADD003B150D /* Base */,
1688+
);
1689+
name = AgoraBeauty.storyboard;
1690+
sourceTree = "<group>";
1691+
};
1692+
F7F28B902E03BADD003B150D /* VideoProcess.strings */ = {
1693+
isa = PBXVariantGroup;
1694+
children = (
1695+
F7F28B8E2E03BADD003B150D /* en */,
1696+
F7F28B8F2E03BADD003B150D /* zh-Hans */,
1697+
);
1698+
name = VideoProcess.strings;
1699+
sourceTree = "<group>";
1700+
};
16551701
/* End PBXVariantGroup section */
16561702

16571703
/* Begin XCBuildConfiguration section */
@@ -1782,7 +1828,7 @@
17821828
CODE_SIGN_STYLE = Automatic;
17831829
COMBINE_HIDPI_IMAGES = YES;
17841830
CURRENT_PROJECT_VERSION = 1.20220311.37381;
1785-
DEVELOPMENT_TEAM = 48TB6ZZL5S;
1831+
DEVELOPMENT_TEAM = G726234S43;
17861832
ENABLE_APP_SANDBOX = NO;
17871833
ENABLE_HARDENED_RUNTIME = YES;
17881834
ENABLE_USER_SELECTED_FILES = "";
@@ -1814,7 +1860,7 @@
18141860
CODE_SIGN_STYLE = Automatic;
18151861
COMBINE_HIDPI_IMAGES = YES;
18161862
CURRENT_PROJECT_VERSION = 1.20220311.37381;
1817-
DEVELOPMENT_TEAM = 48TB6ZZL5S;
1863+
DEVELOPMENT_TEAM = G726234S43;
18181864
ENABLE_APP_SANDBOX = NO;
18191865
ENABLE_HARDENED_RUNTIME = YES;
18201866
ENABLE_USER_SELECTED_FILES = "";

0 commit comments

Comments
 (0)