har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to more completely update time variables on unpause.

Browse Source 
Could not notice a differenc in behavior.

Originally committed as revision 21584 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-01 10:32:17 +00:00
parent 8e14fbe89b
commit f5668147cb
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffplay.c
View File

@ -115,6 +115,7 @@ typedef struct VideoState {
int seek_flags; int seek_flags;
int64_t seek_pos; int64_t seek_pos;
int64_t seek_rel; int64_t seek_rel;
int read_pause_return;
AVFormatContext *ic; AVFormatContext *ic;
int dtg_active_format; int dtg_active_format;
@ -991,8 +992,12 @@ static void stream_pause(VideoState *is)
{ {
is->paused = !is->paused; is->paused = !is->paused;
if (!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->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) { if (is->paused != is->last_paused) {
is->last_paused = is->paused; is->last_paused = is->paused;
if (is->paused) if (is->paused)
av_read_pause(ic); is->read_pause_return= av_read_pause(ic);
else else
av_read_play(ic); av_read_play(ic);
} }