revert: feat: simulcast support - WPB-11481

Cartfile.resolved

@@ -1,4 +1,4 @@
-binary "wire-avs.json" "10.0.4"
+binary "wire-avs.json" "9.10.16"
 github "wireapp/ZipArchive" "v2.4.2"
 github "wireapp/core-crypto" "v3.0.2"
 github "wireapp/cryptobox-ios" "v1.1.0_xcframework_arm64simulator"

WireUI/Sources/WireDesign/Buttons/LinkButtonStyle.swift

@@ -1,6 +1,6 @@
 //
 // Wire
-// Copyright (C) 2025 Wire Swiss GmbH
+// Copyright (C) 2024 Wire Swiss GmbH
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

WireUI/Tests/WireDesignTests/Buttons/LinkButtonStyleUITests.swift

@@ -1,6 +1,6 @@
 //
 // Wire
-// Copyright (C) 2025 Wire Swiss GmbH
+// Copyright (C) 2024 Wire Swiss GmbH
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

wire-avs.json

@@ -1,3 +1,3 @@
 {
-  "10.0.4": "https://github.com/wireapp/wire-avs/releases/download/10.0.4/avs.xcframework.zip",
+  "9.10.16": "https://github.com/wireapp/wire-avs/releases/download/9.10.16/avs.xcframework.zip",
 }

wire-ios-sync-engine/Source/Calling/AVS/AVSVideoStreams.swift

@@ -18,50 +18,12 @@
 
 import Foundation
 
-public struct AVSVideoStreams: Encodable, Equatable {
+public struct AVSVideoStreams: Codable, Equatable {
     let conversationId: String
-    let clients: [AVSClientVideoStream]
+    let clients: [AVSClient]
 
     enum CodingKeys: String, CodingKey {
         case conversationId = "convid"
         case clients
     }
 }
-
-public enum AVSStreamQuality: Int, Codable {
-    case any = 0 // any resolution (avs decides)
-    case low = 1 // low quality resolution
-    case high = 2 // high quality resolution
-
-    var debugDescription: String {
-        String(describing: self)
-    }
-}
-
-public struct AVSClientVideoStream: Encodable, Equatable, Hashable {
-    public let userId: String
-    public let clientId: String
-    public let quality: AVSStreamQuality
-
-    enum CodingKeys: String, CodingKey {
-        case userId = "userid"
-        case clientId = "clientid"
-        case streamQuality = "quality"
-    }
-
-    public init(
-        client: AVSClient,
-        quality: AVSStreamQuality = .any
-    ) {
-        self.userId = client.userId
-        self.clientId = client.clientId
-        self.quality = quality
-    }
-
-    public func encode(to encoder: any Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(userId, forKey: .userId)
-        try container.encode(clientId, forKey: .clientId)
-        try container.encode(quality.rawValue, forKey: .streamQuality)
-    }
-}

wire-ios-sync-engine/Source/Calling/VoiceChannel.swift

@@ -72,7 +72,7 @@ public protocol CallActions: NSObjectProtocol {
     func join(video: Bool, userSession: ZMUserSession) -> Bool
     func leave(userSession: ZMUserSession, completion: (() -> Void)?)
     func continueByDecreasingConversationSecurity(userSession: ZMUserSession)
-    func request(videoStreams: [AVSClientVideoStream])
+    func request(videoStreams: [AVSClient])
 
 }
 

wire-ios-sync-engine/Source/Calling/VoiceChannelV3.swift

@@ -210,8 +210,9 @@ extension VoiceChannelV3: CallActions {
         }
     }
 
-    public func request(videoStreams: [AVSClientVideoStream]) {
+    public func request(videoStreams: [AVSClient]) {
         guard let conversationId = conversation?.avsIdentifier else { return }
+
         callCenter?.requestVideoStreams(conversationId: conversationId, clients: videoStreams)
     }
 }

wire-ios-sync-engine/Source/Calling/WireCallCenterV3.swift

@@ -914,7 +914,7 @@ public extension WireCallCenterV3 {
     /// - Parameters:
     ///   - conversationId: The identifier of the conversation where the video call is hosted.
     ///   - clients: The list of clients for which AVS should load video streams.
-    func requestVideoStreams(conversationId: AVSIdentifier, clients: [AVSClientVideoStream]) {
+    func requestVideoStreams(conversationId: AVSIdentifier, clients: [AVSClient]) {
         let videoStreams = AVSVideoStreams(conversationId: conversationId.serialized, clients: clients)
         avsWrapper.requestVideoStreams(videoStreams, conversationId: conversationId)
     }

wire-ios-sync-engine/Tests/Source/Calling/AVSVideoStreamsTest.swift

@@ -28,19 +28,18 @@ class AVSVideoStreamsTest: XCTestCase {
         let clientId = UUID()
 
         let client = AVSClient(userId: userId, clientId: clientId.transportString())
-        let stream = AVSClientVideoStream(client: client, quality: .low)
 
         let expectedJson = """
         {\
         "clients":[\
-        \(stream.jsonString(sortedKeys: true)!)\
+        \(client.jsonString(sortedKeys: true)!)\
         ],\
         "convid":"\(conversationId.transportString())"\
         }
         """
 
         // when
-        let sut = AVSVideoStreams(conversationId: conversationId.transportString(), clients: [stream])
+        let sut = AVSVideoStreams(conversationId: conversationId.transportString(), clients: [client])
 
         // then
         XCTAssertEqual(sut.jsonString(sortedKeys: true), expectedJson)

wire-ios-sync-engine/Tests/Source/Calling/WireCallCenterV3Tests.swift

@@ -2367,9 +2367,7 @@ extension WireCallCenterV3Tests {
         let clients = [
             AVSClient(userId: selfUserID, clientId: clientId1),
             AVSClient(userId: otherUserID, clientId: clientId2)
-        ].map { client in
-            AVSClientVideoStream(client: client, quality: .low)
-        }
+        ]
 
         let expectedResult = AVSVideoStreams(conversationId: conversationId.serialized, clients: clients)
 

wire-ios/Tests/Mocks/MockVoiceChannel.swift

@@ -157,8 +157,8 @@ final class MockVoiceChannel: NSObject, VoiceChannel {
 
     func leave() {}
 
-    var requestedVideoStreams: [AVSClientVideoStream]?
-    func request(videoStreams: [AVSClientVideoStream]) {
+    var requestedVideoStreams: [AVSClient]?
+    func request(videoStreams: [AVSClient]) {
         requestedVideoStreams = videoStreams
     }
 }

wire-ios/Wire-iOS Tests/Calling/CallGridViewControllerSnapshotTests.swift

@@ -293,12 +293,11 @@ final class CallGridViewControllerSnapshotTests: XCTestCase {
         }
 
         // Page 2 - Second half with video enabled
-        var expectedClientStreams = [AVSClientVideoStream]()
+        var expectedClients = [AVSClient]()
         for _ in half ..< CallGridViewController.maxItemsPerPage {
             let client = AVSClient(userId: AVSIdentifier.stub, clientId: UUID().transportString())
-
             configuration.streams += [stubProvider.stream(client: client, videoState: .started)]
-            expectedClientStreams += [AVSClientVideoStream(client: client, quality: .low)]
+            expectedClients += [client]
         }
 
         sut.configuration = configuration
@@ -307,7 +306,7 @@ final class CallGridViewControllerSnapshotTests: XCTestCase {
         sut.requestVideoStreamsIfNeeded(forPage: 1)
 
         // then
-        XCTAssertEqual(mockDelegate.requestedClients, expectedClientStreams)
+        XCTAssertEqual(mockDelegate.requestedClients, expectedClients)
     }
 
     func testThatItDoesntRequestVideoStreams_IfPageIsInvalid() {

wire-ios/Wire-iOS Tests/Calling/CallViewControllerTests.swift

@@ -147,7 +147,7 @@ final class CallViewControllerTests: ZMSnapshotTestCase {
         let clients = [
             AVSClient(userId: AVSIdentifier.stub, clientId: UUID().transportString()),
             AVSClient(userId: AVSIdentifier.stub, clientId: UUID().transportString())
-        ].map { AVSClientVideoStream(client: $0) }
+        ]
 
         // When
         sut.callGridViewController(viewController, perform: .requestVideoStreamsForClients(clients))

wire-ios/Wire-iOS Tests/Calling/Mocks/MockCallGridViewControllerDelegate.swift

@@ -21,7 +21,7 @@ import Foundation
 
 final class MockCallGridViewControllerDelegate: CallGridViewControllerDelegate {
 
-    var requestedClients: [AVSClientVideoStream]?
+    var requestedClients: [AVSClient]?
 
     func callGridViewController(_ viewController: CallGridViewController, perform action: CallGridAction) {
         guard case let .requestVideoStreamsForClients(clients) = action else { return }

wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/CallGridViewController.swift

@@ -53,7 +53,7 @@ final class CallGridViewController: UIViewController {
         PinchToZoomRule(isOneToOneCall: configuration.callHasTwoParticipants)
     }
 
-    private var visibleClientsSharingVideo: Set<AVSClientVideoStream> = []
+    private var visibleClientsSharingVideo: [AVSClient] = []
     private var dataSource: [Stream] = []
     private let gridView = GridView(maxItemsPerPage: maxItemsPerPage)
     private let thumbnailViewController = PinnableThumbnailViewController()
@@ -158,7 +158,7 @@ final class CallGridViewController: UIViewController {
         networkConditionView.accessibilityIdentifier = "network-conditions-indicator"
     }
 
-    func reloadGridData() {
+    func releadGridData() {
         gridView.reloadData()
     }
 
@@ -220,7 +220,6 @@ final class CallGridViewController: UIViewController {
         maximizedView = shouldMaximize ? view : nil
         view.isMaximized = shouldMaximize
         updateGrid(with: streams)
-        requestVideoStreamsIfNeeded(forPage: gridView.currentPage)
         updateHint(for: .maximizationChanged(stream: view.stream, maximized: view.isMaximized))
     }
 
@@ -419,23 +418,14 @@ final class CallGridViewController: UIViewController {
               endIndex > startIndex
         else { return }
 
-        let clientsWithVideo = dataSource[startIndex ..< endIndex]
+        let clients = dataSource[startIndex ..< endIndex]
             .filter(\.isSharingVideo)
+            .map(\.streamId)
 
-        let oneStreamDisplayedExcludingSelf = clientsWithVideo.count == 1
-        let clientStreams = clientsWithVideo
-            .map { client in
-                AVSClientVideoStream(
-                    client: client.streamId,
-                    quality: oneStreamDisplayedExcludingSelf ? .high : .low
-                )
-            }
-
-        let newVisibleClientsSharingVideo = Set(clientStreams)
+        guard Set(clients) != Set(visibleClientsSharingVideo) else { return }
 
-        guard newVisibleClientsSharingVideo != visibleClientsSharingVideo else { return }
-        delegate?.callGridViewController(self, perform: .requestVideoStreamsForClients(clientStreams))
-        visibleClientsSharingVideo = newVisibleClientsSharingVideo
+        delegate?.callGridViewController(self, perform: .requestVideoStreamsForClients(clients))
+        visibleClientsSharingVideo = clients
     }
 
     // MARK: - Grid View Axis

wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallGridView/Stream/Stream.swift

@@ -27,6 +27,7 @@ struct Stream: Equatable {
     let callParticipantState: CallParticipantState
     let activeSpeakerState: ActiveSpeakerState
     let isPaused: Bool
+
 }
 
 extension Stream: Differentiable {

wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallInfoViewController/CallGridAction.swift

@@ -20,5 +20,5 @@ import WireSyncEngine
 
 // The actions `CallGridViewController` can perform.
 enum CallGridAction {
-    case requestVideoStreamsForClients(_ clients: [AVSClientVideoStream])
+    case requestVideoStreamsForClients(_ clients: [AVSClient])
 }

wire-ios/Wire-iOS/Sources/UserInterface/Calling/CallViewController/CallViewController.swift

@@ -218,7 +218,7 @@ final class CallViewController: UIViewController {
     }
 
     func reloadGrid() {
-        callGridViewController.reloadGridData()
+        callGridViewController.releadGridData()
     }
 
     override func accessibilityPerformEscape() -> Bool {