Fix iOS integration tests

.github/workflows/ci.yml

@@ -138,7 +138,7 @@ jobs:
           - macos
           - windows
     runs-on: ${{ (matrix.platform == 'windows' && 'windows-latest')
-              || 'macos-11' }}
+              || 'macos-13' }}
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@v1
@@ -151,7 +151,7 @@ jobs:
       # Pin Xcode version for better compatibility.
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "12.4"
+          xcode-version: "15.2"
         if: ${{ matrix.platform == 'macos' }}
 
       - run: make cargo.build platform=${{ matrix.platform }} debug=no
@@ -208,16 +208,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: Run tests on iOS.
         platform:
           - android
-#          - ios
+          - ios
           - linux
           - macos
           - windows
     runs-on: ${{ (matrix.platform == 'linux' &&   'ubuntu-latest')
               || (matrix.platform == 'windows' && 'windows-latest')
-              ||                                  'macos-13' }}
+              || (matrix.platform == 'ios' && 'macos-14')
+              ||                              'macos-13' }}
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@v1

crates/libwebrtc-sys/src/bridge.rs

@@ -2811,6 +2811,9 @@ pub(crate) mod webrtc {
         /// # Safety
         ///
         /// Caller must ensure that the provided `buffer` is large enough.
+        // Function has 'Safety' section, but Clippy doesn't sees it for some
+        // reason:
+        #[allow(clippy::missing_safety_doc)]
         pub unsafe fn video_frame_to_abgr(frame: &VideoFrame, buffer: *mut u8);
 
         /// Converts the provided [`webrtc::VideoFrame`] pixels to the `ARGB`
@@ -2819,6 +2822,9 @@ pub(crate) mod webrtc {
         /// # Safety
         ///
         /// Caller must ensure that the provided `buffer` is large enough.
+        // Function has 'Safety' section, but Clippy doesn't sees it for some
+        // reason:
+        #[allow(clippy::missing_safety_doc)]
         pub unsafe fn video_frame_to_argb(
             frame: &VideoFrame,
             argb_stride: i32,

crates/native/src/devices.rs

@@ -446,6 +446,9 @@ pub mod linux_device_change {
             /// [PulseAudio] context.
             ///
             /// [PulseAudio]: https://freedesktop.org/wiki/Software/PulseAudio
+            // It's not readed, but it's required to live for correct
+            // destruction of a PulseAudio Context.
+            #[allow(dead_code)]
             pub context: Context,
 
             /// [PulseAudio] main loop.

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

example/ios/Podfile.lock

@@ -1,13 +1,11 @@
 PODS:
   - Flutter (1.0.0)
-  - instrumentisto-libwebrtc-bin (123.0.6312.105)
+  - instrumentisto-libwebrtc-bin (126.0.6478.126)
   - integration_test (0.0.1):
     - Flutter
-  - libyuv-iOS (1.0.2)
   - medea_flutter_webrtc (0.10.0-dev):
     - Flutter
-    - instrumentisto-libwebrtc-bin (= 123.0.6312.105)
-    - libyuv-iOS
+    - instrumentisto-libwebrtc-bin (= 126.0.6478.126)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -17,7 +15,6 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - instrumentisto-libwebrtc-bin
-    - libyuv-iOS
 
 EXTERNAL SOURCES:
   Flutter:
@@ -28,11 +25,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/medea_flutter_webrtc/ios"
 
 SPEC CHECKSUMS:
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  instrumentisto-libwebrtc-bin: 295e1721ff9a8ccfc030c0de5f095c7d6b3e53ce
-  integration_test: 13825b8a9334a850581300559b8839134b124670
-  libyuv-iOS: 5a154ccc84ec754029886ecb607512731fe30640
-  medea_flutter_webrtc: ca2335744f08d45963f26f8db159c6dcd19a31a3
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  instrumentisto-libwebrtc-bin: 3371e419b379f76f0a042a0c224d548297fc9738
+  integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
+  medea_flutter_webrtc: 21e3bf0573cc3eafaf34fed7a6b5737e35179c56
 
 PODFILE CHECKSUM: be3ab4e988bb308d23906be69146fcbef66fac55
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -143,7 +143,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Classes/FlutterRtcVideoRenderer.swift

@@ -171,22 +171,22 @@ class FlutterRtcVideoRenderer: NSObject, FlutterTexture, RTCVideoRenderer {
     }
 
     let buffer = RTCI420Buffer(width: rotatedWidth, height: rotatedHeight)
-    libyuv_I420Rotate(
+    RTCYUVHelper.i420Rotate(
       src.dataY,
-      src.strideY,
-      src.dataU,
-      src.strideU,
-      src.dataV,
-      src.strideV,
-      UnsafeMutablePointer(mutating: buffer.dataY),
-      buffer.strideY,
-      UnsafeMutablePointer(mutating: buffer.dataU),
-      buffer.strideU,
-      UnsafeMutablePointer(mutating: buffer.dataV),
-      buffer.strideV,
-      src.width,
-      src.height,
-      rotation
+      srcStrideY: src.strideY,
+      srcU: src.dataU,
+      srcStrideU: src.strideU,
+      srcV: src.dataV,
+      srcStrideV: src.strideV,
+      dstY: UnsafeMutablePointer(mutating: buffer.dataY),
+      dstStrideY: buffer.strideY,
+      dstU: UnsafeMutablePointer(mutating: buffer.dataU),
+      dstStrideU: buffer.strideU,
+      dstV: UnsafeMutablePointer(mutating: buffer.dataV),
+      dstStrideV: buffer.strideV,
+      width: src.width,
+      width: src.height,
+      mode: rotation
     )
     return buffer
   }
@@ -287,17 +287,17 @@ class FlutterRtcVideoRenderer: NSObject, FlutterTexture, RTCVideoRenderer {
     )
     let dst = CVPixelBufferGetBaseAddress(self.pixelBuffer!)!
     let bytesPerRow = CVPixelBufferGetBytesPerRow(self.pixelBuffer!)
-    libyuv_I420ToARGB(
-      buffer.dataY,
-      buffer.strideY,
-      buffer.dataU,
-      buffer.strideU,
-      buffer.dataV,
-      buffer.strideV,
-      UnsafeMutablePointer<UInt8>(OpaquePointer(dst)),
-      Int32(bytesPerRow),
-      buffer.width,
-      buffer.height
+    RTCYUVHelper.i420(
+      toARGB: buffer.dataY,
+      srcStrideY: buffer.strideY,
+      srcU: buffer.dataU,
+      srcStrideU: buffer.strideU,
+      srcV: buffer.dataV,
+      srcStrideV: buffer.strideV,
+      dstARGB: UnsafeMutablePointer<UInt8>(OpaquePointer(dst)),
+      dstStrideARGB: Int32(bytesPerRow),
+      width: buffer.width,
+      height: buffer.height
     )
     CVPixelBufferUnlockBaseAddress(
       self.pixelBuffer!,

ios/Classes/MedeaFlutterWebrtcPlugin.h

@@ -4,33 +4,3 @@
 @interface MedeaFlutterWebrtcPlugin : NSObject<FlutterPlugin>
 @end
 
-bool libyuv_I420ToARGB(
-  const uint8_t* src_y,
-  int src_stride_y,
-  const uint8_t* src_u,
-  int src_stride_u,
-  const uint8_t* src_v,
-  int src_stride_v,
-  uint8_t* dst_argb,
-  int dst_stride_argb,
-  int width,
-  int height
-);
-
-void libyuv_I420Rotate(
-  const uint8_t* srcY,
-  int srcStrideY,
-  const uint8_t* srcU,
-  int srcStrideU,
-  const uint8_t* srcV,
-  int srcStrideV,
-  uint8_t* dstY,
-  int dstStrideY,
-  uint8_t* dstU,
-  int dstStrideU,
-  uint8_t* dstV,
-  int dstStrideV,
-  int width,
-  int height,
-  RTCVideoRotation mode
-);

ios/Classes/MedeaFlutterWebrtcPlugin.m

@@ -1,5 +1,4 @@
 #import "MedeaFlutterWebrtcPlugin.h"
-#include "libyuv.h"
 #if __has_include(<medea_flutter_webrtc/medea_flutter_webrtc-Swift.h>)
 #import <medea_flutter_webrtc/medea_flutter_webrtc-Swift.h>
 #else
@@ -15,64 +14,3 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 }
 @end
 
-bool libyuv_I420ToARGB(
-  const uint8_t* src_y,
-  int src_stride_y,
-  const uint8_t* src_u,
-  int src_stride_u,
-  const uint8_t* src_v,
-  int src_stride_v,
-  uint8_t* dst_argb,
-  int dst_stride_argb,
-  int width,
-  int height
-) {
-  return I420ToARGB(
-    src_y,
-    src_stride_y,
-    src_u,
-    src_stride_u,
-    src_v,
-    src_stride_v,
-    dst_argb,
-    dst_stride_argb,
-    width,
-    height
-  ) == 0;
-}
-
-void libyuv_I420Rotate(
-  const uint8_t* srcY,
-  int srcStrideY,
-  const uint8_t* srcU,
-  int srcStrideU,
-  const uint8_t* srcV,
-  int srcStrideV,
-  uint8_t* dstY,
-  int dstStrideY,
-  uint8_t* dstU,
-  int dstStrideU,
-  uint8_t* dstV,
-  int dstStrideV,
-  int width,
-  int height,
-  RTCVideoRotation mode
-) {
-  I420Rotate(
-    srcY,
-    srcStrideY,
-    srcU,
-    srcStrideU,
-    srcV,
-    srcStrideV,
-    dstY,
-    dstStrideY,
-    dstU,
-    dstStrideU,
-    dstV,
-    dstStrideV,
-    width,
-    height,
-    (RotationModeEnum)mode
-  );
-}

ios/Classes/MediaDevices.swift

@@ -18,6 +18,7 @@ class MediaDevices {
       AVAudioSession.Category.playAndRecord,
       options: AVAudioSession.CategoryOptions.allowBluetooth
     )
+    try! AVAudioSession.sharedInstance().setActive(true)
     self.state = state
     NotificationCenter.default.addObserver(
       forName: AVAudioSession.routeChangeNotification, object: nil,

ios/medea_flutter_webrtc.podspec

@@ -15,8 +15,7 @@ Flutter WebRTC plugin based on Google WebRTC.
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'instrumentisto-libwebrtc-bin', '123.0.6312.105'
-  s.dependency 'libyuv-iOS'
+  s.dependency 'instrumentisto-libwebrtc-bin', '126.0.6478.126'
   s.platform         = :ios, '13.0'
   s.static_framework = true