Skip to content

Commit 06a2eb1

Browse files
shshjingshshjing
committed
update recent code
1 parent 6703f82 commit 06a2eb1

File tree

64 files changed

+3056
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3056
-58
lines changed

‎Example/VPInterfaceControllerDemo.xcodeproj/project.pbxproj‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
06D474B022F937FD00C9DADD /* VPVideoData.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D474AF22F937FD00C9DADD /* VPVideoData.m */; };
6262
06D474B322F9384900C9DADD /* VPVideoListData.m in Sources */ = {isa = PBXBuildFile; fileRef = 06D474B222F9384900C9DADD /* VPVideoListData.m */; };
6363
8844DF7302866437A1DEC1F9 /* libPods-VPInterfaceControllerDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C6009F1EF01AC68198F90DB /* libPods-VPInterfaceControllerDemo.a */; };
64+
B6032F1A241613C60013AF68 /* DevAppToolTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6032F19241613C60013AF68 /* DevAppToolTests.m */; };
65+
B6032F1C2416153A0013AF68 /* VideoOSDevAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6032F1B2416153A0013AF68 /* VideoOSDevAppTests.m */; };
66+
B620B314240508C300788FAD /* 20191218104055_cropping.wav in Resources */ = {isa = PBXBuildFile; fileRef = B620B313240508C300788FAD /* 20191218104055_cropping.wav */; };
6467
B6610E7D236006D400EC0479 /* DevLuaLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = B6610E7B236006CE00EC0479 /* DevLuaLoader.m */; };
6568
B6E4BF4F235EEFE300406434 /* DevAppResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B6E4BF33235EEFE300406434 /* DevAppResource.bundle */; };
6669
B6E4BF50235EEFE300406434 /* UIViewController+RTRootNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E4BF36235EEFE300406434 /* UIViewController+RTRootNavigationController.m */; };
@@ -99,6 +102,16 @@
99102
DA91BB0E2D73A7279AA19637 /* libPods-VideoOSDevApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 531D9B85F47A19F4DD5C50BF /* libPods-VideoOSDevApp.a */; };
100103
/* End PBXBuildFile section */
101104

105+
/* Begin PBXContainerItemProxy section */
106+
B6032F142416114D0013AF68 /* PBXContainerItemProxy */ = {
107+
isa = PBXContainerItemProxy;
108+
containerPortal = 069D542D1F04DC6D001E5324 /* Project object */;
109+
proxyType = 1;
110+
remoteGlobalIDString = 064570C7235ED37300BDEE49;
111+
remoteInfo = VideoOSDevApp;
112+
};
113+
/* End PBXContainerItemProxy section */
114+
102115
/* Begin PBXFileReference section */
103116
06361FA62060E631007D7C13 /* VideoPlsDefaultImages.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = VideoPlsDefaultImages.bundle; sourceTree = "<group>"; };
104117
064570F6235ED37300BDEE49 /* VideoOSDevApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VideoOSDevApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -134,6 +147,15 @@
134147
531D9B85F47A19F4DD5C50BF /* libPods-VideoOSDevApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VideoOSDevApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
135148
7C6009F1EF01AC68198F90DB /* libPods-VPInterfaceControllerDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VPInterfaceControllerDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
136149
B30CD242A29CD4A10D7E120A /* Pods-VPInterfaceViewDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VPInterfaceViewDemo.release.xcconfig"; path = "../Pods/Target Support Files/Pods-VPInterfaceViewDemo/Pods-VPInterfaceViewDemo.release.xcconfig"; sourceTree = "<group>"; };
150+
B6032F0F2416114D0013AF68 /* VideoOSDevAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VideoOSDevAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
151+
B6032F132416114D0013AF68 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
152+
B6032F19241613C60013AF68 /* DevAppToolTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DevAppToolTests.m; sourceTree = "<group>"; };
153+
B6032F1B2416153A0013AF68 /* VideoOSDevAppTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoOSDevAppTests.m; sourceTree = "<group>"; };
154+
B620B313240508C300788FAD /* 20191218104055_cropping.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = 20191218104055_cropping.wav; sourceTree = "<group>"; };
155+
B620B3252405170300788FAD /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
156+
B620B3272405171D00788FAD /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
157+
B620B3292405172500788FAD /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
158+
B620B32B2405172D00788FAD /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
137159
B6610E7A236006CE00EC0479 /* DevLuaLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DevLuaLoader.h; sourceTree = "<group>"; };
138160
B6610E7B236006CE00EC0479 /* DevLuaLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DevLuaLoader.m; sourceTree = "<group>"; };
139161
B6E4BF33235EEFE300406434 /* DevAppResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = DevAppResource.bundle; sourceTree = "<group>"; };
@@ -215,6 +237,13 @@
215237
);
216238
runOnlyForDeploymentPostprocessing = 0;
217239
};
240+
B6032F0C2416114D0013AF68 /* Frameworks */ = {
241+
isa = PBXFrameworksBuildPhase;
242+
buildActionMask = 2147483647;
243+
files = (
244+
);
245+
runOnlyForDeploymentPostprocessing = 0;
246+
};
218247
/* End PBXFrameworksBuildPhase section */
219248

220249
/* Begin PBXGroup section */
@@ -247,6 +276,7 @@
247276
isa = PBXGroup;
248277
children = (
249278
069D54371F04DC6D001E5324 /* VPInterfaceControllerDemo */,
279+
B6032F102416114D0013AF68 /* VideoOSDevAppTests */,
250280
069D54361F04DC6D001E5324 /* Products */,
251281
817AAC9067DE3F9470632B47 /* Pods */,
252282
E00F63F38771CBE15AAFEA8C /* Frameworks */,
@@ -258,6 +288,7 @@
258288
children = (
259289
069D54351F04DC6D001E5324 /* VPInterfaceControllerDemo.app */,
260290
064570F6235ED37300BDEE49 /* VideoOSDevApp.app */,
291+
B6032F0F2416114D0013AF68 /* VideoOSDevAppTests.xctest */,
261292
);
262293
name = Products;
263294
sourceTree = "<group>";
@@ -286,6 +317,7 @@
286317
C4038CFD1FB449AD00BD3B07 /* zelear.mp4 */,
287318
C9654A1F22F7F846000AFB2E /* saomiao_no.svga */,
288319
C9654A2022F7F847000AFB2E /* saomiao_off.svga */,
320+
B620B313240508C300788FAD /* 20191218104055_cropping.wav */,
289321
068965391F15F1310054736C /* VPAVPlayer */,
290322
069D54411F04DC6D001E5324 /* Main.storyboard */,
291323
069D54441F04DC6E001E5324 /* Assets.xcassets */,
@@ -327,6 +359,16 @@
327359
name = Pods;
328360
sourceTree = "<group>";
329361
};
362+
B6032F102416114D0013AF68 /* VideoOSDevAppTests */ = {
363+
isa = PBXGroup;
364+
children = (
365+
B6032F1B2416153A0013AF68 /* VideoOSDevAppTests.m */,
366+
B6032F132416114D0013AF68 /* Info.plist */,
367+
B6032F19241613C60013AF68 /* DevAppToolTests.m */,
368+
);
369+
path = VideoOSDevAppTests;
370+
sourceTree = "<group>";
371+
};
330372
B6E4BF32235EEFE300406434 /* VideoOSDevApp */ = {
331373
isa = PBXGroup;
332374
children = (
@@ -417,6 +459,10 @@
417459
E00F63F38771CBE15AAFEA8C /* Frameworks */ = {
418460
isa = PBXGroup;
419461
children = (
462+
B620B32B2405172D00788FAD /* AudioToolbox.framework */,
463+
B620B3292405172500788FAD /* AVFoundation.framework */,
464+
B620B3272405171D00788FAD /* Security.framework */,
465+
B620B3252405170300788FAD /* libc++.tbd */,
420466
1EE8D300E34605C338F6FB32 /* libPods-VPInterfaceViewDemo.a */,
421467
7C6009F1EF01AC68198F90DB /* libPods-VPInterfaceControllerDemo.a */,
422468
531D9B85F47A19F4DD5C50BF /* libPods-VideoOSDevApp.a */,
@@ -467,6 +513,24 @@
467513
productReference = 069D54351F04DC6D001E5324 /* VPInterfaceControllerDemo.app */;
468514
productType = "com.apple.product-type.application";
469515
};
516+
B6032F0E2416114D0013AF68 /* VideoOSDevAppTests */ = {
517+
isa = PBXNativeTarget;
518+
buildConfigurationList = B6032F182416114D0013AF68 /* Build configuration list for PBXNativeTarget "VideoOSDevAppTests" */;
519+
buildPhases = (
520+
B6032F0B2416114D0013AF68 /* Sources */,
521+
B6032F0C2416114D0013AF68 /* Frameworks */,
522+
B6032F0D2416114D0013AF68 /* Resources */,
523+
);
524+
buildRules = (
525+
);
526+
dependencies = (
527+
B6032F152416114D0013AF68 /* PBXTargetDependency */,
528+
);
529+
name = VideoOSDevAppTests;
530+
productName = VideoOSDevAppTests;
531+
productReference = B6032F0F2416114D0013AF68 /* VideoOSDevAppTests.xctest */;
532+
productType = "com.apple.product-type.bundle.unit-test";
533+
};
470534
/* End PBXNativeTarget section */
471535

472536
/* Begin PBXProject section */
@@ -489,6 +553,12 @@
489553
};
490554
};
491555
};
556+
B6032F0E2416114D0013AF68 = {
557+
CreatedOnToolsVersion = 11.1;
558+
DevelopmentTeam = B5P8WM78R3;
559+
ProvisioningStyle = Automatic;
560+
TestTargetID = 064570C7235ED37300BDEE49;
561+
};
492562
};
493563
};
494564
buildConfigurationList = 069D54301F04DC6D001E5324 /* Build configuration list for PBXProject "VPInterfaceControllerDemo" */;
@@ -507,6 +577,7 @@
507577
targets = (
508578
069D54341F04DC6D001E5324 /* VPInterfaceControllerDemo */,
509579
064570C7235ED37300BDEE49 /* VideoOSDevApp */,
580+
B6032F0E2416114D0013AF68 /* VideoOSDevAppTests */,
510581
);
511582
};
512583
/* End PBXProject section */
@@ -553,6 +624,7 @@
553624
0689653E1F15F56E0054736C /* VPMediaControlView.xib in Resources */,
554625
067187A41F56B741008544FC /* goods.lua in Resources */,
555626
065D7B701F5572530075B450 /* hotarea.lua in Resources */,
627+
B620B314240508C300788FAD /* 20191218104055_cropping.wav in Resources */,
556628
069D54451F04DC6E001E5324 /* Assets.xcassets in Resources */,
557629
0688D4CD1F5BF22C00ECDEED /* goods_entrance.lua in Resources */,
558630
C4038CFE1FB44A2100BD3B07 /* zelear.mp4 in Resources */,
@@ -561,6 +633,13 @@
561633
);
562634
runOnlyForDeploymentPostprocessing = 0;
563635
};
636+
B6032F0D2416114D0013AF68 /* Resources */ = {
637+
isa = PBXResourcesBuildPhase;
638+
buildActionMask = 2147483647;
639+
files = (
640+
);
641+
runOnlyForDeploymentPostprocessing = 0;
642+
};
564643
/* End PBXResourcesBuildPhase section */
565644

566645
/* Begin PBXShellScriptBuildPhase section */
@@ -734,8 +813,25 @@
734813
);
735814
runOnlyForDeploymentPostprocessing = 0;
736815
};
816+
B6032F0B2416114D0013AF68 /* Sources */ = {
817+
isa = PBXSourcesBuildPhase;
818+
buildActionMask = 2147483647;
819+
files = (
820+
B6032F1A241613C60013AF68 /* DevAppToolTests.m in Sources */,
821+
B6032F1C2416153A0013AF68 /* VideoOSDevAppTests.m in Sources */,
822+
);
823+
runOnlyForDeploymentPostprocessing = 0;
824+
};
737825
/* End PBXSourcesBuildPhase section */
738826

827+
/* Begin PBXTargetDependency section */
828+
B6032F152416114D0013AF68 /* PBXTargetDependency */ = {
829+
isa = PBXTargetDependency;
830+
target = 064570C7235ED37300BDEE49 /* VideoOSDevApp */;
831+
targetProxy = B6032F142416114D0013AF68 /* PBXContainerItemProxy */;
832+
};
833+
/* End PBXTargetDependency section */
834+
739835
/* Begin PBXVariantGroup section */
740836
069D54411F04DC6D001E5324 /* Main.storyboard */ = {
741837
isa = PBXVariantGroup;
@@ -968,6 +1064,49 @@
9681064
};
9691065
name = Release;
9701066
};
1067+
B6032F162416114D0013AF68 /* Debug */ = {
1068+
isa = XCBuildConfiguration;
1069+
buildSettings = {
1070+
BUNDLE_LOADER = "$(TEST_HOST)";
1071+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
1072+
CLANG_ENABLE_OBJC_WEAK = YES;
1073+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1074+
CODE_SIGN_STYLE = Automatic;
1075+
DEVELOPMENT_TEAM = B5P8WM78R3;
1076+
GCC_C_LANGUAGE_STANDARD = gnu11;
1077+
INFOPLIST_FILE = VideoOSDevAppTests/Info.plist;
1078+
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
1079+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1080+
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
1081+
MTL_FAST_MATH = YES;
1082+
PRODUCT_BUNDLE_IDENTIFIER = huyangyang.VideoOSDevAppTests;
1083+
PRODUCT_NAME = "$(TARGET_NAME)";
1084+
TARGETED_DEVICE_FAMILY = "1,2";
1085+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VideoOSDevApp.app/VideoOSDevApp";
1086+
};
1087+
name = Debug;
1088+
};
1089+
B6032F172416114D0013AF68 /* Release */ = {
1090+
isa = XCBuildConfiguration;
1091+
buildSettings = {
1092+
BUNDLE_LOADER = "$(TEST_HOST)";
1093+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
1094+
CLANG_ENABLE_OBJC_WEAK = YES;
1095+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
1096+
CODE_SIGN_STYLE = Automatic;
1097+
DEVELOPMENT_TEAM = B5P8WM78R3;
1098+
GCC_C_LANGUAGE_STANDARD = gnu11;
1099+
INFOPLIST_FILE = VideoOSDevAppTests/Info.plist;
1100+
IPHONEOS_DEPLOYMENT_TARGET = 13.1;
1101+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1102+
MTL_FAST_MATH = YES;
1103+
PRODUCT_BUNDLE_IDENTIFIER = huyangyang.VideoOSDevAppTests;
1104+
PRODUCT_NAME = "$(TARGET_NAME)";
1105+
TARGETED_DEVICE_FAMILY = "1,2";
1106+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VideoOSDevApp.app/VideoOSDevApp";
1107+
};
1108+
name = Release;
1109+
};
9711110
/* End XCBuildConfiguration section */
9721111

9731112
/* Begin XCConfigurationList section */
@@ -998,6 +1137,15 @@
9981137
defaultConfigurationIsVisible = 0;
9991138
defaultConfigurationName = Release;
10001139
};
1140+
B6032F182416114D0013AF68 /* Build configuration list for PBXNativeTarget "VideoOSDevAppTests" */ = {
1141+
isa = XCConfigurationList;
1142+
buildConfigurations = (
1143+
B6032F162416114D0013AF68 /* Debug */,
1144+
B6032F172416114D0013AF68 /* Release */,
1145+
);
1146+
defaultConfigurationIsVisible = 0;
1147+
defaultConfigurationName = Release;
1148+
};
10011149
/* End XCConfigurationList section */
10021150
};
10031151
rootObject = 069D542D1F04DC6D001E5324 /* Project object */;

‎Example/VPInterfaceControllerDemo.xcodeproj/xcshareddata/xcschemes/VideoOSDevApp.xcscheme‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,29 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<CodeCoverageTargets>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "064570C7235ED37300BDEE49"
36+
BuildableName = "VideoOSDevApp.app"
37+
BlueprintName = "VideoOSDevApp"
38+
ReferencedContainer = "container:VPInterfaceControllerDemo.xcodeproj">
39+
</BuildableReference>
40+
</CodeCoverageTargets>
3041
<Testables>
42+
<TestableReference
43+
skipped = "NO">
44+
<BuildableReference
45+
BuildableIdentifier = "primary"
46+
BlueprintIdentifier = "B6032F0E2416114D0013AF68"
47+
BuildableName = "VideoOSDevAppTests.xctest"
48+
BlueprintName = "VideoOSDevAppTests"
49+
ReferencedContainer = "container:VPInterfaceControllerDemo.xcodeproj">
50+
</BuildableReference>
51+
</TestableReference>
3152
</Testables>
3253
</TestAction>
3354
<LaunchAction

‎Example/VPInterfaceControllerDemo/20191218104055_cropping.wav‎

160 KB
Binary file not shown.

‎Example/VPInterfaceControllerDemo/AppDelegate.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3737
// [VPIConfigSDK setAppKey:@"93db5ef3-7fbc-485a-97b0-fc9f4e7209f5" appSecret:@"74f251d40a49468a"];
3838
// [VPIConfigSDK setAppKey:@"d1af1f73-7b60-4141-8261-2d9ad20b2a23" appSecret:@"97154eab13424013"];
3939
// [VPIConfigSDK setAppKey:@"7a741182-c30e-4edf-9eaa-ae8974093214" appSecret:@"8940b66d7052437b"];
40-
// [VPIConfigSDK setAppKey:@"73d5a8f8-3682-4080-ad7c-996c4e19fc1e" appSecret:@"c276b70aba84491a"];
40+
[VPIConfigSDK setAppKey:@"4bd773ed-ad39-4dc5-87b1-c9e35ceeee8f" appSecret:@"da1b1ff3a8e749e7"];
4141

42-
[VPIConfigSDK setAppKey:@"ca39f6b6-4626-4036-8518-59387636da60" appSecret:@"8e9db127a2644fba"];
42+
// [VPIConfigSDK setAppKey:@"ca39f6b6-4626-4036-8518-59387636da60" appSecret:@"8e9db127a2644fba"];
4343

4444
// [[VPUPDebugSwitch sharedDebugSwitch] switchEnvironment:VPUPDebugStateDevelop];
4545
// [[VPUPDebugSwitch sharedDebugSwitch] switchEnvironment:VPUPDebugStateTest];

‎Example/VPInterfaceControllerDemo/VPAVPlayerController.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ extern NSString *const VPAVPlayerPlayerbackDidSeekCompleteNotification;
6464
- (void)shutdown;
6565
- (void)setCurrentPlaybackTime:(NSTimeInterval)currentPlaybackTime;
6666
- (void)updateFrame:(CGRect)newFrame;
67+
- (CMTime)playerCurremtTime;
6768

6869
- (void)changeContentURLString:(NSString *)urlString;
6970

71+
- (void)getWAVAudioWithStartTime:(CMTime)startTime duration:(CMTime)videoDuration WithWAVCompletionHandler:(void (^)(NSString * resultPath, int code))wavHandler;
7072
@end

0 commit comments

Comments
 (0)