From 83ba29b116fb287c813ab4c58fee4cc1fb38a29a Mon Sep 17 00:00:00 2001
From: bluesea <307723040@qq.com>
Date: Fri, 26 Apr 2024 18:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=A2=E8=93=9D=E7=AB=8B?=
 =?UTF-8?q?=E4=BD=93=E7=BC=A9=E6=94=BE=E6=95=88=E6=9E=9C,=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E7=9E=B3=E8=B7=9D=E6=95=88=E6=9E=9C=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=9A=90=E8=97=8F,=E8=BF=98=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZZHCustomPlayer.swift                     |  4 +--
 .../Util/PlayByTransferConvertor.swift        | 29 +++++++++++++++----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
index fc8e592..2f3250f 100644
--- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
+++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
@@ -376,8 +376,8 @@ class ZZHCustomPlayer: UIView {
         }
         
         currentScale = currentScale - (temScale - sender.scale)
-        currentScale = min(currentScale, 1.5)
-        currentScale = max(currentScale, 0.6)
+        currentScale = min(currentScale, 1.8)
+        currentScale = max(currentScale, 0.3)
         temScale = sender.scale
         print("\(sender.scale)    currentScale....\(currentScale)")
     }
diff --git a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift
index b38d81d..61a7774 100644
--- a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift
+++ b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift
@@ -59,9 +59,10 @@ class PlayByTransferConvertor {
                         newpb = joinImages_sbs(left: left, right: right, imgWidth: cwidth, imgHeight:cheight )
                         break
                     case .fsbs:
-                        cwidth = left.size.width
-                        cheight = left.size.height
-                        newpb = joinImages_fsbs(left: left, right: right, imgWidth: cwidth, imgHeight: cheight)
+//                        cwidth = left.size.width
+//                        cheight = left.size.height
+//                        newpb = joinImages_fsbs(left: left, right: right, imgWidth: cwidth, imgHeight: cheight)
+                        newpb = joinImages(leftImage: lciImage, rightImage: rciImage,scale: scale,ed: ed)
                         break
                     case .parallelEyes://平行眼
                         
@@ -71,7 +72,7 @@ class PlayByTransferConvertor {
                         newpb = joinImages(leftImage: rciImage, rightImage: lciImage,scale: scale,ed: ed)
                         break
                     case .redBlueSolid://红蓝立体
-                        newpb = joinImages_red_blue(lciImage: lciImage, rciImage: rciImage)
+                        newpb = joinImages_red_blue(lciImage: lciImage, rciImage: rciImage,scale: scale)
                         break
                     default:
                         break
@@ -91,7 +92,7 @@ class PlayByTransferConvertor {
     
     
     //合成红蓝立体图片
-    func joinImages_red_blue(lciImage:CIImage,rciImage:CIImage) -> CIImage {
+    func joinImages_red_blue(lciImage:CIImage,rciImage:CIImage,scale: CGFloat) -> CIImage {
         // 创建红色和蓝色滤镜
         let redColorMatrix: [CGFloat] = [
             0.0, 0.0, 0.0, 0.0, 0.0, // 红色通道
@@ -128,7 +129,23 @@ class PlayByTransferConvertor {
             sharpenedFilter.setValue(2, forKey: kCIInputSharpnessKey)
             lastImg = sharpenedFilter.outputImage!
         }
-        return lastImg!
+        if scale == 1 {
+            return lastImg!
+        }
+        else {
+            var drawImg = UIImage(ciImage: lastImg!)
+            let drawImageSize = drawImg.size
+            let newImgSize = CGSizeMake(drawImageSize.width * scale, drawImageSize.height * scale)
+            let newRect = CGRect(origin: CGPoint(x: (drawImageSize.width - newImgSize.width) * 0.5, y: (drawImageSize.height - newImgSize.height) * 0.5), size: newImgSize)
+            UIGraphicsBeginImageContextWithOptions(drawImageSize, false, 1);
+            drawImg.draw(in: newRect)
+            let image = UIGraphicsGetImageFromCurrentImageContext()!
+            UIGraphicsEndImageContext();
+
+             
+            let ci = CIImage(cgImage: image.cgImage!)
+            return ci
+        }
     }