diff options
| author | Marton Balint <cus@passwd.hu> | 2012-09-02 15:29:54 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2012-09-11 22:15:37 +0200 |
| commit | 81f26d6990d06d50c68dd9d975147e0e6589a8e6 (patch) | |
| tree | b5e9aa78801cd4d9455d155e2ef40558664ab543 | |
| parent | 99b01e458c268cf18ac0981e644e0f835957498a (diff) | |
| download | ffmpeg-81f26d6990d06d50c68dd9d975147e0e6589a8e6.tar.gz | |
ffplay: ensure that pictq_prev_picture never fills the picture queue
It was theoretically possible for pictq_prev_picture to fill the picture queue
which may have caused problems when a write to the queue was still in progress.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | ffplay.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -95,7 +95,7 @@ typedef struct PacketQueue { SDL_cond *cond; } PacketQueue; -#define VIDEO_PICTURE_QUEUE_SIZE 3 +#define VIDEO_PICTURE_QUEUE_SIZE 4 #define SUBPICTURE_QUEUE_SIZE 4 typedef struct VideoPicture { @@ -1144,7 +1144,7 @@ static void pictq_prev_picture(VideoState *is) { prevvp = &is->pictq[(is->pictq_rindex + VIDEO_PICTURE_QUEUE_SIZE - 1) % VIDEO_PICTURE_QUEUE_SIZE]; if (prevvp->allocated && !prevvp->skip) { SDL_LockMutex(is->pictq_mutex); - if (is->pictq_size < VIDEO_PICTURE_QUEUE_SIZE) { + if (is->pictq_size < VIDEO_PICTURE_QUEUE_SIZE - 1) { if (--is->pictq_rindex == -1) is->pictq_rindex = VIDEO_PICTURE_QUEUE_SIZE - 1; is->pictq_size++; @@ -1173,6 +1173,8 @@ static void video_refresh(void *opaque) SubPicture *sp, *sp2; if (is->video_st) { + if (is->force_refresh) + pictq_prev_picture(is); retry: if (is->pictq_size == 0) { SDL_LockMutex(is->pictq_mutex); @@ -1385,7 +1387,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_ SDL_LockMutex(is->pictq_mutex); /* keep the last already displayed picture in the queue */ - while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE - 1 && + while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE - 2 && !is->videoq.abort_request) { SDL_CondWait(is->pictq_cond, is->pictq_mutex); } @@ -2898,8 +2900,6 @@ static void event_loop(VideoState *cur_stream) alloc_picture(event.user.data1); break; case FF_REFRESH_EVENT: - if (cur_stream->force_refresh) - pictq_prev_picture(event.user.data1); video_refresh(event.user.data1); cur_stream->refresh = 0; break; |