Skip to content

ios: IJKSDLGLView fix xcode 10.2.1 Main Thread Checker issues #4739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baishuai wants to merge 2 commits into from
Closed

ios: IJKSDLGLView fix xcode 10.2.1 Main Thread Checker issues #4739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e3ee39
ios: IJKSDLGLView fix xcode 10.2.1 Main Thread Checker issues
baishuai May 25, 2019
79ffe08
add objc wrap IJKFFMediaPlayer for c IjkMediaPlayer
befovy Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ios/IJKMediaPlayer/IJKMediaFramework/IJKMediaFramework.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ FOUNDATION_EXPORT const unsigned char IJKMediaFrameworkVersionString[];
#import <IJKMediaFramework/IJKMediaPlayback.h>
#import <IJKMediaFramework/IJKMPMoviePlayerController.h>
#import <IJKMediaFramework/IJKFFOptions.h>
#import <IJKMediaFramework/IJKFFMediaPlayer.h>
#import <IJKMediaFramework/IJKFFMoviePlayerController.h>
#import <IJKMediaFramework/IJKAVMoviePlayerController.h>
#import <IJKMediaFramework/IJKMediaModule.h>
Expand Down
1 change: 1 addition & 0 deletions ios/IJKMediaPlayer/IJKMediaFrameworkWithSSL/IJKMediaFrameworkWithSSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ FOUNDATION_EXPORT const unsigned char IJKMediaFrameworkWithSSLVersionString[];
#import <IJKMediaFrameworkWithSSL/IJKMediaPlayback.h>
#import <IJKMediaFrameworkWithSSL/IJKMPMoviePlayerController.h>
#import <IJKMediaFrameworkWithSSL/IJKFFOptions.h>
#import <IJKMediaFrameworkWithSSL/IJKFFMediaPlayer.h>
#import <IJKMediaFrameworkWithSSL/IJKFFMoviePlayerController.h>
#import <IJKMediaFrameworkWithSSL/IJKAVMoviePlayerController.h>
#import <IJKMediaFrameworkWithSSL/IJKMediaModule.h>
Expand Down
28 changes: 26 additions & 2 deletions ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
objects = {

/* Begin PBXBuildFile section */
215FF44B22B7E83500FAAD0E /* IJKFFMediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 215FF44922B7E83500FAAD0E /* IJKFFMediaPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
215FF44C22B7E83500FAAD0E /* IJKFFMediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 215FF44922B7E83500FAAD0E /* IJKFFMediaPlayer.h */; };
215FF44D22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 215FF44A22B7E83500FAAD0E /* IJKFFMediaPlayer.m */; };
215FF44E22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 215FF44A22B7E83500FAAD0E /* IJKFFMediaPlayer.m */; };
215FF44F22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 215FF44A22B7E83500FAAD0E /* IJKFFMediaPlayer.m */; };
21DAA1592298FEBB007B0784 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5450AF8B1E63E59300568494 /* libcrypto.a */; };
21DAA15A2298FEBE007B0784 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5450AF8C1E63E59300568494 /* libssl.a */; };
21DAA15B2298FEC7007B0784 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5450AF8F1E63E59800568494 /* libz.tbd */; };
21DAA15D2298FED6007B0784 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 21DAA15C2298FED6007B0784 /* libbz2.tbd */; };
4D32BC811F906E3A00CE9F03 /* IJKSDLGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D32BC801F906E3600CE9F03 /* IJKSDLGLViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
4D32BC821F906E3B00CE9F03 /* IJKSDLGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D32BC801F906E3600CE9F03 /* IJKSDLGLViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
4DA7F6891F2B1E270032A499 /* ijkiourlhook.c in Sources */ = {isa = PBXBuildFile; fileRef = 4DA7F6881F2B1E270032A499 /* ijkiourlhook.c */; };
Expand Down Expand Up @@ -271,6 +280,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
215FF44922B7E83500FAAD0E /* IJKFFMediaPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IJKFFMediaPlayer.h; sourceTree = "<group>"; };
215FF44A22B7E83500FAAD0E /* IJKFFMediaPlayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IJKFFMediaPlayer.m; sourceTree = "<group>"; };
21DAA15C2298FED6007B0784 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
454316201A66493700676070 /* ffpipeline_ios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffpipeline_ios.c; path = ijkmedia/ijkplayer/ios/pipeline/ffpipeline_ios.c; sourceTree = "<group>"; };
454316211A66493700676070 /* ffpipeline_ios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffpipeline_ios.h; path = ijkmedia/ijkplayer/ios/pipeline/ffpipeline_ios.h; sourceTree = "<group>"; };
454316221A66493700676070 /* ffpipenode_ios_videotoolbox_vdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffpipenode_ios_videotoolbox_vdec.h; path = ijkmedia/ijkplayer/ios/pipeline/ffpipenode_ios_videotoolbox_vdec.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -487,6 +499,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
21DAA15D2298FED6007B0784 /* libbz2.tbd in Frameworks */,
21DAA15B2298FEC7007B0784 /* libz.tbd in Frameworks */,
21DAA15A2298FEBE007B0784 /* libssl.a in Frameworks */,
21DAA1592298FEBB007B0784 /* libcrypto.a in Frameworks */,
E653C6F61BCE5A750016835A /* libavcodec.a in Frameworks */,
E653C6F81BCE5A750016835A /* libavfilter.a in Frameworks */,
E653C6FA1BCE5A750016835A /* libavformat.a in Frameworks */,
Expand Down Expand Up @@ -656,6 +672,7 @@
E6903EBB17EAF6C500CFD954 /* Frameworks */ = {
isa = PBXGroup;
children = (
21DAA15C2298FED6007B0784 /* libbz2.tbd */,
5450AF8F1E63E59800568494 /* libz.tbd */,
5450AF8B1E63E59300568494 /* libcrypto.a */,
5450AF8C1E63E59300568494 /* libssl.a */,
Expand All @@ -674,6 +691,8 @@
E66F8DE617EFD9C300354D80 /* IJKFFMoviePlayerController.m */,
E6F727B917F2D9D30043623F /* IJKFFMoviePlayerDef.h */,
E6F727BA17F2D9D30043623F /* IJKFFMoviePlayerDef.m */,
215FF44922B7E83500FAAD0E /* IJKFFMediaPlayer.h */,
215FF44A22B7E83500FAAD0E /* IJKFFMediaPlayer.m */,
E62139BC180FA89A00553533 /* IJKFFOptions.h */,
E62139BD180FA89A00553533 /* IJKFFOptions.m */,
E6903FCC17EAFC6100CFD954 /* ijkmedia */,
Expand Down Expand Up @@ -967,6 +986,7 @@
5450B0251E63EA4300568494 /* ijkdict.h in Headers */,
5450B0261E63EA4300568494 /* IJKAVMoviePlayerController.h in Headers */,
5450B0271E63EA4300568494 /* ijksdl_gles2.h in Headers */,
215FF44C22B7E83500FAAD0E /* IJKFFMediaPlayer.h in Headers */,
5450B0281E63EA4300568494 /* ijksdl_egl.h in Headers */,
549385C41E640456001AE08D /* IJKMediaFrameworkWithSSL.h in Headers */,
5450B0291E63EA4300568494 /* ff_ffplay_options.h in Headers */,
Expand Down Expand Up @@ -1008,6 +1028,7 @@
E654EAE81B6B295200B0F2D0 /* IJKAVMoviePlayerController.h in Headers */,
E6C459841C7030AA004831EC /* ijksdl_gles2.h in Headers */,
E6C459BB1C706A13004831EC /* ijksdl_egl.h in Headers */,
215FF44B22B7E83500FAAD0E /* IJKFFMediaPlayer.h in Headers */,
E6C459BD1C7089AB004831EC /* ff_ffplay_options.h in Headers */,
E654EA8F1B6B27E600B0F2D0 /* IJKMediaFramework.h in Headers */,
E6C2E7BE1C92BD3600E59229 /* IJKKVOController.h in Headers */,
Expand Down Expand Up @@ -1223,6 +1244,7 @@
5450AFE31E63EA4300568494 /* ijklivehook.c in Sources */,
5450AFE41E63EA4300568494 /* ijkurlhook.c in Sources */,
5450AFE51E63EA4300568494 /* IJKVideoToolBoxSync.m in Sources */,
215FF44E22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */,
5450AFE61E63EA4300568494 /* IJKMediaPlayback.m in Sources */,
5450AFE71E63EA4300568494 /* ijkdict.c in Sources */,
5450AFE81E63EA4300568494 /* ff_ffpipeline.c in Sources */,
Expand Down Expand Up @@ -1314,6 +1336,7 @@
E69BE5721B946FF600AFBA3F /* ijklivehook.c in Sources */,
54A029BA1D4700E6001C61C1 /* ijkurlhook.c in Sources */,
5407EC2E1DF81D2600457BFE /* IJKVideoToolBoxSync.m in Sources */,
215FF44D22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */,
E654EAA51B6B283700B0F2D0 /* IJKMediaPlayback.m in Sources */,
54CF8A491E15287D00309DD5 /* ijkdict.c in Sources */,
E654EAB01B6B285900B0F2D0 /* ff_ffpipeline.c in Sources */,
Expand Down Expand Up @@ -1371,6 +1394,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
215FF44F22B7E83500FAAD0E /* IJKFFMediaPlayer.m in Sources */,
E654EA9C1B6B27E600B0F2D0 /* IJKMediaFrameworkTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1426,7 +1450,7 @@
"$(inherited)",
"\"$(SRCROOT)/../build/universal/lib\"",
);
MACH_O_TYPE = mh_dylib;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
OTHER_LDFLAGS = (
"-read_only_relocs",
Expand Down Expand Up @@ -1477,7 +1501,7 @@
"$(inherited)",
"\"$(SRCROOT)/../build/universal/lib\"",
);
MACH_O_TYPE = mh_dylib;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"-read_only_relocs",
Expand Down
56 changes: 56 additions & 0 deletions ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* IJKFFMoviePlayerDef.m
*
* Copyright (c) 2019 Befovy <befovy@gmail.com>
*
* This file is part of ijkPlayer.
*
* ijkPlayer is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* ijkPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with ijkPlayer; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#import <Foundation/Foundation.h>
#import "IJKFFOptions.h"

NS_ASSUME_NONNULL_BEGIN

@interface IJKFFMediaPlayer : NSObject


- (IJKFFMediaPlayer *)init;

@property (readonly, nonatomic) int videoWidth;
@property (readonly, nonatomic) int videoHeight;
@property (readonly, nonatomic) int videoSarNum;
@property (readonly, nonatomic) int videoSarDen;

- (void) setDataSource:(NSString *)url;
- (void) prepareAsync;
- (void) start;
- (void) stop;
- (void) pause;
- (BOOL) isPlaying;
- (void) shutdown;

- (void)setOptionValue:(NSString *)value
forKey:(NSString *)key
ofCategory:(IJKFFOptionCategory)category;

- (void)setOptionIntValue:(int64_t)value
forKey:(NSString *)key
ofCategory:(IJKFFOptionCategory)category;

@end

NS_ASSUME_NONNULL_END
Loading