3-group-ios/VPCamera3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注释未使用的代码

Browse Source
This commit is contained in:
Zhihai Zhu 2024-04-20 11:39:52 +08:00
parent 1eb4326d61
commit c38e6a78de
7 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SwiftProject/SwiftProject.xcodeproj/project.pbxproj
View File

@ -19,8 +19,6 @@
006B61D32BBAA938003FCB49 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 006B61D22BBAA938003FCB49 /* StoreKit.framework */; };
006B61DC2BBCFAC4003FCB49 /* CustomSheetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006B61DB2BBCFAC4003FCB49 /* CustomSheetController.swift */; };
006B61DE2BBCFB45003FCB49 /* CustomSheetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006B61DD2BBCFB45003FCB49 /* CustomSheetCell.swift */; };
0072361F2BD13B9D000595A9 /* ZZHCustomVideoCompositor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0072361E2BD13B9D000595A9 /* ZZHCustomVideoCompositor.swift */; };
007236212BD13C75000595A9 /* ZZHCustomVideoCompositionInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 007236202BD13C75000595A9 /* ZZHCustomVideoCompositionInstruction.swift */; };
0073BD142BCE80F700721885 /* ZZHCustomPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0073BD132BCE80F700721885 /* ZZHCustomPlayer.swift */; };
0073BD182BCF7B3400721885 /* ZZHCustomSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0073BD172BCF7B3400721885 /* ZZHCustomSlider.swift */; };
0073BD1A2BCFC8E800721885 /* ZZHCustomPlayerForVideoTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0073BD192BCFC8E800721885 /* ZZHCustomPlayerForVideoTask.swift */; };
@ -296,6 +294,8 @@
children = (
0073BD1B2BCFCC4500721885 /* CCSpatialVideoDisplayController1.swift */,
0073BD1D2BCFCC6900721885 /* CCSpatialVideoDisplayForVideoTask1.swift */,
0072361E2BD13B9D000595A9 /* ZZHCustomVideoCompositor.swift */,
007236202BD13C75000595A9 /* ZZHCustomVideoCompositionInstruction.swift */,
);
path = deapt;
sourceTree = "<group>";
@ -318,8 +318,6 @@
0073BD132BCE80F700721885 /* ZZHCustomPlayer.swift */,
0073BD192BCFC8E800721885 /* ZZHCustomPlayerForVideoTask.swift */,
0073BD172BCF7B3400721885 /* ZZHCustomSlider.swift */,
0072361E2BD13B9D000595A9 /* ZZHCustomVideoCompositor.swift */,
007236202BD13C75000595A9 /* ZZHCustomVideoCompositionInstruction.swift */,
);
path = CCSpatialVideoDisplayController;
sourceTree = "<group>";
@ -822,7 +820,6 @@
009DFB0E2BC8CFA2007B56E8 /* FeedbackView.swift in Sources */,
AF2120C42B4E95DA00400B7F /* UIImage+Add.swift in Sources */,
1EFAF0C02B8B7A59002A1773 /* VRPhotoTransformController.swift in Sources */,
0072361F2BD13B9D000595A9 /* ZZHCustomVideoCompositor.swift in Sources */,
AF2120D82B4E9AC500400B7F /* CCAddImageView.swift in Sources */,
00D33BF42B998BF700604A44 /* SpatialImageConvertor.swift in Sources */,
006B61CA2BBA4B0D003FCB49 /* MembershipVC.swift in Sources */,
@ -859,7 +856,6 @@
AF2120E62B4E9DE000400B7F /* CCTableSwitchView.swift in Sources */,
0096624D2BB3BA3B00FCA65F /* ZZHExternalViewController.swift in Sources */,
00D33BFA2B9AB21A00604A44 /* ZZHAVExtension.swift in Sources */,
007236212BD13C75000595A9 /* ZZHCustomVideoCompositionInstruction.swift in Sources */,
009661F82BAD6C7100FCA65F /* CCSpaceAlbumFilterPopView2.swift in Sources */,
009DFB132BC8EA90007B56E8 /* MenuVCCell.swift in Sources */,
AF2120E02B4E9C8000400B7F /* Timer+Add.swift in Sources */,

BIN
SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

6
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayer.swift
View File

@ -28,17 +28,17 @@ class ZZHCustomPlayer: UIView {
var assetReader:AVAssetReader?
var assetOutput:AVAssetReaderTrackOutput? {
didSet {
custominstruction?.assetOutput = assetOutput
// custominstruction?.assetOutput = assetOutput
}
}
var custominstruction:ZZHCustomVideoCompositionInstruction?
// var custominstruction:ZZHCustomVideoCompositionInstruction?
let videoTranserConvertor = PlayByTransferConvertor()
var selectedIndex:SpatialType = .parallelEyes//记录当前选择的菜单选项
{
didSet{
//进行相应解码操作，边解边播
custominstruction?.selectedIndex = selectedIndex
// custominstruction?.selectedIndex = selectedIndex
}
}

10
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomPlayerForVideoTask.swift
View File

@ -100,26 +100,26 @@ extension ZZHCustomPlayer {
var presentTime:CMTime? = nil
switch mode {
case .crossedEyes://交叉眼
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
break
case .fsbs://3d全宽
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
break
case .hsbs://3d半宽
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
break
case .parallelEyes://平行眼
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
break
case .redBlueSolid://红蓝立体
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: self.videoOriginalAsset, assetOutput: ao, type: self.selectedIndex, time: compositionTime)
break
default:
break

0
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomVideoCompositionInstruction.swift → SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/deapt/ZZHCustomVideoCompositionInstruction.swift
View File

10
SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/ZZHCustomVideoCompositor.swift → SwiftProject/SwiftProject/Project/Controller/RecordingVideo/CCSpatialVideoDisplayController/deapt/ZZHCustomVideoCompositor.swift
View File

@ -137,26 +137,26 @@ final class ZZHCustomVideoCompositor: NSObject, AVVideoCompositing {
var presentTime:CMTime? = nil
switch mode {
case .crossedEyes://交叉眼
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type:mode, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type:mode, time: compositionTime)
break
case .fsbs://3d全宽
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
break
case .hsbs://3d半宽
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
break
case .parallelEyes://平行眼
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
break
case .redBlueSolid://红蓝立体
(ciImg,presentTime) = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
ciImg = self.videoTranserConvertor.convertVideo(asset: videoOriginalAsset, assetOutput: ao, type: mode, time: compositionTime)
break
default:
break

12
SwiftProject/SwiftProject/Project/Util/PlayByTransferConvertor.swift
View File

@ -14,14 +14,14 @@ import ImageIO
class PlayByTransferConvertor {
func convertVideo(asset:AVAsset, assetOutput:AVAssetReaderTrackOutput,type:SpatialType,time: CMTime)->(CIImage?,CMTime?) {
func convertVideo(asset:AVAsset, assetOutput:AVAssetReaderTrackOutput,type:SpatialType,time: CMTime)->(CIImage?) {
var newpb:CIImage? = nil
var presentationTime:CMTime? = nil
print("sta.....>>>>>>>thread")
// var presentationTime:CMTime? = nil
// print("sta.....>>>>>>>thread")
while let nextSampleBuffer = assetOutput.copyNextSampleBuffer() {
presentationTime = CMSampleBufferGetPresentationTimeStamp(nextSampleBuffer)
print("presentationTime: \(presentationTime) \ntime: \(time)")
var presentationTime = CMSampleBufferGetPresentationTimeStamp(nextSampleBuffer)
// print("presentationTime: \(presentationTime) \ntime: \(time)")
// if presentationTime! > time {//如果当前获取的buffer的时间>time的时间,则直接返回即可
// print("如果当前获取的buffer的时间>time的时间,则直接返回即可...")
// break
@ -85,7 +85,7 @@ class PlayByTransferConvertor {
}
}
// print("PlayByTransferConvertor 测试看是否有返回....")
return (newpb,presentationTime)
return (newpb)
}