[FIX] NMS-26713 NMS-26700

Author: HeZhengQing

macOS/APIExample/Common/Utils/MediaUtils.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (CVPixelBufferRef)i420ToPixelBuffer:(void *)srcY srcU:(void *)srcU srcV:(void *)srcV width:(int)width height:(int)height;
 
-+ (NSImage *)pixelBufferToImage: (CVPixelBufferRef)pixelBuffer;
++ (NSImage *)pixelBufferToImage:(CVPixelBufferRef)pixelBuffer withRotationDegrees:(CGFloat)angleInDegrees;
 
 + (NSData *)dataFromPixelBuffer:(CVPixelBufferRef)pixelBuffer;
 

macOS/APIExample/Common/Utils/MediaUtils.m

@@ -140,18 +140,18 @@ + (NSImage *)i420ToImage:(void *)srcY srcU:(void *)srcU srcV:(void *)srcV width:
     return finalImage;
 }
 
-+ (NSImage *)pixelBufferToImage: (CVPixelBufferRef)pixelBuffer {
-    size_t width = CVPixelBufferGetHeight(pixelBuffer);
-    size_t height = CVPixelBufferGetWidth(pixelBuffer);
-    
++ (NSImage *)pixelBufferToImage:(CVPixelBufferRef)pixelBuffer withRotationDegrees:(CGFloat)angleInDegrees {
     CIImage *coreImage = [CIImage imageWithCVPixelBuffer:pixelBuffer];
+    CGFloat angleInRadians = -angleInDegrees * (M_PI / 180);
+    
+    CGAffineTransform rotationTransform = CGAffineTransformMakeRotation(angleInRadians);
+    CIImage *rotatedImage = [coreImage imageByApplyingTransform:rotationTransform];
+    
     CIContext *temporaryContext = [CIContext contextWithOptions:nil];
-    CGImageRef videoImage = [temporaryContext createCGImage:coreImage
-                                                   fromRect:CGRectMake(0, 0, height, width)];
+    CGImageRef videoImage = [temporaryContext createCGImage:rotatedImage fromRect:[rotatedImage extent]];
 
-    NSImage *finalImage = [[NSImage alloc] initWithCGImage:videoImage size: CGSizeMake(width, height)];
+    NSImage *finalImage = [[NSImage alloc] initWithCGImage:videoImage size:NSZeroSize];
 
-    //    CVPixelBufferRelease(pixelBuffer);
     CGImageRelease(videoImage);
     return finalImage;
 }

macOS/APIExample/Examples/Advanced/Multipath/Base.lproj/Multipath.storyboard

@@ -38,7 +38,7 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 </view>
                                                 <switch horizontalHuggingPriority="750" verticalHuggingPriority="750" baseWritingDirection="leftToRight" alignment="left" state="on" translatesAutoresizingMaskIntoConstraints="NO" id="Lwi-x7-gXz">
-                                                    <rect key="frame" x="236" y="325" width="42" height="26"/>
+                                                    <rect key="frame" x="236" y="323" width="42" height="26"/>
                                                     <connections>
                                                         <action selector="onClickMultipathSwitch:" target="zLf-Ex-oud" id="Vt2-3l-vzb"/>
                                                     </connections>
@@ -132,6 +132,7 @@
                         <outlet property="Container" destination="fby-v7-FIJ" id="juc-7s-DOF"/>
                         <outlet property="channelField" destination="EJd-Bd-Goe" id="0A4-WA-Fi1"/>
                         <outlet property="joinChannelButton" destination="CS3-Kj-Lpq" id="hPB-xL-Tpw"/>
+                        <outlet property="multipathSwitch" destination="Lwi-x7-gXz" id="9kP-Wc-zh7"/>
                         <outlet property="selectModePicker" destination="6i1-vk-Tbe" id="IFb-zT-hrH"/>
                         <outlet property="selectRolePicker" destination="5UX-4c-O42" id="Prj-iq-HRi"/>
                     </connections>

macOS/APIExample/Examples/Advanced/Multipath/Multipath.swift

@@ -35,6 +35,9 @@ class MultipathMain: BaseViewController {
             return nil
         }
     }
+    
+    @IBOutlet weak var multipathSwitch: NSSwitch!
+    
     func initSelectRolePicker() {
         selectRolePicker.label.stringValue = "Role".localized
         selectRolePicker.picker.addItems(withTitles: roles.map { $0.description() })
@@ -179,7 +182,7 @@ class MultipathMain: BaseViewController {
             channelMediaOption.publishCameraTrack = role == .broadcaster
             channelMediaOption.publishMicrophoneTrack = role == .broadcaster
             channelMediaOption.clientRoleType = role
-            channelMediaOption.enableMultipath = true
+            channelMediaOption.enableMultipath = (multipathSwitch.state == .on)
             channelMediaOption.uplinkMultipathMode = (selectModePicker.picker.indexOfSelectedItem == 0) ? .dynamic : .duplicate
             channelMediaOption.downlinkMultipathMode = (selectModePicker.picker.indexOfSelectedItem == 0) ? .dynamic : .duplicate
             channelMediaOption.autoSubscribeVideo = true
@@ -230,7 +233,7 @@ class MultipathMain: BaseViewController {
         let isOn = (sender.state == .on)
         channelMediaOption.enableMultipath = isOn
         let ret = agoraKit.updateChannel(with: channelMediaOption)
-        if isOn {
+        if !isOn {
             videos[0].statsInfo?.updateMultipathStats(nil)
         }
         LogUtils.log(message: "updateChannel Multipath ret: \(ret) isOn: \(isOn)", level: .info)

macOS/APIExample/Examples/Advanced/RawVideoData/RawVideoData.swift

@@ -120,8 +120,8 @@ extension RawVideoData: AgoraVideoFrameDelegate {
     func onRenderVideoFrame(_ videoFrame: AgoraOutputVideoFrame, uid: UInt, channelId: String) -> Bool {
         if isSnapShoting, let pixelBuffer = videoFrame.pixelBuffer {
             isSnapShoting = false
-            let image = MediaUtils.pixelBuffer(toImage: pixelBuffer)
-            
+            let image = MediaUtils.pixelBuffer(toImage: pixelBuffer, withRotationDegrees: CGFloat(videoFrame.rotation))
+
             DispatchQueue.main.async {
                 self.imageView.image = image
             }