mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'cus/stable'
* cus/stable: ffplay: always queue attachment pictures after flushing the video packet queue ffplay: fix early frame dropped pts serial Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8b9059cfdd
21
ffplay.c
21
ffplay.c
|
@ -233,6 +233,7 @@ typedef struct VideoState {
|
|||
double frame_last_returned_time;
|
||||
double frame_last_filter_delay;
|
||||
int64_t frame_last_dropped_pos;
|
||||
int frame_last_dropped_serial;
|
||||
int video_stream;
|
||||
AVStream *video_st;
|
||||
PacketQueue videoq;
|
||||
|
@ -1340,7 +1341,7 @@ retry:
|
|||
if (is->pictq_size == 0) {
|
||||
SDL_LockMutex(is->pictq_mutex);
|
||||
if (is->frame_last_dropped_pts != AV_NOPTS_VALUE && is->frame_last_dropped_pts > is->frame_last_pts) {
|
||||
update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos, 0);
|
||||
update_video_pts(is, is->frame_last_dropped_pts, is->frame_last_dropped_pos, is->frame_last_dropped_serial);
|
||||
is->frame_last_dropped_pts = AV_NOPTS_VALUE;
|
||||
}
|
||||
SDL_UnlockMutex(is->pictq_mutex);
|
||||
|
@ -1699,6 +1700,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
|
|||
clockdiff + ptsdiff - is->frame_last_filter_delay < 0) {
|
||||
is->frame_last_dropped_pos = pkt->pos;
|
||||
is->frame_last_dropped_pts = dpts;
|
||||
is->frame_last_dropped_serial = *serial;
|
||||
is->frame_drops_early++;
|
||||
av_frame_unref(frame);
|
||||
ret = 0;
|
||||
|
@ -2550,6 +2552,7 @@ static int stream_component_open(VideoState *is, int stream_index)
|
|||
|
||||
packet_queue_start(&is->videoq);
|
||||
is->video_tid = SDL_CreateThread(video_thread, is);
|
||||
is->queue_attachments_req = 1;
|
||||
break;
|
||||
case AVMEDIA_TYPE_SUBTITLE:
|
||||
is->subtitle_stream = stream_index;
|
||||
|
@ -2849,12 +2852,18 @@ static int read_thread(void *arg)
|
|||
}
|
||||
}
|
||||
is->seek_req = 0;
|
||||
is->queue_attachments_req = 1;
|
||||
eof = 0;
|
||||
if (is->paused)
|
||||
step_to_next_frame(is);
|
||||
}
|
||||
if (is->queue_attachments_req) {
|
||||
avformat_queue_attached_pictures(ic);
|
||||
if (is->video_st && is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC) {
|
||||
AVPacket copy;
|
||||
if ((ret = av_copy_packet(©, &is->video_st->attached_pic)) < 0)
|
||||
goto fail;
|
||||
packet_queue_put(&is->videoq, ©);
|
||||
}
|
||||
is->queue_attachments_req = 0;
|
||||
}
|
||||
|
||||
|
@ -2862,7 +2871,8 @@ static int read_thread(void *arg)
|
|||
if (infinite_buffer<1 &&
|
||||
(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)
|
||||
&& (is->videoq .nb_packets > MIN_FRAMES || is->video_stream < 0 || is->videoq.abort_request)
|
||||
&& (is->videoq .nb_packets > MIN_FRAMES || is->video_stream < 0 || is->videoq.abort_request
|
||||
|| (is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC))
|
||||
&& (is->subtitleq.nb_packets > MIN_FRAMES || is->subtitle_stream < 0 || is->subtitleq.abort_request)))) {
|
||||
/* wait 10 ms */
|
||||
SDL_LockMutex(wait_mutex);
|
||||
|
@ -2917,7 +2927,8 @@ static int read_thread(void *arg)
|
|||
<= ((double)duration / 1000000);
|
||||
if (pkt->stream_index == is->audio_stream && pkt_in_play_range) {
|
||||
packet_queue_put(&is->audioq, pkt);
|
||||
} else if (pkt->stream_index == is->video_stream && pkt_in_play_range) {
|
||||
} else if (pkt->stream_index == is->video_stream && pkt_in_play_range
|
||||
&& !(is->video_st->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
|
||||
packet_queue_put(&is->videoq, pkt);
|
||||
} else if (pkt->stream_index == is->subtitle_stream && pkt_in_play_range) {
|
||||
packet_queue_put(&is->subtitleq, pkt);
|
||||
|
@ -3048,8 +3059,6 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
|
|||
the_end:
|
||||
stream_component_close(is, old_index);
|
||||
stream_component_open(is, stream_index);
|
||||
if (codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
is->queue_attachments_req = 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue