Merge branch 'release0.4.2'

befovy · Nov 18, 2019 · 2b1bc8d · 2b1bc8d
2 parents 38da358 + aeecbe3
commit 2b1bc8d
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "search.exclude": {
+        "**/ijkplayer-arm64/**": true,
+        "**/ijkplayer-armv5/**": true,
+        "**/ijkplayer-armv7a/**": true,
+        "**/ijkplayer-x86/**": true,
+        "**/ijkplayer-x86_64/**": true,
+    }
+}
diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,10 @@
 tag next
 --------------------------------
-tag f0.4.1
+tag f0.4.2
 --------------------------------
 - desktop: fix invalid audio channel number for portaudio
 - ijkplayer: add current position msg option
+- ijkplayer: notify buffering update 100 percent
 
 tag f0.4.0
 --------------------------------

diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.4.1
-VERSION_CODE=000401
+VERSION_NAME=0.4.2
+VERSION_CODE=000402
 GROUP=com.befovy.fijkplayer
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/...kplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java b/...kplayer-example/src/main/java/tv/danmaku/ijk/media/example/widget/media/IjkVideoView.java
@@ -1067,6 +1067,7 @@ public IMediaPlayer createPlayer(int playerType) {
                     }
                     ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "framedrop", 1);
                     ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "start-on-prepared", 0);
+                    // ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "enable-position-notify", 1);
 
                     ijkMediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "http-detect-range-support", 0);
 

diff --git a/...id/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/...id/ijkplayer/ijkplayer-java/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
@@ -115,6 +115,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
     public static final int IJK_MSG_BUFFERING_START = 500;
     public static final int IJK_MSG_BUFFERING_END = 501;
     public static final int IJK_MSG_BUFFERING_UPDATE = 502;
+    public static final int IJK_MSG_CURRENT_POSITION_UPDATE = 510;
     public static final int IJK_MSG_SEEK_COMPLETE = 600;
     public static final int IJK_MSG_TIMED_TEXT = 800;
     public static final int IJK_MSG_ACCURATE_SEEK_COMPLETE = 900;

diff --git a/ijkmedia/ijkplayer/android/ijkplayer_jni.c b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
@@ -987,6 +987,7 @@ static void message_loop_n(JNIEnv *env, IjkMediaPlayer *mp)
             post_event(env, weak_thiz, msg.what, msg.arg1, msg.arg2);
             break;
         case FFP_MSG_BUFFERING_UPDATE:
+        case FFP_MSG_CURRENT_POSITION_UPDATE:
             // MPTRACE("FFP_MSG_BUFFERING_UPDATE: %d, %d", msg.arg1, msg.arg2);
             // post_event(env, weak_thiz, MEDIA_BUFFERING_UPDATE, msg.arg1, msg.arg2);
             post_event(env, weak_thiz, msg.what, msg.arg1, msg.arg2);

diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -3545,6 +3545,7 @@ static int read_thread(void *arg)
                         av_strerror(ffp->error, error_msg, AV_ERROR_MAX_STRING_SIZE);
                         ffp_notify_msg4(ffp, FFP_MSG_ERROR, ffp->error, 0, error_msg, AV_ERROR_MAX_STRING_SIZE);
                     } else {
+                        ffp_clock_msg_notify_cycle(ffp, -1);
                         av_log(ffp, AV_LOG_INFO, "ffp_toggle_buffering: completed: OK\n");
                         ffp_notify_msg1(ffp, FFP_MSG_COMPLETED);
                     }

diff --git a/ios/CocoaPodsPub/FIJKPlayer.podspec b/ios/CocoaPodsPub/FIJKPlayer.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "FIJKPlayer"
-  spec.version      = "0.4.1"
+  spec.version      = "0.4.2"
   spec.summary      = "ijkplayer iOS video player SDK"
 
   spec.author       = { "befovy" => "befovy@gmail.com" }
@@ -75,7 +75,7 @@ Pod::Spec.new do |spec|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  spec.source = { :http => "https://github.com/befovy/ijkplayer/releases/download/f0.4.1/IJKPlayer.tar.gz" }
+  spec.source = { :http => "https://github.com/befovy/ijkplayer/releases/download/f0.4.2/IJKPlayer.tar.gz" }
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
   #  CocoaPods is smart about how it includes source code. For source files

diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist b/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>000401</string>
+	<string>000402</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>