ijkplayer: ijkmp_reset update, not recreate player, just wait_stop.

befovy · Aug 16, 2019 · 91c17c14f2e9b630c271ec4486eaf76463756b2f · 91c17c1 · peerless2012 · Jun 13, 2022
1 parent 131eb28
commit 91c17c14f2e9b630c271ec4486eaf76463756b2f
Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ijkmedia/ijkplayer/android/ijkplayer_jni.c b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
@@ -390,10 +390,7 @@ IjkMediaPlayer_reset(JNIEnv *env, jobject thiz)
     if (!mp)
         return;
 
-    jobject weak_thiz = (jobject) ijkmp_set_weak_thiz(mp, NULL );
-
-    IjkMediaPlayer_release(env, thiz);
-    IjkMediaPlayer_native_setup(env, thiz, weak_thiz);
+    ijkmp_reset(mp);
 
     ijkmp_dec_ref_p(&mp);
 }

diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c
@@ -553,6 +553,18 @@ int ijkmp_stop(IjkMediaPlayer *mp)
     return retval;
 }
 
+int ijkmp_reset(IjkMediaPlayer *mp)
+{
+    assert(mp);
+    MPTRACE("ijkmp_reset()\n");
+    pthread_mutex_lock(&mp->mutex);
+    int retval = ffp_wait_stop_l(mp->ffplayer);
+    pthread_mutex_unlock(&mp->mutex);
+    MPTRACE("ijkmp_reset()=%d\n", retval);
+    ijkmp_change_state_l(mp, MP_STATE_IDLE);
+    return retval;
+}
+
 bool ijkmp_is_playing(IjkMediaPlayer *mp)
 {
     assert(mp);

diff --git a/ijkmedia/ijkplayer/ijkplayer.h b/ijkmedia/ijkplayer/ijkplayer.h
@@ -201,6 +201,7 @@ int             ijkmp_prepare_async(IjkMediaPlayer *mp);
 int             ijkmp_start(IjkMediaPlayer *mp);
 int             ijkmp_pause(IjkMediaPlayer *mp);
 int             ijkmp_stop(IjkMediaPlayer *mp);
+int             ijkmp_reset(IjkMediaPlayer *mp);
 int             ijkmp_seek_to(IjkMediaPlayer *mp, long msec);
 int             ijkmp_get_state(IjkMediaPlayer *mp);
 bool            ijkmp_is_playing(IjkMediaPlayer *mp);

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.m
@@ -241,8 +241,8 @@ - (void) shutdown
 
 - (int) reset
 {
-    [self shutdown];
-    [self nativeSetup];
+    ijkmp_stop(_nativeMediaPlayer);
+    ijkmp_reset(_nativeMediaPlayer);
     return 0;
 }