Skip to content
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

Jump to bottom

解决ijk第一次初始化时异步线程调用主线程造成的线程卡顿问题 #4683

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

解决ijk第一次初始化时异步线程调用主线程造成的线程卡顿问题 #4683

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae5c11d
iOS -- ssl -- thread
poholo Apr 10, 2019
5c9802d
优化线程逻辑~
poholo May 17, 2019
280a5a0
优化线程逻辑~
poholo May 17, 2019
90ab70b
修正编译参数
poholo May 31, 2019
2a591c9
fix crash
poholo Aug 2, 2019
8764676
fix: 增加GLView是的autoresing到IJKFFMoviePlayerController
poholo Sep 2, 2019
972d2a1
fix: 关闭画布旋转、初始化的线程切换
poholo Sep 3, 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 config/module-lite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,4 @@ export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-videotoolbox"
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-linux-perf"
export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --disable-bzlib"

export COMMON_FF_CFG_FLAGS="$COMMON_FF_CFG_FLAGS --enable-openssl"
30 changes: 29 additions & 1 deletion ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
2551A86A225D8EE0009873DC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 5450B0431E63EA4300568494;
remoteInfo = IJKMediaFrameworkWithSSL;
};
E654EAD61B6B28B100B0F2D0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
Expand All @@ -68,7 +75,7 @@
isa = PBXContainerItemProxy;
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = E654EA891B6B27E600B0F2D0;
remoteGlobalIDString = 5450AFC11E63EA4300568494;
remoteInfo = IJKMediaFramework;
};
/* End PBXContainerItemProxy section */
Expand Down Expand Up @@ -274,6 +281,7 @@
isa = PBXGroup;
children = (
E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */,
2551A86B225D8EE0009873DC /* IJKMediaFrameworkWithSSL.framework */,
E654EAD91B6B28B100B0F2D0 /* IJKMediaFrameworkTests.xctest */,
);
name = Products;
Expand Down Expand Up @@ -309,12 +317,19 @@
CLASSPREFIX = IJK;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = bilibili;
TargetAttributes = {
E6903EFB17EAF70200CFD954 = {
DevelopmentTeam = 6FNUHS4H7D;
ProvisioningStyle = Manual;
};
};
};
buildConfigurationList = E6903EF717EAF70200CFD954 /* Build configuration list for PBXProject "IJKMediaDemo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = E6903EF317EAF70200CFD954;
Expand All @@ -334,6 +349,13 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
2551A86B225D8EE0009873DC /* IJKMediaFrameworkWithSSL.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = IJKMediaFrameworkWithSSL.framework;
remoteRef = 2551A86A225D8EE0009873DC /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
Expand Down Expand Up @@ -481,6 +503,8 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 6FNUHS4H7D;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
Expand All @@ -489,6 +513,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "T_*";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
Expand All @@ -501,6 +526,8 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 6FNUHS4H7D;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
Expand All @@ -509,6 +536,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "T_*";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
Expand Down
1 change: 1 addition & 0 deletions ios/IJKMediaDemo/IJKMediaDemo/IJKDemoInputURLViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ - (void)viewDidLoad {
}

- (void)onClickPlayButton {
self.textView.text = @"https://api.huoshan.com/hotsoon/item/video/_playback/?video_id=bea0903abb954f58ac0e17c21226a3c3&line=1&app_id=1115&watermark=1";
NSURL *url = [NSURL URLWithString:self.textView.text];
NSString *scheme = [[url scheme] lowercaseString];

Expand Down
579 changes: 9 additions & 570 deletions ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

Loading