OSDN Git Service

Try to more completely update time variables on unpause.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Feb 2010 10:32:17 +0000 (10:32 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Feb 2010 10:32:17 +0000 (10:32 +0000)
Could not notice a differenc in behavior.

Originally committed as revision 21584 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffplay.c

index 097a82c..9fc8f38 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -115,6 +115,7 @@ typedef struct VideoState {
     int seek_flags;
     int64_t seek_pos;
     int64_t seek_rel;
+    int read_pause_return;
     AVFormatContext *ic;
     int dtg_active_format;
 
@@ -991,8 +992,12 @@ static void stream_pause(VideoState *is)
 {
     is->paused = !is->paused;
     if (!is->paused) {
-        is->video_current_pts = get_video_clock(is);
+        if(is->read_pause_return != AVERROR(ENOSYS)){
+            is->video_current_pts = get_video_clock(is);
+        }
+
         is->frame_timer += (av_gettime() - is->video_current_pts_time) / 1000000.0;
+        is->video_current_pts_time= av_gettime();
     }
 }
 
@@ -2007,7 +2012,7 @@ static int decode_thread(void *arg)
         if (is->paused != is->last_paused) {
             is->last_paused = is->paused;
             if (is->paused)
-                av_read_pause(ic);
+                is->read_pause_return= av_read_pause(ic);
             else
                 av_read_play(ic);
         }