Merge branch 'release0.3.6'

befovy · Aug 29, 2019 · 58db198 · 58db198
2 parents 0dd4dd7 + ca72042
commit 58db198
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,10 @@
 tag next
 --------------------------------
 
+tag f0.3.6
+--------------------------------
+- ijkplayer: add ffp_reset, call ffp_reset in ijkmp_reset
+
 tag f0.3.5
 --------------------------------
 - fijkplayer: change to state error when notify error

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.3.5
-VERSION_CODE=000305
+VERSION_NAME=0.3.6
+VERSION_CODE=000306
 GROUP=com.befovy.fijkplayer
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -4004,6 +4004,38 @@ FFPlayer *ffp_create()
  return ffp;
 }
 
+void ffp_reset(FFPlayer *ffp)
+{
+ if (!ffp)
+ return;
+
+ ffp->start_time = AV_NOPTS_VALUE;
+ ffp->duration = AV_NOPTS_VALUE;
+ ffp->error = 0;
+ ffp->loop = 1;
+ ffp->first_audio_frame_rendered = 0;
+ ffp->first_video_frame_rendered = 0;
+ av_freep(&ffp->input_filename);
+
+ memset(ffp->wanted_stream_spec, 0, sizeof(ffp->wanted_stream_spec));
+
+
+ av_freep(&ffp->video_codec_info);
+ av_freep(&ffp->audio_codec_info);
+ av_freep(&ffp->subtitle_codec_info);
+
+ ijkmeta_reset(ffp->meta);
+
+ SDL_SpeedSamplerReset(&ffp->vfps_sampler);
+ SDL_SpeedSamplerReset(&ffp->vdps_sampler);
+
+ ffp_reset_statistic(&ffp->stat);
+ ffp_reset_demux_cache_control(&ffp->dcc);
+
+ //ffp_reset_internal(NULL);
+}
+
+
 void ffp_destroy(FFPlayer *ffp)
 {
  if (!ffp)

diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c
@@ -560,6 +560,7 @@ int ijkmp_reset(IjkMediaPlayer *mp)
  MPTRACE("ijkmp_reset()\n");
  pthread_mutex_lock(&mp->mutex);
  int retval = ffp_wait_stop_l(mp->ffplayer);
+ ffp_reset(mp->ffplayer);
  pthread_mutex_unlock(&mp->mutex);
  MPTRACE("ijkmp_reset()=%d\n", retval);
  ijkmp_change_state_l(mp, MP_STATE_IDLE);

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.3.5"
+ spec.version = "0.3.6"
  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.3.4/FIJKPlayer.tar.gz" }
+ spec.source = { :http => "https://github.com/befovy/ijkplayer/releases/download/f0.3.6/FIJKPlayer.tar.gz" }
  # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
  #
  # CocoaPods is smart about how it includes source code. For source files