diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index ae5ee92..0eb56fd 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -284,6 +284,7 @@ class CCSpatialVideoDisplayController: BaseController { self.customPlayer.layoutViewWhenScreenLandscape(value: false) self.navtionBar?.isHidden = false self.customPlayer.isLandscape = false + mTopImgView.isHidden = false break case .landscapeLeft , .landscapeRight: print("Landscape ...") @@ -298,6 +299,7 @@ class CCSpatialVideoDisplayController: BaseController { self.view.layoutIfNeeded() self.customPlayer.layoutViewWhenScreenLandscape(value: true) self.navtionBar?.isHidden = true + mTopImgView.isHidden = true break default: print("Other") diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index b80ba0d..26a8942 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift @@ -159,7 +159,7 @@ class ZZHCustomPlayer: UIView { avPlayerLayer = AVPlayerLayer(player: avPlayer) avPlayerLayer?.frame = CGRect(x: 0, y: 0, width: Int(playerWidth), height: playerHeight) - avPlayerLayer?.videoGravity = .resizeAspect + avPlayerLayer?.videoGravity = .resize playerLayerBgView!.layer.addSublayer(avPlayerLayer!) // playerLayerBgView?.backgroundColor = UIColor.red // self.backgroundColor = .orange diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayerForVideoTask.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayerForVideoTask.swift index fed6fc9..18a0178 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayerForVideoTask.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayerForVideoTask.swift @@ -66,7 +66,8 @@ extension ZZHCustomPlayer { var ciImg:CIImage? = nil switch self.selectedIndex { case .monocular2D://双眼2d - ciImg = request.sourceImage +// ciImg = request.sourceImage + ciImg = monocular2DImgWith(ciImg: request.sourceImage, scale: currentScale) break default : @@ -95,6 +96,11 @@ extension ZZHCustomPlayer { } } + //根据scale返回2d的缩放图片 + func monocular2DImgWith(ciImg:CIImage,scale:CGFloat)->CIImage { + return self.videoTranserConvertor.monocular2DImgWith(ciImg: ciImg, scale: scale) + } + func otherModeImgWithMode(mode:SpatialType,compositionTime:CMTime)->CIImage? { guard let ao = self.assetOutput else { print("assetOutput 应该是没有被创建成功.....") diff --git a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift index 9c40447..a672964 100644 --- a/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift +++ b/SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift @@ -89,7 +89,25 @@ class PlayByTransferConvertor { return (newpb) } - + func monocular2DImgWith(ciImg:CIImage,scale:CGFloat)->CIImage { + if scale > 1 || scale < 1 { + let drawImg = UIImage(ciImage: ciImg) + 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 + } + else { + return ciImg + } + } //合成红蓝立体图片 func joinImages_red_blue(lciImage:CIImage,rciImage:CIImage,scale: CGFloat) -> CIImage {