Skip to content

Commit cefd2fe

Browse files
zhangqianzezhangqianze
committed
add channel media relay
1 parent c4ae9a4 commit cefd2fe

7 files changed

Lines changed: 571 additions & 168 deletions

File tree

‎macOS/APIExample.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
03267E222500C265004A91A6 /* AgoraMediaDataPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 03267E1F2500C265004A91A6 /* AgoraMediaDataPlugin.mm */; };
1717
03267E232500C265004A91A6 /* AgoraMediaRawData.m in Sources */ = {isa = PBXBuildFile; fileRef = 03267E202500C265004A91A6 /* AgoraMediaRawData.m */; };
1818
03267E252500C32A004A91A6 /* RawMediaData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03267E242500C32A004A91A6 /* RawMediaData.swift */; };
19-
03267E282500D565004A91A6 /* JoinMultiChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03267E272500D565004A91A6 /* JoinMultiChannel.swift */; };
2019
0333E63524FA30310063C5B0 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0333E63424FA30310063C5B0 /* BaseViewController.swift */; };
2120
0333E63724FA32000063C5B0 /* VideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0333E63624FA32000063C5B0 /* VideoView.swift */; };
2221
0336A1C725034F4700D61B7F /* AudioWriteToFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 0336A1BD25034F4600D61B7F /* AudioWriteToFile.m */; };
@@ -35,6 +34,10 @@
3534
034C627B2526C43900296ECF /* ScreenShare.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 034C62792526C43900296ECF /* ScreenShare.storyboard */; };
3635
034C627C2526C43900296ECF /* ScreenShare.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C627A2526C43900296ECF /* ScreenShare.swift */; };
3736
034C62872528255F00296ECF /* WindowsCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C62862528255F00296ECF /* WindowsCenter.swift */; };
37+
034C628A25282D5D00296ECF /* JoinMultiChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C628925282D5D00296ECF /* JoinMultiChannel.swift */; };
38+
034C628C25282DAA00296ECF /* JoinMultiChannel.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 034C628B25282DAA00296ECF /* JoinMultiChannel.storyboard */; };
39+
034C62902528327800296ECF /* ChannelMediaRelay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 034C628E2528327800296ECF /* ChannelMediaRelay.storyboard */; };
40+
034C62912528327800296ECF /* ChannelMediaRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 034C628F2528327800296ECF /* ChannelMediaRelay.swift */; };
3841
036D3A9A24FA395E00B1D8DC /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036D3A9924FA395E00B1D8DC /* KeyCenter.swift */; };
3942
036D3A9E24FA3A1000B1D8DC /* LogUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 036D3A9D24FA3A1000B1D8DC /* LogUtils.swift */; };
4043
036D3AA024FA40EB00B1D8DC /* VideoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 036D3A9F24FA40EB00B1D8DC /* VideoView.xib */; };
@@ -84,7 +87,6 @@
8487
03267E212500C265004A91A6 /* AgoraMediaDataPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AgoraMediaDataPlugin.h; sourceTree = "<group>"; };
8588
03267E242500C32A004A91A6 /* RawMediaData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RawMediaData.swift; sourceTree = "<group>"; };
8689
03267E262500C779004A91A6 /* APIExample-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "APIExample-Bridging-Header.h"; sourceTree = "<group>"; };
87-
03267E272500D565004A91A6 /* JoinMultiChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinMultiChannel.swift; sourceTree = "<group>"; };
8890
0333E63424FA30310063C5B0 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
8991
0333E63624FA32000063C5B0 /* VideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoView.swift; sourceTree = "<group>"; };
9092
0336A1BC25034F4600D61B7F /* AudioOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioOptions.h; sourceTree = "<group>"; };
@@ -108,6 +110,10 @@
108110
034C62792526C43900296ECF /* ScreenShare.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ScreenShare.storyboard; sourceTree = "<group>"; };
109111
034C627A2526C43900296ECF /* ScreenShare.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScreenShare.swift; sourceTree = "<group>"; };
110112
034C62862528255F00296ECF /* WindowsCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowsCenter.swift; sourceTree = "<group>"; };
113+
034C628925282D5D00296ECF /* JoinMultiChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinMultiChannel.swift; sourceTree = "<group>"; };
114+
034C628B25282DAA00296ECF /* JoinMultiChannel.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = JoinMultiChannel.storyboard; sourceTree = "<group>"; };
115+
034C628E2528327800296ECF /* ChannelMediaRelay.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ChannelMediaRelay.storyboard; sourceTree = "<group>"; };
116+
034C628F2528327800296ECF /* ChannelMediaRelay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChannelMediaRelay.swift; sourceTree = "<group>"; };
111117
036D3A9924FA395E00B1D8DC /* KeyCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyCenter.swift; sourceTree = "<group>"; };
112118
036D3A9D24FA3A1000B1D8DC /* LogUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogUtils.swift; sourceTree = "<group>"; };
113119
036D3A9F24FA40EB00B1D8DC /* VideoView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VideoView.xib; sourceTree = "<group>"; };
@@ -256,9 +262,29 @@
256262
path = ScreenShare;
257263
sourceTree = "<group>";
258264
};
265+
034C628825282D5D00296ECF /* JoinMultiChannel */ = {
266+
isa = PBXGroup;
267+
children = (
268+
034C628925282D5D00296ECF /* JoinMultiChannel.swift */,
269+
034C628B25282DAA00296ECF /* JoinMultiChannel.storyboard */,
270+
);
271+
path = JoinMultiChannel;
272+
sourceTree = "<group>";
273+
};
274+
034C628D2528327800296ECF /* ChannelMediaRelay */ = {
275+
isa = PBXGroup;
276+
children = (
277+
034C628E2528327800296ECF /* ChannelMediaRelay.storyboard */,
278+
034C628F2528327800296ECF /* ChannelMediaRelay.swift */,
279+
);
280+
path = ChannelMediaRelay;
281+
sourceTree = "<group>";
282+
};
259283
036D3AA524FB797700B1D8DC /* Advanced */ = {
260284
isa = PBXGroup;
261285
children = (
286+
034C628D2528327800296ECF /* ChannelMediaRelay */,
287+
034C628825282D5D00296ECF /* JoinMultiChannel */,
262288
034C62782526C43900296ECF /* ScreenShare */,
263289
034C626F2525A35700296ECF /* StreamEncryption */,
264290
036D3AA624FB798C00B1D8DC /* RTMPStreaming.swift */,
@@ -268,7 +294,6 @@
268294
03267E1924FF399A004A91A6 /* CustomVideoSourcePush.swift */,
269295
0301D31A2507B60B00DF3BEA /* CustomVideoRender.swift */,
270296
03267E242500C32A004A91A6 /* RawMediaData.swift */,
271-
03267E272500D565004A91A6 /* JoinMultiChannel.swift */,
272297
);
273298
path = Advanced;
274299
sourceTree = "<group>";
@@ -501,6 +526,8 @@
501526
03896D3724F8A011008593CD /* Main.storyboard in Resources */,
502527
034C626E25259FD100296ECF /* JoinChannelVideo.storyboard in Resources */,
503528
036D3AA024FA40EB00B1D8DC /* VideoView.xib in Resources */,
529+
034C628C25282DAA00296ECF /* JoinMultiChannel.storyboard in Resources */,
530+
034C62902528327800296ECF /* ChannelMediaRelay.storyboard in Resources */,
504531
);
505532
runOnlyForDeploymentPostprocessing = 0;
506533
};
@@ -633,7 +660,7 @@
633660
0301D3182507B4A800DF3BEA /* AgoraMetalShader.metal in Sources */,
634661
0333E63724FA32000063C5B0 /* VideoView.swift in Sources */,
635662
03B321DB24FC0D5E008EBD2C /* AgoraCameraSourceMediaIO.swift in Sources */,
636-
03267E282500D565004A91A6 /* JoinMultiChannel.swift in Sources */,
663+
034C628A25282D5D00296ECF /* JoinMultiChannel.swift in Sources */,
637664
0301D31B2507B60B00DF3BEA /* CustomVideoRender.swift in Sources */,
638665
03267E1A24FF399A004A91A6 /* CustomVideoSourcePush.swift in Sources */,
639666
0336A1CF250354F600D61B7F /* CustomAudioRender.swift in Sources */,
@@ -655,6 +682,7 @@
655682
0336A1C725034F4700D61B7F /* AudioWriteToFile.m in Sources */,
656683
036D3AA724FB798C00B1D8DC /* RTMPStreaming.swift in Sources */,
657684
034C62872528255F00296ECF /* WindowsCenter.swift in Sources */,
685+
034C62912528327800296ECF /* ChannelMediaRelay.swift in Sources */,
658686
0336A1CA25034F4700D61B7F /* ExternalAudio.mm in Sources */,
659687
034C627C2526C43900296ECF /* ScreenShare.swift in Sources */,
660688
034C62712525A35800296ECF /* StreamEncryption.swift in Sources */,

0 commit comments

Comments
 (0)