diff --git a/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift b/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift index 04984a5..9d4d0b1 100644 --- a/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift +++ b/SwiftProject/SwiftProject/ExternalScreen/ZZHExternalViewController.swift @@ -27,6 +27,7 @@ class ZZHExternalViewController: UIViewController { playerLayer = AVPlayerLayer() +// playerLayer?.videoGravity = .resizeAspectFill if let externalScreen = UIScreen.screens.first(where: { $0 != UIScreen.main }) { let externalScreenSize = externalScreen.bounds.size playerLayer!.frame = CGRectMake(-externalScreenSize.width*0.5, -externalScreenSize.height*0.5, externalScreenSize.width*2, externalScreenSize.height*2) diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 291bb56..ae5ee92 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -425,7 +425,7 @@ class CCSpatialVideoDisplayController: BaseController { //当isAirPlayActive值改变时会调用该方法 func setttinisScreenMirroring(isScreenMirroring:Bool){ - customPlayer.isPlayingOnExternalScreen = isScreenMirroring +// customPlayer.isPlayingOnExternalScreen = isScreenMirroring releaseVideoComposition() diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift index de220d2..b80ba0d 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift @@ -17,7 +17,7 @@ class ZZHCustomPlayer: UIView { var maskViewTapCallback:CustomMaskViewTapCallback? //标记是否为横屏 var isLandscape:Bool = false - //标记是否正在串流中 + //标记是否正在串流中:目前就是用于控制是否显示瞳距调节的slider部分 var isPlayingOnExternalScreen = false //视频资源 var sourceVideoURL:URL? @@ -38,6 +38,13 @@ class ZZHCustomPlayer: UIView { { didSet{ //进行相应解码操作,边解边播 + if selectedIndex == .parallelEyes || selectedIndex == .crossedEyes { + isPlayingOnExternalScreen = false + } + else{ + isPlayingOnExternalScreen = true + currentED = 0 + } } }