virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

ffplay: make eof part of videostate and signal it when opening a stream

Browse Source 
Otherwise we may not flush a decoder when a new stream is opened during an
already eof condition.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2015-01-06 01:17:56 +01:00
parent 68850090b6
commit d6910c4b5e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffplay.c
View File

@ -280,6 +280,7 @@ typedef struct VideoState {
struct SwsContext *img_convert_ctx; struct SwsContext *img_convert_ctx;
#endif #endif
SDL_Rect last_display_rect; SDL_Rect last_display_rect;
int eof;
char filename[1024]; char filename[1024];
int width, height, xleft, ytop; int width, height, xleft, ytop;
@ -2687,6 +2688,7 @@ static int stream_component_open(VideoState *is, int stream_index)
goto fail; goto fail;
} }
is->eof = 0;
ic->streams[stream_index]->discard = AVDISCARD_DEFAULT; ic->streams[stream_index]->discard = AVDISCARD_DEFAULT;
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
@ -2873,7 +2875,6 @@ static int read_thread(void *arg)
int err, i, ret; int err, i, ret;
int st_index[AVMEDIA_TYPE_NB]; int st_index[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
int eof = 0;
int64_t stream_start_time; int64_t stream_start_time;
int pkt_in_play_range = 0; int pkt_in_play_range = 0;
AVDictionaryEntry *t; AVDictionaryEntry *t;
@ -2887,6 +2888,7 @@ static int read_thread(void *arg)
is->last_video_stream = is->video_stream = -1; is->last_video_stream = is->video_stream = -1;
is->last_audio_stream = is->audio_stream = -1; is->last_audio_stream = is->audio_stream = -1;
is->last_subtitle_stream = is->subtitle_stream = -1; is->last_subtitle_stream = is->subtitle_stream = -1;
is->eof = 0;
ic = avformat_alloc_context(); ic = avformat_alloc_context();
ic->interrupt_callback.callback = decode_interrupt_cb; ic->interrupt_callback.callback = decode_interrupt_cb;
@ -3084,7 +3086,7 @@ static int read_thread(void *arg)
} }
is->seek_req = 0; is->seek_req = 0;
is->queue_attachments_req = 1; is->queue_attachments_req = 1;
eof = 0; is->eof = 0;
if (is->paused) if (is->paused)
step_to_next_frame(is); step_to_next_frame(is);
} }
@ -3124,14 +3126,14 @@ static int read_thread(void *arg)
} }
ret = av_read_frame(ic, pkt); ret = av_read_frame(ic, pkt);
if (ret < 0) { if (ret < 0) {
if ((ret == AVERROR_EOF || avio_feof(ic->pb)) && !eof) { if ((ret == AVERROR_EOF || avio_feof(ic->pb)) && !is->eof) {
if (is->video_stream >= 0) if (is->video_stream >= 0)
packet_queue_put_nullpacket(&is->videoq, is->video_stream); packet_queue_put_nullpacket(&is->videoq, is->video_stream);
if (is->audio_stream >= 0) if (is->audio_stream >= 0)
packet_queue_put_nullpacket(&is->audioq, is->audio_stream); packet_queue_put_nullpacket(&is->audioq, is->audio_stream);
if (is->subtitle_stream >= 0) if (is->subtitle_stream >= 0)
packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream); packet_queue_put_nullpacket(&is->subtitleq, is->subtitle_stream);
eof = 1; is->eof = 1;
} }
if (ic->pb && ic->pb->error) if (ic->pb && ic->pb->error)
break; break;
@ -3140,7 +3142,7 @@ static int read_thread(void *arg)
SDL_UnlockMutex(wait_mutex); SDL_UnlockMutex(wait_mutex);
continue; continue;
} else { } else {
eof = 0; is->eof = 0;
} }
/* check if packet is in play range specified by user, then queue, otherwise discard */ /* check if packet is in play range specified by user, then queue, otherwise discard */
stream_start_time = ic->streams[pkt->stream_index]->start_time; stream_start_time = ic->streams[pkt->stream_index]->start_time;