virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffplay: Use av_gettime_relative()

Browse Source 
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Olivier Langlois 2014-05-06 17:16:48 -04:00 committed by Michael Niedermayer
parent 43c18fec6e
commit 0ca0b4c29c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ffplay.c
View File

@ -910,7 +910,7 @@ static void video_audio_display(VideoState *s)
/* to be more precise, we take into account the time spent since /* to be more precise, we take into account the time spent since
the last buffer computation */ the last buffer computation */
if (audio_callback_time) { if (audio_callback_time) {
time_diff = av_gettime() - audio_callback_time; time_diff = av_gettime_relative() - audio_callback_time;
delay -= (time_diff * s->audio_tgt.freq) / 1000000; delay -= (time_diff * s->audio_tgt.freq) / 1000000;
} }
@ -1143,7 +1143,7 @@ static double get_clock(Clock *c)
if (c->paused) { if (c->paused) {
return c->pts; return c->pts;
} else { } else {
double time = av_gettime() / 1000000.0; double time = av_gettime_relative() / 1000000.0;
return c->pts_drift + time - (time - c->last_updated) * (1.0 - c->speed); return c->pts_drift + time - (time - c->last_updated) * (1.0 - c->speed);
} }
} }
@ -1158,7 +1158,7 @@ static void set_clock_at(Clock *c, double pts, int serial, double time)
static void set_clock(Clock *c, double pts, int serial) static void set_clock(Clock *c, double pts, int serial)
{ {
double time = av_gettime() / 1000000.0; double time = av_gettime_relative() / 1000000.0;
set_clock_at(c, pts, serial, time); set_clock_at(c, pts, serial, time);
} }
@ -1251,7 +1251,7 @@ static void stream_seek(VideoState *is, int64_t pos, int64_t rel, int seek_by_by
static void stream_toggle_pause(VideoState *is) static void stream_toggle_pause(VideoState *is)
{ {
if (is->paused) { if (is->paused) {
is->frame_timer += av_gettime() / 1000000.0 + is->vidclk.pts_drift - is->vidclk.pts; is->frame_timer += av_gettime_relative() / 1000000.0 + is->vidclk.pts_drift - is->vidclk.pts;
if (is->read_pause_return != AVERROR(ENOSYS)) { if (is->read_pause_return != AVERROR(ENOSYS)) {
is->vidclk.paused = 0; is->vidclk.paused = 0;
} }
@ -1366,7 +1366,7 @@ static void video_refresh(void *opaque, double *remaining_time)
check_external_clock_speed(is); check_external_clock_speed(is);
if (!display_disable && is->show_mode != SHOW_MODE_VIDEO && is->audio_st) { if (!display_disable && is->show_mode != SHOW_MODE_VIDEO && is->audio_st) {
time = av_gettime() / 1000000.0; time = av_gettime_relative() / 1000000.0;
if (is->force_refresh || is->last_vis_time + rdftspeed < time) { if (is->force_refresh || is->last_vis_time + rdftspeed < time) {
video_display(is); video_display(is);
is->last_vis_time = time; is->last_vis_time = time;
@ -1397,7 +1397,7 @@ retry:
} }
if (lastvp->serial != vp->serial && !redisplay) if (lastvp->serial != vp->serial && !redisplay)
is->frame_timer = av_gettime() / 1000000.0; is->frame_timer = av_gettime_relative() / 1000000.0;
if (is->paused) if (is->paused)
goto display; goto display;
@ -1409,7 +1409,7 @@ retry:
else else
delay = compute_target_delay(last_duration, is); delay = compute_target_delay(last_duration, is);
time= av_gettime()/1000000.0; time= av_gettime_relative()/1000000.0;
if (time < is->frame_timer + delay && !redisplay) { if (time < is->frame_timer + delay && !redisplay) {
*remaining_time = FFMIN(is->frame_timer + delay - time, *remaining_time); *remaining_time = FFMIN(is->frame_timer + delay - time, *remaining_time);
return; return;
@ -1483,7 +1483,7 @@ display:
int aqsize, vqsize, sqsize; int aqsize, vqsize, sqsize;
double av_diff; double av_diff;
cur_time = av_gettime(); cur_time = av_gettime_relative();
if (!last_time || (cur_time - last_time) >= 30000) { if (!last_time || (cur_time - last_time) >= 30000) {
aqsize = 0; aqsize = 0;
vqsize = 0; vqsize = 0;
@ -1981,7 +1981,7 @@ static int video_thread(void *arg)
goto the_end; goto the_end;
while (ret >= 0) { while (ret >= 0) {
is->frame_last_returned_time = av_gettime() / 1000000.0; is->frame_last_returned_time = av_gettime_relative() / 1000000.0;
ret = av_buffersink_get_frame_flags(filt_out, frame, 0); ret = av_buffersink_get_frame_flags(filt_out, frame, 0);
if (ret < 0) { if (ret < 0) {
@ -1991,7 +1991,7 @@ static int video_thread(void *arg)
break; break;
} }
is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time; is->frame_last_filter_delay = av_gettime_relative() / 1000000.0 - is->frame_last_returned_time;
if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0) if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0)
is->frame_last_filter_delay = 0; is->frame_last_filter_delay = 0;
tb = filt_out->inputs[0]->time_base; tb = filt_out->inputs[0]->time_base;
@ -2392,7 +2392,7 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len)
VideoState *is = opaque; VideoState *is = opaque;
int audio_size, len1; int audio_size, len1;
audio_callback_time = av_gettime(); audio_callback_time = av_gettime_relative();
while (len > 0) { while (len > 0) {
if (is->audio_buf_index >= is->audio_buf_size) { if (is->audio_buf_index >= is->audio_buf_size) {
@ -3191,7 +3191,7 @@ static void refresh_loop_wait_event(VideoState *is, SDL_Event *event) {
double remaining_time = 0.0; double remaining_time = 0.0;
SDL_PumpEvents(); SDL_PumpEvents();
while (!SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_ALLEVENTS)) { while (!SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_ALLEVENTS)) {
if (!cursor_hidden && av_gettime() - cursor_last_shown > CURSOR_HIDE_DELAY) { if (!cursor_hidden && av_gettime_relative() - cursor_last_shown > CURSOR_HIDE_DELAY) {
SDL_ShowCursor(0); SDL_ShowCursor(0);
cursor_hidden = 1; cursor_hidden = 1;
} }
@ -3355,7 +3355,7 @@ static void event_loop(VideoState *cur_stream)
SDL_ShowCursor(1); SDL_ShowCursor(1);
cursor_hidden = 0; cursor_hidden = 0;
} }
cursor_last_shown = av_gettime(); cursor_last_shown = av_gettime_relative();
if (event.type == SDL_MOUSEBUTTONDOWN) { if (event.type == SDL_MOUSEBUTTONDOWN) {
x = event.button.x; x = event.button.x;
} else { } else {