mirror of https://github.com/oxen-io/session-ios
Remove unused code
Niels Andriesse
3 years ago
parent
662fc945e2
commit
c00ddde64d
@ -1,215 +0,0 @@
|
||||
//import UIKit
|
||||
//import AVFoundation
|
||||
//import WebRTC
|
||||
//
|
||||
//final class CallVC : UIViewController, CameraCaptureDelegate, CallManagerDelegate, WebSocketDelegate {
|
||||
// private var webSocket: WebSocket?
|
||||
// private let videoCallVC = VideoCallVC()
|
||||
// let videoCapturer: RTCVideoCapturer = RTCCameraVideoCapturer(delegate: CallManager.shared.localVideoSource)
|
||||
// private var messageQueue: [String] = []
|
||||
// private var isConnected = false {
|
||||
// didSet {
|
||||
// let title = isConnected ? "Leave" : "Join"
|
||||
// joinOrLeaveButton.setTitle(title, for: UIControl.State.normal)
|
||||
// }
|
||||
// }
|
||||
// private var currentRoomInfo: RoomInfo?
|
||||
//
|
||||
// var isInitiator: Bool {
|
||||
// return currentRoomInfo?.isInitiator == true
|
||||
// }
|
||||
//
|
||||
// // MARK: UI Components
|
||||
// private lazy var previewView: UIImageView = {
|
||||
// return UIImageView()
|
||||
// }()
|
||||
//
|
||||
// private lazy var containerView: UIView = {
|
||||
// return UIView()
|
||||
// }()
|
||||
//
|
||||
// private lazy var joinOrLeaveButton: UIButton = {
|
||||
// let result = UIButton()
|
||||
// result.setTitle("Join", for: UIControl.State.normal)
|
||||
// result.addTarget(self, action: #selector(joinOrLeave), for: UIControl.Event.touchUpInside)
|
||||
// return result
|
||||
// }()
|
||||
//
|
||||
// private lazy var roomNumberTextField: UITextField = {
|
||||
// let result = UITextField()
|
||||
// result.set(.width, to: 120)
|
||||
// result.set(.height, to: 40)
|
||||
// result.backgroundColor = UIColor.white.withAlphaComponent(0.1)
|
||||
// return result
|
||||
// }()
|
||||
//
|
||||
// private lazy var infoTextView: UITextView = {
|
||||
// let result = UITextView()
|
||||
// result.backgroundColor = UIColor.white.withAlphaComponent(0.1)
|
||||
// return result
|
||||
// }()
|
||||
//
|
||||
// // MARK: Lifecycle
|
||||
// override func viewDidLoad() {
|
||||
// super.viewDidLoad()
|
||||
// touch(CallManager.shared)
|
||||
// CallManager.shared.delegate = self
|
||||
// CameraManager.shared.delegate = self
|
||||
// CameraManager.shared.prepare()
|
||||
// addChild(videoCallVC)
|
||||
// containerView.addSubview(videoCallVC.view)
|
||||
// videoCallVC.view.translatesAutoresizingMaskIntoConstraints = false
|
||||
// videoCallVC.view.pin(to: containerView)
|
||||
// view.addSubview(containerView)
|
||||
// containerView.pin(to: view)
|
||||
// view.addSubview(joinOrLeaveButton)
|
||||
// joinOrLeaveButton.translatesAutoresizingMaskIntoConstraints = false
|
||||
// joinOrLeaveButton.pin([ UIView.VerticalEdge.top, UIView.HorizontalEdge.right ], to: view)
|
||||
// view.addSubview(roomNumberTextField)
|
||||
// roomNumberTextField.translatesAutoresizingMaskIntoConstraints = false
|
||||
// roomNumberTextField.pin([ UIView.VerticalEdge.top, UIView.HorizontalEdge.left ], to: view)
|
||||
// view.addSubview(infoTextView)
|
||||
// infoTextView.translatesAutoresizingMaskIntoConstraints = false
|
||||
// infoTextView.pin([ UIView.HorizontalEdge.left, UIView.HorizontalEdge.right ], to: view)
|
||||
// infoTextView.center(.vertical, in: view)
|
||||
// infoTextView.set(.height, to: 200)
|
||||
// }
|
||||
//
|
||||
// override func viewDidAppear(_ animated: Bool) {
|
||||
// super.viewDidAppear(animated)
|
||||
// CameraManager.shared.start()
|
||||
// }
|
||||
//
|
||||
// override func viewWillDisappear(_ animated: Bool) {
|
||||
// super.viewWillDisappear(animated)
|
||||
// CameraManager.shared.stop()
|
||||
// }
|
||||
//
|
||||
// // MARK: Interaction
|
||||
// @objc private func joinOrLeave() {
|
||||
// guard let roomID = roomNumberTextField.text, !roomID.isEmpty else { return }
|
||||
// if isConnected {
|
||||
// disconnect()
|
||||
// } else {
|
||||
// isConnected = true
|
||||
// TestCallServer.join(roomID: roomID).done2 { [weak self] info in
|
||||
// guard let self = self else { return }
|
||||
// self.log("Successfully joined room.")
|
||||
// self.currentRoomInfo = info
|
||||
// if let messages = info.messages {
|
||||
// self.handle(messages)
|
||||
// }
|
||||
// let webSocket = WebSocket(url: URL(string: info.wssURL)!)
|
||||
// webSocket.delegate = self
|
||||
// self.webSocket = webSocket
|
||||
// }.catch2 { [weak self] error in
|
||||
// guard let self = self else { return }
|
||||
// self.isConnected = false
|
||||
// self.log("Couldn't join room due to error: \(error).")
|
||||
// SNLog("Couldn't join room due to error: \(error).")
|
||||
// }
|
||||
// roomNumberTextField.resignFirstResponder()
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private func disconnect() {
|
||||
// guard let info = currentRoomInfo else { return }
|
||||
// TestCallServer.leave(roomID: info.roomID, userID: info.clientID).done2 { [weak self] in
|
||||
// guard let self = self else { return }
|
||||
// self.log("Disconnected.")
|
||||
// }
|
||||
// let message = [ "type": "bye" ]
|
||||
// guard let data = try? JSONSerialization.data(withJSONObject: message, options: [.prettyPrinted]) else { return }
|
||||
// webSocket?.send(data)
|
||||
// webSocket?.delegate = nil
|
||||
// webSocket = nil
|
||||
// currentRoomInfo = nil
|
||||
// isConnected = false
|
||||
// CallManager.shared.endCall()
|
||||
// }
|
||||
//
|
||||
// // MARK: Message Handling
|
||||
// func handle(_ messages: [String]) {
|
||||
// messageQueue.append(contentsOf: messages)
|
||||
// drainMessageQueue()
|
||||
// }
|
||||
//
|
||||
// func drainMessageQueue() {
|
||||
// guard isConnected else { return }
|
||||
// for message in messageQueue {
|
||||
// handle(message)
|
||||
// }
|
||||
// messageQueue.removeAll()
|
||||
// CallManager.shared.drainICECandidateQueue()
|
||||
// }
|
||||
//
|
||||
// func handle(_ message: String) {
|
||||
// let signalingMessage = SignalingMessage.from(message: message)
|
||||
// switch signalingMessage {
|
||||
// case .candidate(let candidate):
|
||||
// CallManager.shared.handleCandidateMessage(candidate)
|
||||
// log("Candidate received.")
|
||||
// case .answer(let answer):
|
||||
// CallManager.shared.handleRemoteDescription(answer)
|
||||
// log("Answer received.")
|
||||
// case .offer(let offer):
|
||||
// CallManager.shared.handleRemoteDescription(offer)
|
||||
// log("Offer received.")
|
||||
// case .bye:
|
||||
// disconnect()
|
||||
// default:
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // MARK: Streaming
|
||||
// func webSocketDidConnect(_ webSocket: WebSocket) {
|
||||
// guard let info = currentRoomInfo else { return }
|
||||
// log("Connected to web socket.")
|
||||
// let message = [
|
||||
// "cmd": "register",
|
||||
// "roomid": info.roomID,
|
||||
// "clientid": info.clientID
|
||||
// ]
|
||||
// guard let data = try? JSONSerialization.data(withJSONObject: message, options: [.prettyPrinted]) else { return }
|
||||
// webSocket.send(data)
|
||||
// if isInitiator {
|
||||
// CallManager.shared.initiateCall().retainUntilComplete()
|
||||
// }
|
||||
// drainMessageQueue()
|
||||
// }
|
||||
//
|
||||
// func webSocket(_ webSocket: WebSocket, didReceive message: String) {
|
||||
// log("Received data from web socket.")
|
||||
// handle(message)
|
||||
// CallManager.shared.drainICECandidateQueue()
|
||||
// }
|
||||
//
|
||||
// func webSocketDidDisconnect(_ webSocket: WebSocket) {
|
||||
// webSocket.delegate = nil
|
||||
// log("Disconnecting from web socket.")
|
||||
// }
|
||||
//
|
||||
// func callManager(_ callManager: CallManager, sendData data: Data) {
|
||||
// guard let info = currentRoomInfo else { return }
|
||||
// TestCallServer.send(data, roomID: info.roomID, userID: info.clientID).retainUntilComplete()
|
||||
// }
|
||||
//
|
||||
// // MARK: Camera
|
||||
// func captureVideoOutput(sampleBuffer: CMSampleBuffer) {
|
||||
// guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
|
||||
// let ciImage = CIImage(cvImageBuffer: pixelBuffer)
|
||||
// let image = UIImage(ciImage: ciImage)
|
||||
// DispatchQueue.main.async { [weak self] in
|
||||
// self?.previewView.image = image
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // MARK: Logging
|
||||
// private func log(_ string: String) {
|
||||
// DispatchQueue.main.async { [weak self] in
|
||||
// guard let self = self else { return }
|
||||
// self.infoTextView.text = self.infoTextView.text + "\n" + string
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
@ -1,60 +0,0 @@
|
||||
//import UIKit
|
||||
//import AVFoundation
|
||||
//import WebRTC
|
||||
//
|
||||
//final class VideoCallVC : UIViewController {
|
||||
// private var localVideoView = UIView()
|
||||
// private var remoteVideoView = UIView()
|
||||
//
|
||||
// override func viewDidLoad() {
|
||||
// super.viewDidLoad()
|
||||
// setUpViewHierarchy()
|
||||
// CameraManager.shared.delegate = self
|
||||
// }
|
||||
//
|
||||
// private func setUpViewHierarchy() {
|
||||
// // Create video views
|
||||
// #if arch(arm64)
|
||||
// // Use Metal
|
||||
// let localRenderer = RTCMTLVideoView(frame: self.localVideoView.frame)
|
||||
// localRenderer.contentMode = .scaleAspectFill
|
||||
// let remoteRenderer = RTCMTLVideoView(frame: self.remoteVideoView.frame)
|
||||
// remoteRenderer.contentMode = .scaleAspectFill
|
||||
// #else
|
||||
// // Use OpenGLES
|
||||
// let localRenderer = RTCEAGLVideoView(frame: self.localVideoView.frame)
|
||||
// let remoteRenderer = RTCEAGLVideoView(frame: self.remoteVideoView.frame)
|
||||
// #endif
|
||||
// // Set up stack view
|
||||
// let stackView = UIStackView(arrangedSubviews: [ localVideoView, remoteVideoView ])
|
||||
// stackView.axis = .vertical
|
||||
// stackView.distribution = .fillEqually
|
||||
// stackView.alignment = .fill
|
||||
// view.addSubview(stackView)
|
||||
// stackView.translatesAutoresizingMaskIntoConstraints = false
|
||||
// stackView.pin(to: view)
|
||||
// // Attach video views
|
||||
// CallManager.shared.attachLocalRenderer(localRenderer)
|
||||
// CallManager.shared.attachRemoteRenderer(remoteRenderer)
|
||||
// localVideoView.addSubview(localRenderer)
|
||||
// localRenderer.translatesAutoresizingMaskIntoConstraints = false
|
||||
// localRenderer.pin(to: localVideoView)
|
||||
// remoteVideoView.addSubview(remoteRenderer)
|
||||
// remoteRenderer.translatesAutoresizingMaskIntoConstraints = false
|
||||
// remoteRenderer.pin(to: remoteVideoView)
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//// MARK: Camera
|
||||
//extension VideoCallVC : CameraCaptureDelegate {
|
||||
//
|
||||
// func captureVideoOutput(sampleBuffer: CMSampleBuffer) {
|
||||
// guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return }
|
||||
// let rtcpixelBuffer = RTCCVPixelBuffer(pixelBuffer: pixelBuffer)
|
||||
// let timestamp = CMTimeGetSeconds(CMSampleBufferGetPresentationTimeStamp(sampleBuffer))
|
||||
// let timestampNs = Int64(timestamp * 1000000000)
|
||||
// let videoFrame = RTCVideoFrame(buffer: rtcpixelBuffer, rotation: RTCVideoRotation._0, timeStampNs: timestampNs)
|
||||
// videoFrame.timeStamp = Int32(timestamp)
|
||||
// CallManager.shared.handleLocalFrameCaptured(videoFrame)
|
||||
// }
|
||||
//}
|
||||
Loading…
Reference in New Issue