diff --git a/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift b/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift index 55dc8c6..ad8503b 100644 --- a/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift +++ b/SwiftProject/SwiftProject/CCKit/Config/CCEnumFile.swift @@ -37,4 +37,8 @@ enum CCTransformParameterType : Int case bitRate = 3 //比特率 case formatVideoEncoding = 4//视频编码格式 case horizontalDialogueAdjustment = 5//水平视差调整 + case hsbs_3D = 6 //hsbs格式 半宽左右格式 + case fsbs_3D = 7 //fsbs格式 全宽左右格式 + case hou_3d = 8 //hou格式 半高上下格式 + case fou_3D = 9 //fou格式 全高上下格式 } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift index c69dba5..6162fe9 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRPhotoTransformController.swift @@ -204,11 +204,7 @@ class VRPhotoTransformController: BaseController { func setSpatialParametersListData() { let popData = [ - (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HSBS")/*, - (type:CCTransformParameterType.resolution,title:"分辨率",name:"1080P"), - (type:CCTransformParameterType.bitRate,title:"比特率",name:"最佳"), - (type:CCTransformParameterType.formatVideoEncoding,title:"视频编码格式",name:"H.265"), - (type:CCTransformParameterType.horizontalDialogueAdjustment,title:"水平视差调整",name:"0")*/] + (type:CCTransformParameterType.hsbs_3D,title:"3D 格式",name:"3D HSBS")] mTabView?.setSpatialParametersData(data: popData) } @@ -250,7 +246,9 @@ class VRPhotoTransformController: BaseController { switch model.type { case .format3D: print("3D 格式") - + + case .hsbs_3D ,.fsbs_3D,.hou_3d,.fou_3D: + print("3D 格式") /* 3D HSBS(半宽左右格式) 3D FSBS(全款左右格式) @@ -262,25 +260,25 @@ class VRPhotoTransformController: BaseController { print("3D HSBS(半宽左右格式)") let popData = [ - (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HSBS")] + (type:CCTransformParameterType.hsbs_3D,title:"3D 格式",name:"3D HSBS")] mTabView?.setSpatialParametersData(data: popData) } let action2 = UIAlertAction(title: "3D FSBS(全宽左右格式)" , style: .default) { [self] (action:UIAlertAction) in print("3D FSBS(全宽左右格式)") let popData = [ - (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D FSBS")] + (type:CCTransformParameterType.fsbs_3D,title:"3D 格式",name:"3D FSBS")] mTabView?.setSpatialParametersData(data: popData) } let action3 = UIAlertAction(title: "3D HOU(半高上下格式)" , style: .default) { [self] (action:UIAlertAction) in print("3D HOU(半高上下格式)") let popData = [ - (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D HOU")] + (type:CCTransformParameterType.hou_3d,title:"3D 格式",name:"3D HOU")] mTabView?.setSpatialParametersData(data: popData) } let action4 = UIAlertAction(title: "3D FOU(全高上下格式)" , style: .default) { [self] (action:UIAlertAction) in print("3D FOU(全高上下格式)") let popData = [ - (type:CCTransformParameterType.format3D,title:"3D 格式",name:"3D FOU")] + (type:CCTransformParameterType.fou_3D,title:"3D 格式",name:"3D FOU")] mTabView?.setSpatialParametersData(data: popData) } diff --git a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift index e34218b..c5153ec 100644 --- a/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift +++ b/SwiftProject/SwiftProject/Project/Controller/RecordingVideo/VRVideoTransformController.swift @@ -404,7 +404,8 @@ class VRVideoTransformController: BaseController { switch model.type { case .format3D: print("3D 格式") - + case .hsbs_3D ,.fsbs_3D,.hou_3d,.fou_3D: + print("3D 格式") /* 3D HSBS(半宽左右格式) 3D FSBS(全款左右格式)