Merge pull request #53 from ant-media/adapt-pixelbuffer-in-custom-fra…

…me-capturer Adapt pixelbuffer width/height in custom frame capturer
ant-media · Jun 1, 2024 · a9d7e55 · a9d7e55
2 parents facf293 + 0ff0430
commit a9d7e55
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 39 deletions.
diff --git a/ScreenShare/ScreenShare.entitlements b/ScreenShare/ScreenShare.entitlements
@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.io.antmedia.ios.webrtc.sample</string>
+	</array>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/WebRTC-Sample-App.entitlements b/WebRTC-Sample-App/WebRTC-Sample-App.entitlements
@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.io.antmedia.ios.webrtc.sample</string>
+	</array>
 </dict>
 </plist>
diff --git a/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements b/WebRTC-Sample-App/WebRTC-Sample-AppDebug.entitlements
@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.io.antmedia.ios.webrtc.sample</string>
+	</array>
 </dict>
 </plist>
diff --git a/WebRTCiOSSDK/api/AntMediaClient.swift b/WebRTCiOSSDK/api/AntMediaClient.swift
@@ -54,6 +54,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
 
 
     internal static var isDebug: Bool = false
+    internal static var isVerbose: Bool = false
     public weak var delegate: AntMediaClientDelegate?
 
     private var wsUrl: String!
@@ -1073,6 +1074,13 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
         }
     }
 
+    public static func verbose(_ msg:String) {
+        if (AntMediaClient.isVerbose) {
+            debugPrint("--> AntMediaSDK[verbose]: " + msg);
+        }
+
+    }
+
     public func getStreamInfo()
     {
         if (self.isWebSocketConnected)

diff --git a/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift b/WebRTCiOSSDK/api/webrtc/RTCCustomFrameCapturer.swift
@@ -54,20 +54,36 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
     public func capture(_ pixelBuffer: CVPixelBuffer, rotation:RTCVideoRotation, timeStampNs: Int64 )
     {
         if ((Double(timeStampNs) - Double(lastSentFrameTimeStampNanoSeconds)) < frameRateIntervalNanoSeconds ) {
-            AntMediaClient.printf("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
+            AntMediaClient.verbose("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
             return;
 
         }
+
+        let width = Int32(CVPixelBufferGetWidth(pixelBuffer))
+        let height = Int32(CVPixelBufferGetHeight(pixelBuffer))
+
+        var scaledWidth = (width * Int32(self.targetHeight)) / height;
+        if (scaledWidth % 2 == 1) {
+            scaledWidth+=1;
+        }
+
         let rtcPixelBuffer = RTCCVPixelBuffer(
-            pixelBuffer: pixelBuffer)
-
-        let rtcVideoFrame = RTCVideoFrame(buffer: rtcPixelBuffer,
-
-                                          rotation: rotation, timeStampNs: Int64(timeStampNs))
+            pixelBuffer: pixelBuffer,
+            adaptedWidth:scaledWidth,
+            adaptedHeight: Int32(self.targetHeight),
+            cropWidth: width,
+            cropHeight: height,
+            cropX: 0,
+            cropY: 0)
 
-        self.delegate?.capturer(self, didCapture: rtcVideoFrame.newI420())
-        lastSentFrameTimeStampNanoSeconds = timeStampNs;
+        let rtcVideoFrame = RTCVideoFrame(
+                    buffer: rtcPixelBuffer,
+                    rotation: rotation,
+                    timeStampNs: Int64(timeStampNs)
+                )
 
+        self.delegate?.capturer(self, didCapture: rtcVideoFrame.newI420())
+        lastSentFrameTimeStampNanoSeconds = Int64(timeStampNs);
     }
 
     public func capture(_ sampleBuffer: CMSampleBuffer, externalRotation:Int = -1) {
@@ -83,25 +99,16 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
             kNanosecondsPerSecond;
 
         if ((Double(timeStampNs) - Double(lastSentFrameTimeStampNanoSeconds)) < frameRateIntervalNanoSeconds ) {
-            AntMediaClient.printf("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
+            AntMediaClient.verbose("Dropping frame because high fps than the configured fps: \(fps). Incoming timestampNs:\(timeStampNs) last sent timestampNs:\(lastSentFrameTimeStampNanoSeconds) frameRateIntervalNs:\(frameRateIntervalNanoSeconds)");
             return;
 
         }
 
         let _pixelBuffer:CVPixelBuffer? = CMSampleBufferGetImageBuffer(sampleBuffer);
 
+
         if let pixelBuffer = _pixelBuffer
         {
-
-
-            let width = Int32(CVPixelBufferGetWidth(pixelBuffer))
-            let height = Int32(CVPixelBufferGetHeight(pixelBuffer))
-
-            var scaledWidth = (width * Int32(self.targetHeight)) / height;
-            if (scaledWidth % 2 == 1) {
-                scaledWidth+=1;
-            }
-
             //NSLog("Incoming frame width:\(width) height:\(height) adapted width:\(scaledWidth) height:\(self.targetHeight)")
 
             var rotation = RTCVideoRotation._0;
@@ -140,24 +147,9 @@ class RTCCustomFrameCapturer: RTCVideoCapturer {
                 rotation = RTCVideoRotation(rawValue:externalRotation) ?? RTCVideoRotation._0;
             }
 
-            //NSLog("Device orientation width: %d, height:%d ", width, height);
 
-            let rtcPixelBuffer = RTCCVPixelBuffer(
-                pixelBuffer: pixelBuffer,
-                adaptedWidth:scaledWidth,
-                adaptedHeight: Int32(self.targetHeight),
-                cropWidth: width,
-                cropHeight: height,
-                cropX: 0,
-                cropY: 0)
-
-            let rtcVideoFrame = RTCVideoFrame(buffer: rtcPixelBuffer,
-
-                                              rotation: rotation, timeStampNs: Int64(timeStampNs))
-
-            self.delegate?.capturer(self, didCapture: rtcVideoFrame.newI420())
-            lastSentFrameTimeStampNanoSeconds = Int64(timeStampNs);
-
+            capture(pixelBuffer, rotation: rotation, timeStampNs: Int64(timeStampNs))
+            //NSLog("Device orientation width: %d, height:%d ", width, height);
         }
         else {
             NSLog("Cannot get image buffer");