Skip to content

Commit

Permalink
demo: Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
@libobjc
libobjc committed Jun 28, 2019
1 parent 7680761 commit cc331a0
Show file tree
Hide file tree
Showing 26 changed files with 386 additions and 425 deletions.
4 changes: 2 additions & 2 deletions SGPlayer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,7 @@
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/SGPlayer/Classes/Core/SGFFmpeg/include\"";
INFOPLIST_FILE = SGPlayer/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/SGPlayer/Classes/Core/SGFFmpeg/lib-iOS";
MACH_O_TYPE = staticlib;
Expand Down Expand Up @@ -2477,7 +2477,7 @@
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/SGPlayer/Classes/Core/SGFFmpeg/include\"";
INFOPLIST_FILE = SGPlayer/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/SGPlayer/Classes/Core/SGFFmpeg/lib-iOS";
MACH_O_TYPE = staticlib;
Expand Down
2 changes: 2 additions & 0 deletions SGPlayer.xcodeproj/xcshareddata/xcschemes/SGPlayer iOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUFrameCaptureMode = "3"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
2 changes: 2 additions & 0 deletions SGPlayer.xcodeproj/xcshareddata/xcschemes/SGPlayer macOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUFrameCaptureMode = "3"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
2 changes: 2 additions & 0 deletions SGPlayer.xcodeproj/xcshareddata/xcschemes/SGPlayer tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUFrameCaptureMode = "3"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand Down
42 changes: 19 additions & 23 deletions demo/demo-ios/demo-ios.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
9C02F6521E79293A00932489 /* PlayerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C02F6501E79293A00932489 /* PlayerViewController.xib */; };
9C03E5F3212E732B001F0E1B /* PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C03E5F2212E732B001F0E1B /* PlayerViewController.m */; };
9C02F6521E79293A00932489 /* SGPlayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9C02F6501E79293A00932489 /* SGPlayViewController.xib */; };
9C03E5F3212E732B001F0E1B /* SGPlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C03E5F2212E732B001F0E1B /* SGPlayViewController.m */; };
9C36DD461E79538500959FDA /* google-help-vr.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 9C36DD441E79538500959FDA /* google-help-vr.mp4 */; };
9C36DD471E79538500959FDA /* i-see-fire.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 9C36DD451E79538500959FDA /* i-see-fire.mp4 */; };
9C3DD16C1E8FBD420003B17A /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C3DD16B1E8FBD420003B17A /* VideoToolbox.framework */; };
Expand All @@ -24,14 +24,13 @@
9C886BBC1E78F14300F2CFD1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C886BBB1E78F14300F2CFD1 /* libz.tbd */; };
9C886BBE1E78F14700F2CFD1 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C886BBD1E78F14700F2CFD1 /* libbz2.tbd */; };
9C8A0E342190A687006F7AE8 /* SGPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C9824A41FAB073B00142215 /* SGPlayer.framework */; };
9CD7E10321801C0700814E1B /* thinking-out-loud.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 9CD7E10121801C0700814E1B /* thinking-out-loud.mp4 */; };
9CD7E10421801C0700814E1B /* love-yourself.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 9CD7E10221801C0700814E1B /* love-yourself.mp4 */; };
9CA1B18C22C5F7CE009E2863 /* default.metallib in Resources */ = {isa = PBXBuildFile; fileRef = 9CA1B18B22C5F7CE009E2863 /* default.metallib */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
9C02F64E1E79293A00932489 /* PlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerViewController.h; sourceTree = "<group>"; };
9C02F6501E79293A00932489 /* PlayerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlayerViewController.xib; sourceTree = "<group>"; };
9C03E5F2212E732B001F0E1B /* PlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlayerViewController.m; sourceTree = "<group>"; };
9C02F64E1E79293A00932489 /* SGPlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SGPlayViewController.h; sourceTree = "<group>"; };
9C02F6501E79293A00932489 /* SGPlayViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SGPlayViewController.xib; sourceTree = "<group>"; };
9C03E5F2212E732B001F0E1B /* SGPlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SGPlayViewController.m; sourceTree = "<group>"; };
9C2167151E7F81B800272348 /* SGPlatform.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SGPlatform.framework; path = "../../../../../../Library/Developer/Xcode/DerivedData/demo-eihmyibiajxgvzgpltouukszknss/Build/Products/Debug-iphoneos/SGPlatform.framework"; sourceTree = "<group>"; };
9C329AA52005DF4A00252B10 /* SGAVPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SGAVPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9C329AA72005E11500252B10 /* SGAVPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SGAVPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -58,11 +57,10 @@
9C886BBD1E78F14700F2CFD1 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
9C9824A41FAB073B00142215 /* SGPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SGPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9C9824AE1FAB10B100142215 /* SGPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SGPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9CA1B18B22C5F7CE009E2863 /* default.metallib */ = {isa = PBXFileReference; lastKnownFileType = "archive.metal-library"; path = default.metallib; sourceTree = "<group>"; };
9CA86E851E87575000E4A8B1 /* SGPlatform.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SGPlatform.framework; path = "../../../../../../Library/Developer/Xcode/DerivedData/demo-cxkylxbwkfilbmgwetaiuwiojpbb/Build/Products/Debug-iphonesimulator/SGPlatform.framework"; sourceTree = "<group>"; };
9CA86E891E8757B500E4A8B1 /* SGPlatform.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SGPlatform.framework; path = "../../Vendors/SGPlatform/build/Debug-iphoneos/SGPlatform.framework"; sourceTree = "<group>"; };
9CB695132190680E00196E54 /* SGPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SGPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9CD7E10121801C0700814E1B /* thinking-out-loud.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = "thinking-out-loud.mp4"; path = "../../../../../../../Movies/Movie/thinking-out-loud.mp4"; sourceTree = "<group>"; };
9CD7E10221801C0700814E1B /* love-yourself.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = "love-yourself.mp4"; path = "../../../../../../../Movies/Movie/love-yourself.mp4"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -107,13 +105,10 @@
9C886B9A1E78EC9F00F2CFD1 /* AppDelegate.m */,
9C886B9C1E78EC9F00F2CFD1 /* ViewController.h */,
9C886B9D1E78EC9F00F2CFD1 /* ViewController.m */,
9C02F64E1E79293A00932489 /* PlayerViewController.h */,
9C03E5F2212E732B001F0E1B /* PlayerViewController.m */,
9C02F6501E79293A00932489 /* PlayerViewController.xib */,
9C02F64E1E79293A00932489 /* SGPlayViewController.h */,
9C03E5F2212E732B001F0E1B /* SGPlayViewController.m */,
9C02F6501E79293A00932489 /* SGPlayViewController.xib */,
9C886B9F1E78EC9F00F2CFD1 /* Main.storyboard */,
9C886BA21E78EC9F00F2CFD1 /* Assets.xcassets */,
9C886BA41E78EC9F00F2CFD1 /* LaunchScreen.storyboard */,
9C886BA71E78EC9F00F2CFD1 /* Info.plist */,
9C886B961E78EC9F00F2CFD1 /* Supporting Files */,
);
path = "demo-ios";
Expand All @@ -122,10 +117,12 @@
9C886B961E78EC9F00F2CFD1 /* Supporting Files */ = {
isa = PBXGroup;
children = (
9CD7E10221801C0700814E1B /* love-yourself.mp4 */,
9CD7E10121801C0700814E1B /* thinking-out-loud.mp4 */,
9C886BA21E78EC9F00F2CFD1 /* Assets.xcassets */,
9CA1B18B22C5F7CE009E2863 /* default.metallib */,
9C36DD441E79538500959FDA /* google-help-vr.mp4 */,
9C36DD451E79538500959FDA /* i-see-fire.mp4 */,
9C886BA71E78EC9F00F2CFD1 /* Info.plist */,
9C886BA41E78EC9F00F2CFD1 /* LaunchScreen.storyboard */,
9C886B971E78EC9F00F2CFD1 /* main.m */,
);
name = "Supporting Files";
Expand Down Expand Up @@ -222,10 +219,9 @@
9C886BA61E78EC9F00F2CFD1 /* LaunchScreen.storyboard in Resources */,
9C886BA31E78EC9F00F2CFD1 /* Assets.xcassets in Resources */,
9C36DD461E79538500959FDA /* google-help-vr.mp4 in Resources */,
9CA1B18C22C5F7CE009E2863 /* default.metallib in Resources */,
9C886BA11E78EC9F00F2CFD1 /* Main.storyboard in Resources */,
9CD7E10421801C0700814E1B /* love-yourself.mp4 in Resources */,
9C02F6521E79293A00932489 /* PlayerViewController.xib in Resources */,
9CD7E10321801C0700814E1B /* thinking-out-loud.mp4 in Resources */,
9C02F6521E79293A00932489 /* SGPlayViewController.xib in Resources */,
9C36DD471E79538500959FDA /* i-see-fire.mp4 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -238,7 +234,7 @@
buildActionMask = 2147483647;
files = (
9C886B9E1E78EC9F00F2CFD1 /* ViewController.m in Sources */,
9C03E5F3212E732B001F0E1B /* PlayerViewController.m in Sources */,
9C03E5F3212E732B001F0E1B /* SGPlayViewController.m in Sources */,
9C886B9B1E78EC9F00F2CFD1 /* AppDelegate.m in Sources */,
9C886B981E78EC9F00F2CFD1 /* main.m in Sources */,
);
Expand Down Expand Up @@ -378,7 +374,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = KAGR32AB25;
INFOPLIST_FILE = "demo-ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"-all_load",
Expand All @@ -398,7 +394,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = KAGR32AB25;
INFOPLIST_FILE = "demo-ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
"-all_load",
Expand Down
2 changes: 2 additions & 0 deletions demo/demo-ios/demo-ios.xcodeproj/xcshareddata/xcschemes/demo-ios.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUFrameCaptureMode = "3"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
13 changes: 0 additions & 13 deletions demo/demo-ios/demo-ios/PlayerViewController.h
View file

This file was deleted.

167 changes: 0 additions & 167 deletions demo/demo-ios/demo-ios/PlayerViewController.m
View file

This file was deleted.

16 changes: 16 additions & 0 deletions demo/demo-ios/demo-ios/SGPlayViewController.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// SGPlayViewController.h
// demo-ios
//
// Created by Single on 2017/3/15.
// Copyright © 2017年 single. All rights reserved.
//

#import <UIKit/UIKit.h>
#import <SGPlayer/SGPlayer.h>

@interface SGPlayViewController : UIViewController

@property (nonatomic, strong) SGAsset *asset;

@end
Loading

0 comments on commit cc331a0

Please sign in to comment.