virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

ffplay: factorize checking if a stream needs additional packets

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2016-06-11 11:33:46 +02:00
parent cc16229d91
commit 8594a8fbf9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ffplay.c
View File

@@ -2796,6 +2796,13 @@ static int decode_interrupt_cb(void *ctx)
return is->abort_request; return is->abort_request;
} }
static int stream_has_enough_packets(AVStream *st, int stream_id, PacketQueue *queue) {
return stream_id < 0 ||
queue->abort_request ||
(st->disposition & AV_DISPOSITION_ATTACHED_PIC) ||
queue->nb_packets > MIN_FRAMES;
}
static int is_realtime(AVFormatContext *s) static int is_realtime(AVFormatContext *s)
{ {
if( !strcmp(s->iformat->name, "rtp") if( !strcmp(s->iformat->name, "rtp")
@@ -3060,10 +3067,9 @@ static int read_thread(void *arg)
/* if the queue are full, no need to read more */ /* if the queue are full, no need to read more */
if (infinite_buffer<1 && if (infinite_buffer<1 &&
(is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE (is->audioq.size + is->videoq.size + is->subtitleq.size > MAX_QUEUE_SIZE
|| ( (is->audioq .nb_packets > MIN_FRAMES || is->audio_stream < 0 || is->audioq.abort_request) || (stream_has_enough_packets(is->audio_st, is->audio_stream, &is->audioq) &&
&& (is->videoq .nb_packets > MIN_FRAMES || is->video_stream < 0 || is->videoq.abort_request stream_has_enough_packets(is->video_st, is->video_stream, &is->videoq) &&
|| (is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC)) stream_has_enough_packets(is->subtitle_st, is->subtitle_stream, &is->subtitleq)))) {
&& (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0 || is->subtitleq.abort_request)))) {
/* wait 10 ms */ /* wait 10 ms */
SDL_LockMutex(wait_mutex); SDL_LockMutex(wait_mutex);
SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10); SDL_CondWaitTimeout(is->continue_read_thread, wait_mutex, 10);