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 + } }