Skip to content

Commit 804db5e

Browse files
plutolessplutoless
committed
Revert "remove 3.2.0 features"
This reverts commit 7b812f4.
1 parent 1ffcc77 commit 804db5e

File tree

5 files changed

+323
-0
lines changed

5 files changed

+323
-0
lines changed

‎iOS/APIExample.xcodeproj/project.pbxproj

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
0339BEC525206635007D4FDD /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03D13C0024488F1E00B599B3 /* KeyCenter.swift */; };
2626
0339BEC625207EA7007D4FDD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BCEC5724494F3A00ED7177 /* Accelerate.framework */; };
2727
0339BEC72520A612007D4FDD /* GlobalSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0339BE63251DCA3B007D4FDD /* GlobalSettings.swift */; };
28+
0339BECC25210A93007D4FDD /* SuperResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0339BECA25210A93007D4FDD /* SuperResolution.swift */; };
2829
0339D6D224E91B80008739CD /* QuickSwitchChannelVCItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0339D6D124E91B80008739CD /* QuickSwitchChannelVCItem.xib */; };
2930
0339D6D424E91BAA008739CD /* QuickSwitchChannelVCItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0339D6D324E91BAA008739CD /* QuickSwitchChannelVCItem.swift */; };
3031
0339D6D624E91CEB008739CD /* QuickSwitchChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0339D6D524E91CEB008739CD /* QuickSwitchChannel.swift */; };
@@ -52,6 +53,7 @@
5253
033A9F61252D8B0A00BC26E1 /* VideoMetadata.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F63252D8B0A00BC26E1 /* VideoMetadata.storyboard */; };
5354
033A9F66252D8B2A00BC26E1 /* VoiceChanger.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F68252D8B2A00BC26E1 /* VoiceChanger.storyboard */; };
5455
033A9F6B252D8B3500BC26E1 /* MediaChannelRelay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F6D252D8B3500BC26E1 /* MediaChannelRelay.storyboard */; };
56+
033A9F70252D8B3E00BC26E1 /* SuperResolution.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F72252D8B3E00BC26E1 /* SuperResolution.storyboard */; };
5557
033A9F75252D8B4800BC26E1 /* ScreenShare.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F77252D8B4800BC26E1 /* ScreenShare.storyboard */; };
5658
033A9F7A252D8B5000BC26E1 /* MediaPlayer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F7C252D8B5000BC26E1 /* MediaPlayer.storyboard */; };
5759
033A9F7F252D8B5900BC26E1 /* AudioMixing.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 033A9F81252D8B5900BC26E1 /* AudioMixing.storyboard */; };
@@ -151,6 +153,7 @@
151153
0339BEBF25205D1A007D4FDD /* AgoraAudioTube.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AgoraAudioTube.h; sourceTree = "<group>"; };
152154
0339BEC025205D1A007D4FDD /* AgoraAudioTube.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AgoraAudioTube.mm; sourceTree = "<group>"; };
153155
0339BEC125205D1A007D4FDD /* external_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = external_resampler.h; sourceTree = "<group>"; };
156+
0339BECA25210A93007D4FDD /* SuperResolution.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SuperResolution.swift; sourceTree = "<group>"; };
154157
0339D6D124E91B80008739CD /* QuickSwitchChannelVCItem.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = QuickSwitchChannelVCItem.xib; sourceTree = "<group>"; };
155158
0339D6D324E91BAA008739CD /* QuickSwitchChannelVCItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickSwitchChannelVCItem.swift; sourceTree = "<group>"; };
156159
0339D6D524E91CEB008739CD /* QuickSwitchChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickSwitchChannel.swift; sourceTree = "<group>"; };
@@ -194,6 +197,8 @@
194197
033A9F6A252D8B2F00BC26E1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/VoiceChanger.strings"; sourceTree = "<group>"; };
195198
033A9F6C252D8B3500BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MediaChannelRelay.storyboard; sourceTree = "<group>"; };
196199
033A9F6F252D8B3900BC26E1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MediaChannelRelay.strings"; sourceTree = "<group>"; };
200+
033A9F71252D8B3E00BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SuperResolution.storyboard; sourceTree = "<group>"; };
201+
033A9F74252D8B4300BC26E1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SuperResolution.strings"; sourceTree = "<group>"; };
197202
033A9F76252D8B4800BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ScreenShare.storyboard; sourceTree = "<group>"; };
198203
033A9F79252D8B4B00BC26E1 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/ScreenShare.strings"; sourceTree = "<group>"; };
199204
033A9F7B252D8B5000BC26E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MediaPlayer.storyboard; sourceTree = "<group>"; };
@@ -380,6 +385,15 @@
380385
path = "Agora-ScreenShare-Extension";
381386
sourceTree = "<group>";
382387
};
388+
0339BEC825210A93007D4FDD /* SuperResolution */ = {
389+
isa = PBXGroup;
390+
children = (
391+
033A9F72252D8B3E00BC26E1 /* SuperResolution.storyboard */,
392+
0339BECA25210A93007D4FDD /* SuperResolution.swift */,
393+
);
394+
path = SuperResolution;
395+
sourceTree = "<group>";
396+
};
383397
0339D6CA24E9170D008739CD /* QuickSwitchChannel */ = {
384398
isa = PBXGroup;
385399
children = (
@@ -707,6 +721,7 @@
707721
033A9EE3252D5C6900BC26E1 /* VideoMetadata */,
708722
034C625C2524A06800296ECF /* VoiceChanger */,
709723
038576772521E568003C369A /* MediaChannelRelay */,
724+
0339BEC825210A93007D4FDD /* SuperResolution */,
710725
0339BE9225203293007D4FDD /* ScreenShare */,
711726
0339BE6E251EF074007D4FDD /* MediaPlayer */,
712727
03BEED00251C35A4005E78F4 /* AudioMixing */,
@@ -845,6 +860,7 @@
845860
033A9F3F252D89BC00BC26E1 /* RTMPStreaming.storyboard in Resources */,
846861
033A9F2A252D737900BC26E1 /* Localizable.strings in Resources */,
847862
033A9F7F252D8B5900BC26E1 /* AudioMixing.storyboard in Resources */,
863+
033A9F70252D8B3E00BC26E1 /* SuperResolution.storyboard in Resources */,
848864
033A9F7A252D8B5000BC26E1 /* MediaPlayer.storyboard in Resources */,
849865
033A9F35252D896100BC26E1 /* RawMediaData.storyboard in Resources */,
850866
0339D6D224E91B80008739CD /* QuickSwitchChannelVCItem.xib in Resources */,
@@ -984,6 +1000,7 @@
9841000
033A9EFB252D61E200BC26E1 /* CustomVideoSourcePush.swift in Sources */,
9851001
A7BD7660247CC6920062A6B3 /* UITypeAlias.swift in Sources */,
9861002
03DF1D9124CFC29700DF7151 /* UIColor+CSRGB.m in Sources */,
1003+
0339BECC25210A93007D4FDD /* SuperResolution.swift in Sources */,
9871004
03D13C0124488F1F00B599B3 /* KeyCenter.swift in Sources */,
9881005
03BEED08251C35E7005E78F4 /* AudioMixing.swift in Sources */,
9891006
03DF1D9424CFC29700DF7151 /* AudioController.m in Sources */,
@@ -1150,6 +1167,15 @@
11501167
name = MediaChannelRelay.storyboard;
11511168
sourceTree = "<group>";
11521169
};
1170+
033A9F72252D8B3E00BC26E1 /* SuperResolution.storyboard */ = {
1171+
isa = PBXVariantGroup;
1172+
children = (
1173+
033A9F71252D8B3E00BC26E1 /* Base */,
1174+
033A9F74252D8B4300BC26E1 /* zh-Hans */,
1175+
);
1176+
name = SuperResolution.storyboard;
1177+
sourceTree = "<group>";
1178+
};
11531179
033A9F77252D8B4800BC26E1 /* ScreenShare.storyboard */ = {
11541180
isa = PBXVariantGroup;
11551181
children = (

‎iOS/APIExample/Examples/Advanced/SuperResolution/Base.lproj/SuperResolution.storyboard

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina6_1" orientation="portrait" appearance="light"/>
4+
<dependencies>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
7+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
8+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
9+
</dependencies>
10+
<scenes>
11+
<!--Super Resolution Entry-->
12+
<scene sceneID="x72-3b-GCg">
13+
<objects>
14+
<viewController storyboardIdentifier="EntryViewController" id="O0d-ef-mTa" customClass="SuperResolutionEntry" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
15+
<view key="view" contentMode="scaleToFill" id="iRI-aA-06F">
16+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
17+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18+
<subviews>
19+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UzG-zY-iSA">
20+
<rect key="frame" x="20" y="293.5" width="374" height="138"/>
21+
<subviews>
22+
<textField opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="ScreenShare" borderStyle="roundedRect" placeholder="Enter channel name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GWc-L5-fZV" userLabel="channelName">
23+
<rect key="frame" x="37.5" y="20" width="299" height="34"/>
24+
<fontDescription key="fontDescription" type="system" pointSize="14"/>
25+
<textInputTraits key="textInputTraits"/>
26+
</textField>
27+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kbN-ZR-nNn" userLabel="joinBtn">
28+
<rect key="frame" x="172" y="74" width="30" height="30"/>
29+
<state key="normal" title="Join"/>
30+
<connections>
31+
<action selector="doJoinPressedWithSender:" destination="O0d-ef-mTa" eventType="touchUpInside" id="pdy-Tj-ycl"/>
32+
</connections>
33+
</button>
34+
</subviews>
35+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
36+
<constraints>
37+
<constraint firstItem="kbN-ZR-nNn" firstAttribute="top" secondItem="GWc-L5-fZV" secondAttribute="bottom" constant="20" id="LVQ-Cs-yOU"/>
38+
<constraint firstItem="kbN-ZR-nNn" firstAttribute="centerX" secondItem="GWc-L5-fZV" secondAttribute="centerX" id="RUT-ez-nDw"/>
39+
<constraint firstAttribute="bottom" secondItem="kbN-ZR-nNn" secondAttribute="bottom" constant="34" id="bpT-UB-uOu"/>
40+
<constraint firstItem="GWc-L5-fZV" firstAttribute="centerX" secondItem="UzG-zY-iSA" secondAttribute="centerX" id="c3d-A4-ROC"/>
41+
<constraint firstItem="GWc-L5-fZV" firstAttribute="width" secondItem="UzG-zY-iSA" secondAttribute="width" multiplier="0.8" id="dMl-kx-Ow8"/>
42+
<constraint firstItem="GWc-L5-fZV" firstAttribute="top" secondItem="UzG-zY-iSA" secondAttribute="top" constant="20" id="jIK-tU-lkF"/>
43+
</constraints>
44+
</view>
45+
</subviews>
46+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
47+
<constraints>
48+
<constraint firstItem="UzG-zY-iSA" firstAttribute="centerY" secondItem="wDs-Gr-g1S" secondAttribute="centerY" multiplier="0.8" id="8bT-wH-NDK"/>
49+
<constraint firstItem="UzG-zY-iSA" firstAttribute="leading" secondItem="wDs-Gr-g1S" secondAttribute="leading" constant="20" id="BQh-SU-OA6"/>
50+
<constraint firstItem="wDs-Gr-g1S" firstAttribute="trailing" secondItem="UzG-zY-iSA" secondAttribute="trailing" constant="20" id="gHu-5I-6Gb"/>
51+
</constraints>
52+
<viewLayoutGuide key="safeArea" id="wDs-Gr-g1S"/>
53+
</view>
54+
<connections>
55+
<outlet property="channelTextField" destination="GWc-L5-fZV" id="xDy-ai-JdS"/>
56+
<outlet property="joinButton" destination="kbN-ZR-nNn" id="kkw-5w-Nnv"/>
57+
</connections>
58+
</viewController>
59+
<placeholder placeholderIdentifier="IBFirstResponder" id="DXe-2A-qSu" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
60+
</objects>
61+
<point key="canvasLocation" x="2246" y="931"/>
62+
</scene>
63+
<!--Screen Share Main-->
64+
<scene sceneID="Hul-Ue-Iim">
65+
<objects>
66+
<viewController storyboardIdentifier="SuperResolution" title="Join Channel Audio" id="jxp-ZN-2yG" userLabel="Screen Share Main" customClass="SuperResolutionMain" customModule="APIExample" customModuleProvider="target" sceneMemberID="viewController">
67+
<view key="view" contentMode="scaleToFill" id="ZdT-KJ-IC4">
68+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
69+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
70+
<subviews>
71+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q9v-1n-ZYf">
72+
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
73+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
74+
</view>
75+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XSO-cE-x5n">
76+
<rect key="frame" x="257.5" y="54" width="136.5" height="182"/>
77+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
78+
<constraints>
79+
<constraint firstAttribute="width" secondItem="XSO-cE-x5n" secondAttribute="height" multiplier="3:4" id="Bux-mO-Qgq"/>
80+
</constraints>
81+
</view>
82+
</subviews>
83+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
84+
<constraints>
85+
<constraint firstItem="XSO-cE-x5n" firstAttribute="top" secondItem="CeS-QQ-Djo" secondAttribute="top" constant="10" id="1HU-w7-YYi"/>
86+
<constraint firstItem="q9v-1n-ZYf" firstAttribute="top" secondItem="CeS-QQ-Djo" secondAttribute="top" id="7Ra-XK-uPS"/>
87+
<constraint firstItem="q9v-1n-ZYf" firstAttribute="leading" secondItem="CeS-QQ-Djo" secondAttribute="leading" id="LsZ-af-6Wt"/>
88+
<constraint firstItem="CeS-QQ-Djo" firstAttribute="bottom" secondItem="q9v-1n-ZYf" secondAttribute="bottom" id="Ne5-if-Q54"/>
89+
<constraint firstItem="XSO-cE-x5n" firstAttribute="width" secondItem="CeS-QQ-Djo" secondAttribute="width" multiplier="0.33" id="O1g-6R-UEF"/>
90+
<constraint firstItem="CeS-QQ-Djo" firstAttribute="trailing" secondItem="XSO-cE-x5n" secondAttribute="trailing" constant="20" id="c33-li-E9o"/>
91+
<constraint firstItem="CeS-QQ-Djo" firstAttribute="trailing" secondItem="q9v-1n-ZYf" secondAttribute="trailing" id="isT-Rq-5PH"/>
92+
</constraints>
93+
<viewLayoutGuide key="safeArea" id="CeS-QQ-Djo"/>
94+
</view>
95+
<connections>
96+
<outlet property="localVideoContainer" destination="XSO-cE-x5n" id="1XV-B8-ry9"/>
97+
<outlet property="remoteVideoContainer" destination="q9v-1n-ZYf" id="WST-Vv-Jjj"/>
98+
</connections>
99+
</viewController>
100+
<placeholder placeholderIdentifier="IBFirstResponder" id="8dQ-Wz-bG7" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
101+
</objects>
102+
<point key="canvasLocation" x="3130" y="931"/>
103+
</scene>
104+
</scenes>
105+
</document>

0 commit comments

Comments
 (0)