diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 99b7e58..ef92a4f 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 27b18a0..751843d 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -467,8 +467,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "63" - endingLineNumber = "63" + startingLineNumber = "47" + endingLineNumber = "47" landmarkName = "convertFrame(request:)" landmarkType = "7"> @@ -515,8 +515,8 @@ filePath = "SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "68" - endingLineNumber = "68" + startingLineNumber = "52" + endingLineNumber = "52" landmarkName = "convertFrame(request:)" landmarkType = "7"> diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift index 4a1d836..67793d2 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayController.swift @@ -37,9 +37,9 @@ class CCSpatialVideoDisplayController: BaseController { didSet{ //跟新selectedIndex、typeData的值 if(isAirPlayActive){ - selectedIndex = .hsbs//在串流模式下,默认选项为hsbs - typeData = [(icon:"type_check",title:"3D HSBS",isHiden:false), - (icon:"type_check",title:"3D FSBS",isHiden:false), + selectedIndex = .fsbs//在串流模式下,默认选项为hsbs + typeData = [(icon:"type_check",title:"3D FSBS",isHiden:false), + (icon:"type_check",title:"3D HSBS",isHiden:false) ] } else{ @@ -493,8 +493,8 @@ class CCSpatialVideoDisplayController: BaseController { self.playerController?.player = nil has_exvc.playerLayer?.player = player player?.play() -// externalDispalylink?.invalidate() -// externalDispalylink = nil + externalDispalylink?.invalidate() + externalDispalylink = nil } } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift index 4e8605c..cffd546 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/CCSpatialVideoDisplayForVideoTask.swift @@ -30,23 +30,7 @@ extension CCSpatialVideoDisplayController { temItem.videoComposition = ac } } - - - -// let filter = CIFilter(name: "CIGaussianBlur")! - -// let composition = AVVideoComposition(asset: temItem.asset, applyingCIFiltersWithHandler: {[weak self] request in -// print("正在请求解码图片frame....") -// guard let weakSelf = self else { -// print("self 被销毁了.....") -// return -// } -// weakSelf.convertFrame(request:request) -// -// -// }) -// temItem.videoComposition = composition - + return temItem } @@ -94,7 +78,7 @@ extension CCSpatialVideoDisplayController { // } - + print("mode:......\(mode)") var ciImg:CIImage? = nil switch mode { case .crossedEyes://交叉眼