From d5c3da558fa6642fe5cb1fee717882f95e8beb64 Mon Sep 17 00:00:00 2001 From: yangdan07 Date: Wed, 9 Sep 2020 11:32:21 +0800 Subject: [PATCH] refactor(las): delete some unuse code --- .../ijk/media/player/IjkMediaPlayer.java | 3 - ijkmedia/ijkplayer/ff_ffplay.c | 69 +++++++++---------- .../IJKMoviePlayerViewController.m | 1 - .../IJKMediaPlayer.xcodeproj/project.pbxproj | 18 +---- 4 files changed, 33 insertions(+), 58 deletions(-) diff --git a/android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index 6aa5c234..beb73f76 100755 --- a/android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/android/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -428,9 +428,6 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { sb.append(entry.getValue()); sb.append("\r\n"); setOption(OPT_CATEGORY_FORMAT, "headers", sb.toString()); - if(headers.containsKey("manifest_string")){ - setOption(OPT_CATEGORY_FORMAT, "manifest_string", headers.get("manifest_string")); - } setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "protocol_whitelist", "async,cache,crypto,file,http,https,ijkhttphook,ijkinject,ijklivehook,ijklongurl,ijksegment,ijktcphook,pipe,rtp,tcp,tls,udp,ijkurlhook,data"); } } diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index 913d61a0..6094c66f 100755 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -3114,23 +3114,22 @@ static int read_thread(void *arg) av_dict_set_int(&ic->metadata, "skip-calc-frame-rate", ffp->skip_calc_frame_rate, 0); av_dict_set_int(&ffp->format_opts, "skip-calc-frame-rate", ffp->skip_calc_frame_rate, 0); } - + if (ffp->iformat_name) is->iformat = av_find_input_format(ffp->iformat_name); - + if (ffp->is_manifest) { extern AVInputFormat ijkff_las_demuxer; is->iformat = &ijkff_las_demuxer; av_dict_set_int(&ffp->format_opts, "las_player_statistic", (intptr_t) (&ffp->las_player_statistic), 0); + ffp->find_stream_info = false; } err = avformat_open_input(&ic, is->filename, is->iformat, &ffp->format_opts); - if (err < 0) { print_error(is->filename, err); ret = -1; goto fail; } - ffp_notify_msg1(ffp, FFP_MSG_OPEN_INPUT); if (scan_all_pmts_set) @@ -3149,48 +3148,44 @@ static int read_thread(void *arg) ic->flags |= AVFMT_FLAG_GENPTS; av_format_inject_global_side_data(ic); - // - if (!ffp->is_manifest) { - AVDictionary **opts; - int orig_nb_streams; - opts = setup_find_stream_info_opts(ic, ffp->codec_opts); - orig_nb_streams = ic->nb_streams; - + //AVDictionary **opts; + //int orig_nb_streams; + //opts = setup_find_stream_info_opts(ic, ffp->codec_opts); + //orig_nb_streams = ic->nb_streams; - if (ffp->find_stream_info) { - AVDictionary **opts = setup_find_stream_info_opts(ic, ffp->codec_opts); - int orig_nb_streams = ic->nb_streams; - do { - if (av_stristart(is->filename, "data:", NULL) && orig_nb_streams > 0) { - for (i = 0; i < orig_nb_streams; i++) { - if (!ic->streams[i] || !ic->streams[i]->codecpar || ic->streams[i]->codecpar->profile == FF_PROFILE_UNKNOWN) { - break; - } - } + if (ffp->find_stream_info) { + AVDictionary **opts = setup_find_stream_info_opts(ic, ffp->codec_opts); + int orig_nb_streams = ic->nb_streams; - if (i == orig_nb_streams) { + do { + if (av_stristart(is->filename, "data:", NULL) && orig_nb_streams > 0) { + for (i = 0; i < orig_nb_streams; i++) { + if (!ic->streams[i] || !ic->streams[i]->codecpar || ic->streams[i]->codecpar->profile == FF_PROFILE_UNKNOWN) { break; } } - err = avformat_find_stream_info(ic, opts); - } while(0); - ffp_notify_msg1(ffp, FFP_MSG_FIND_STREAM_INFO); - - for (i = 0; i < orig_nb_streams; i++) - av_dict_free(&opts[i]); - av_freep(&opts); - - if (err < 0) { - av_log(NULL, AV_LOG_WARNING, - "%s: could not find codec parameters\n", is->filename); - ret = -1; - goto fail; + + if (i == orig_nb_streams) { + break; + } } + err = avformat_find_stream_info(ic, opts); + } while(0); + ffp_notify_msg1(ffp, FFP_MSG_FIND_STREAM_INFO); + + for (i = 0; i < orig_nb_streams; i++) + av_dict_free(&opts[i]); + av_freep(&opts); + + if (err < 0) { + av_log(NULL, AV_LOG_WARNING, + "%s: could not find codec parameters\n", is->filename); + ret = -1; + goto fail; } } - if (ic->pb) ic->pb->eof_reached = 0; // FIXME hack, ffplay maybe should not use avio_feof() to test for the end @@ -4007,9 +4002,7 @@ FFPlayer *ffp_create() av_opt_set_defaults(ffp); - //ffp->player_statistic = ac_player_statistic_create(); las_stat_init(&ffp->las_player_statistic); - return ffp; } diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m b/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m index 2b44dfcd..3bfa4210 100644 --- a/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m +++ b/ios/IJKMediaDemo/IJKMediaDemo/IJKMoviePlayerViewController.m @@ -49,7 +49,6 @@ if (self) { self.url = url; } - self.headers = nil; return self; } diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj index 12ec06ec..99712347 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj +++ b/ios/IJKMediaPlayer/IJKMediaPlayer.xcodeproj/project.pbxproj @@ -166,7 +166,6 @@ 54CF8A521E15287D00309DD5 /* ijktree.h in Headers */ = {isa = PBXBuildFile; fileRef = 54CF8A461E15287D00309DD5 /* ijktree.h */; }; 54CF8A531E15287D00309DD5 /* ijkutils.c in Sources */ = {isa = PBXBuildFile; fileRef = 54CF8A471E15287D00309DD5 /* ijkutils.c */; }; 54CF8A541E15287D00309DD5 /* ijkutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 54CF8A481E15287D00309DD5 /* ijkutils.h */; }; - B417F8D724F7C3A300D159BB /* utility.h in Headers */ = {isa = PBXBuildFile; fileRef = B417F8D324F7C3A300D159BB /* utility.h */; }; B417F8DE24F7C3B500D159BB /* cJSON.h in Headers */ = {isa = PBXBuildFile; fileRef = B417F8DB24F7C3B400D159BB /* cJSON.h */; }; B417F8E224F7C56C00D159BB /* cJSON.c in Sources */ = {isa = PBXBuildFile; fileRef = B417F8E124F7C56C00D159BB /* cJSON.c */; }; B4449BD6250095700074CEDC /* ijklas.h in Headers */ = {isa = PBXBuildFile; fileRef = B4449BD4250095700074CEDC /* ijklas.h */; }; @@ -323,7 +322,6 @@ 54CF8A461E15287D00309DD5 /* ijktree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ijktree.h; sourceTree = ""; }; 54CF8A471E15287D00309DD5 /* ijkutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ijkutils.c; sourceTree = ""; }; 54CF8A481E15287D00309DD5 /* ijkutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ijkutils.h; sourceTree = ""; }; - B417F8D324F7C3A300D159BB /* utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utility.h; sourceTree = ""; }; B417F8DB24F7C3B400D159BB /* cJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cJSON.h; sourceTree = ""; }; B417F8E124F7C56C00D159BB /* cJSON.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cJSON.c; sourceTree = ""; }; B4449BD4250095700074CEDC /* ijklas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ijklas.h; sourceTree = ""; }; @@ -736,7 +734,6 @@ E6903FCE17EAFC6100CFD954 /* ijkplayer */ = { isa = PBXGroup; children = ( - B417F8D324F7C3A300D159BB /* utility.h */, E67FB4AC1B4A766F00AA94AA /* config.h */, E6903FD517EAFC6100CFD954 /* ff_cmdutils.c */, E6903FD617EAFC6100CFD954 /* ff_cmdutils.h */, @@ -1040,7 +1037,6 @@ 54CF8A3B1E1526F800309DD5 /* ijkioprotocol.h in Headers */, B4449BD6250095700074CEDC /* ijklas.h in Headers */, E654EAE71B6B295200B0F2D0 /* IJKMediaPlayback.h in Headers */, - B417F8D724F7C3A300D159BB /* utility.h in Headers */, E654EAED1B6B29C100B0F2D0 /* IJKMediaPlayer.h in Headers */, E6C459961C7030B6004831EC /* internal.h in Headers */, 5407EC2D1DF81D2600457BFE /* IJKVideoToolBoxSync.h in Headers */, @@ -1122,7 +1118,6 @@ TargetAttributes = { E654EA891B6B27E600B0F2D0 = { CreatedOnToolsVersion = 6.4; - ProvisioningStyle = Manual; }; E654EA931B6B27E600B0F2D0 = { CreatedOnToolsVersion = 6.4; @@ -1134,7 +1129,6 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( - English, en, ); mainGroup = E6903EB017EAF6C500CFD954; @@ -1522,11 +1516,9 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 0.8.8; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1549,7 +1541,7 @@ ); INFOPLIST_FILE = IJKMediaFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1559,8 +1551,6 @@ MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1576,10 +1566,8 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 0.8.8; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1599,7 +1587,7 @@ ); INFOPLIST_FILE = IJKMediaFramework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1609,8 +1597,6 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; -- GitLab