Skip to content

Commit

Permalink
Merge pull request #211 from red5pro/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ankita-red5 authored Jun 21, 2022
2 parents 92ef495 + 732a513 commit acb7353
Show file tree
Hide file tree
Showing 17 changed files with 457 additions and 26 deletions.
24 changes: 22 additions & 2 deletions R5ProTestbed.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
4838028E1E4115130098F5B7 /* PublishPauseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4838028D1E4115130098F5B7 /* PublishPauseTest.swift */; };
483F559024CB35DF00DB1D0C /* ConferenceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 483F558E24CB35DF00DB1D0C /* ConferenceViewController.swift */; };
483F559124CB35DF00DB1D0C /* ConferenceTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 483F558F24CB35DF00DB1D0C /* ConferenceTest.swift */; };
484D159C281322CC0048913A /* ParamCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484D1597281322CC0048913A /* ParamCell.swift */; };
484D159D281322CC0048913A /* ParamCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 484D1598281322CC0048913A /* ParamCell.xib */; };
484D159E281322CC0048913A /* ParamAddCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484D1599281322CC0048913A /* ParamAddCell.swift */; };
484D159F281322CC0048913A /* ParamAddCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 484D159A281322CC0048913A /* ParamAddCell.xib */; };
484D15A0281322CC0048913A /* ParamsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 484D159B281322CC0048913A /* ParamsTableViewController.swift */; };
485345071C23528400D409F3 /* PublishStreamImageTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485345061C23528400D409F3 /* PublishStreamImageTest.swift */; };
485345091C23552F00D409F3 /* CameraSwapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 485345081C23552F00D409F3 /* CameraSwapTest.swift */; };
4874D59D1C2216DB00A98102 /* SubscribeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4874D59C1C2216DB00A98102 /* SubscribeTest.swift */; };
Expand Down Expand Up @@ -116,6 +121,11 @@
4838028D1E4115130098F5B7 /* PublishPauseTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PublishPauseTest.swift; path = Tests/PublishPause/PublishPauseTest.swift; sourceTree = "<group>"; };
483F558E24CB35DF00DB1D0C /* ConferenceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConferenceViewController.swift; path = Tests/ConferenceTest/ConferenceViewController.swift; sourceTree = "<group>"; };
483F558F24CB35DF00DB1D0C /* ConferenceTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConferenceTest.swift; path = Tests/ConferenceTest/ConferenceTest.swift; sourceTree = "<group>"; };
484D1597281322CC0048913A /* ParamCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParamCell.swift; sourceTree = "<group>"; };
484D1598281322CC0048913A /* ParamCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ParamCell.xib; sourceTree = "<group>"; };
484D1599281322CC0048913A /* ParamAddCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParamAddCell.swift; sourceTree = "<group>"; };
484D159A281322CC0048913A /* ParamAddCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ParamAddCell.xib; sourceTree = "<group>"; };
484D159B281322CC0048913A /* ParamsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParamsTableViewController.swift; sourceTree = "<group>"; };
485345061C23528400D409F3 /* PublishStreamImageTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PublishStreamImageTest.swift; path = Tests/PublishStreamImage/PublishStreamImageTest.swift; sourceTree = "<group>"; };
485345081C23552F00D409F3 /* CameraSwapTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CameraSwapTest.swift; path = Tests/CameraSwap/CameraSwapTest.swift; sourceTree = "<group>"; };
4874D59C1C2216DB00A98102 /* SubscribeTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SubscribeTest.swift; path = Tests/Subscribe/SubscribeTest.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -267,6 +277,7 @@
isa = PBXGroup;
children = (
92EA19DB1CE1375A006B3A97 /* Utilities */,
4874D5A01C221CCF00A98102 /* R5ProTestbed-Bridging-Header.h */,
4874D5A11C221CD000A98102 /* ALToastView.h */,
4874D5A21C221CD000A98102 /* ALToastView.m */,
48DFEDD41C21C18F0040B624 /* Home.swift */,
Expand All @@ -275,13 +286,17 @@
48DFEDAD1C21BBC60040B624 /* MasterViewController.swift */,
48DFEDAF1C21BBC60040B624 /* DetailViewController.swift */,
48DFEDB11C21BBC60040B624 /* Main.storyboard */,
484D159A281322CC0048913A /* ParamAddCell.xib */,
484D1598281322CC0048913A /* ParamCell.xib */,
48DFEDB41C21BBC60040B624 /* Assets.xcassets */,
48DFEDB61C21BBC60040B624 /* LaunchScreen.storyboard */,
48DFEDB91C21BBC60040B624 /* Info.plist */,
48DFEDDE1C21EA780040B624 /* Testbed.swift */,
E1878B941E578B8F00118560 /* tests.plist */,
4874D5A01C221CCF00A98102 /* R5ProTestbed-Bridging-Header.h */,
48DFEDDE1C21EA780040B624 /* Testbed.swift */,
482E6D1C27C6D88A00C518EE /* WebSocketProvider.swift */,
484D1599281322CC0048913A /* ParamAddCell.swift */,
484D1597281322CC0048913A /* ParamCell.swift */,
484D159B281322CC0048913A /* ParamsTableViewController.swift */,
);
path = R5ProTestbed;
sourceTree = "<group>";
Expand Down Expand Up @@ -446,6 +461,8 @@
48DFEDB81C21BBC60040B624 /* LaunchScreen.storyboard in Resources */,
E1878B951E578B8F00118560 /* tests.plist in Resources */,
48DFEDB51C21BBC60040B624 /* Assets.xcassets in Resources */,
484D159F281322CC0048913A /* ParamAddCell.xib in Resources */,
484D159D281322CC0048913A /* ParamCell.xib in Resources */,
48BF80B11C245D29000E996E /* Info-100.png in Resources */,
48DFEDB31C21BBC60040B624 /* Main.storyboard in Resources */,
);
Expand Down Expand Up @@ -488,13 +505,15 @@
48B79AE820C6E94E00AAE4E2 /* PublishZoomableTest.swift in Sources */,
48DFEDDF1C21EA780040B624 /* Testbed.swift in Sources */,
9255170022F0CC4D00604D57 /* SubscribeTelephonyInterruptTest.swift in Sources */,
484D159E281322CC0048913A /* ParamAddCell.swift in Sources */,
92BF540323E873B7005E6D7D /* SubscribeRendererSwapTest.swift in Sources */,
92BF540523E87434005E6D7D /* PublishTranscoderForm.swift in Sources */,
92D5293E261D9BC300B83626 /* PublishStreamManagerSocialPush.swift in Sources */,
487C888F1F2F8AB2004157B6 /* PublishHQAudioTest.swift in Sources */,
482E6D2727D7E26800C518EE /* ConferenceStreamManagerTest.swift in Sources */,
48BF80AE1C245AA7000E996E /* PublishOrientationTest.swift in Sources */,
92EA19DD1CE137DD006B3A97 /* CustomVideoSource.swift in Sources */,
484D159C281322CC0048913A /* ParamCell.swift in Sources */,
92EBEF08212F1B6F003B72FB /* BandwidthDetectionUploadOnlyTest.swift in Sources */,
480A8796221ED82D00474724 /* SubscribeTelephonyInterruptTest.swift in Sources */,
9278C9AC2098B09300861C79 /* SubscribeAudioDelayTest.swift in Sources */,
Expand Down Expand Up @@ -525,6 +544,7 @@
92EAA9DB1D0734EA00B2CE46 /* SubscribeAutoReconnectTest.swift in Sources */,
928B1CBD1CBC0DC5002C66BA /* SubscribeStreamManagerTest.swift in Sources */,
4874D59D1C2216DB00A98102 /* SubscribeTest.swift in Sources */,
484D15A0281322CC0048913A /* ParamsTableViewController.swift in Sources */,
92D52941261D9C1B00B83626 /* SubscribeStreamManagerReconnectTest.swift in Sources */,
926EB662224D475A00715EF7 /* SubscribeEncryptedTest.swift in Sources */,
48BB1D811CED140D00D915E5 /* SubscribeSetSizeTest.swift in Sources */,
Expand Down
50 changes: 37 additions & 13 deletions R5ProTestbed/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -91,12 +91,6 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7JS-SA-FUB">
<rect key="frame" x="0.0" y="334" width="375" height="333"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Test From Menu on Left" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mBj-tg-gTI">
<rect key="frame" x="0.0" y="0.0" width="375" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Debug View:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EW7-CJ-Z2i">
<rect key="frame" x="99" y="53" width="97" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
Expand Down Expand Up @@ -181,12 +175,21 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="h1e-oz-KKB">
<rect key="frame" x="80" y="10" width="215" height="31"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="tinted" title="Add Connection Params"/>
<connections>
<segue destination="4HD-eQ-Rph" kind="popoverPresentation" popoverAnchorView="h1e-oz-KKB" id="QgC-R1-hEn">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="mBj-tg-gTI" firstAttribute="leading" secondItem="7JS-SA-FUB" secondAttribute="leading" id="Ix9-OC-AH8"/>
<constraint firstAttribute="trailing" secondItem="mBj-tg-gTI" secondAttribute="trailing" id="bI4-Et-vzI"/>
<constraint firstItem="mBj-tg-gTI" firstAttribute="top" secondItem="7JS-SA-FUB" secondAttribute="top" id="eIQ-Sb-1cT"/>
<constraint firstItem="h1e-oz-KKB" firstAttribute="leading" secondItem="7JS-SA-FUB" secondAttribute="leading" constant="80" id="S5C-id-E8H"/>
<constraint firstAttribute="trailing" secondItem="h1e-oz-KKB" secondAttribute="trailing" constant="80" id="WDE-p7-dNU"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="No License Found" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mSH-kd-klc" userLabel="License Text">
Expand Down Expand Up @@ -256,7 +259,28 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="FJe-Yq-33r" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="707.19424460431662" y="127.87769784172663"/>
<point key="canvasLocation" x="706.39999999999998" y="127.28635682158921"/>
</scene>
<!--Params Table View Controller-->
<scene sceneID="ewg-UZ-eia">
<objects>
<tableViewController id="4HD-eQ-Rph" customClass="ParamsTableViewController" customModule="R5ProTestbed" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="qDx-Fz-FO7">
<rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="4HD-eQ-Rph" id="iqr-1R-VaU"/>
<outlet property="delegate" destination="4HD-eQ-Rph" id="Sn4-4O-uZn"/>
</connections>
</tableView>
<connections>
<outlet property="paramTable" destination="qDx-Fz-FO7" id="U50-a0-dJk"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="aDq-pr-9Es" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="706" y="1001"/>
</scene>
<!--Split View Controller-->
<scene sceneID="Nki-YV-4Qg">
Expand Down Expand Up @@ -289,7 +313,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Arm-wq-HPj">
<rect key="frame" x="16" y="0.0" width="343" height="44"/>
<rect key="frame" x="16" y="0.0" width="351" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
Expand Down
47 changes: 47 additions & 0 deletions R5ProTestbed/ParamAddCell.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//
// ParamAddCell.swift
// R5ProTestbed
//
// Created by Todd Anderson on 4/14/22.
// Copyright © 2022 Infrared5. All rights reserved.
//

import UIKit

class ParamAddCell : UITableViewCell {

var delegate: ParamCellDelegate?

@IBOutlet weak var button: UIButton!

@IBAction func onAdd (_ sender: Any) {
self.delegate?.addNewCell()
}

override init(style:UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
self.setup()
}

required init?(coder: NSCoder) {
super.init(coder: coder)
self.setup()
}

override open func awakeFromNib() {
super.awakeFromNib()
self.setup()
}

func setup () {
}

}

extension ParamAddCell {

func configure (_ delegate: ParamCellDelegate) {
self.delegate = delegate
}

}
Loading

0 comments on commit acb7353

Please sign in to comment.