generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

av_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Wolfram Gloger 2011-09-09 17:15:08 +02:00 committed by Michael Niedermayer
parent 88fddd0bcc
commit 6dcbbe34e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -3226,7 +3226,7 @@ static int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacke
int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){
AVPacketList *pktl; AVPacketList *pktl;
int stream_count=0, noninterleaved_count=0; int stream_count=0, noninterleaved_count=0;
int64_t delta_dts_min = INT64_MAX; int64_t delta_dts_max = 0;
int i; int i;
if(pkt){ if(pkt){
@ -3253,11 +3253,11 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pk
av_rescale_q(s->packet_buffer->pkt.dts, av_rescale_q(s->packet_buffer->pkt.dts,
s->streams[s->packet_buffer->pkt.stream_index]->time_base, s->streams[s->packet_buffer->pkt.stream_index]->time_base,
AV_TIME_BASE_Q); AV_TIME_BASE_Q);
delta_dts_min = FFMIN(delta_dts_min, delta_dts); delta_dts_max= FFMAX(delta_dts_max, delta_dts);
} }
} }
if(s->nb_streams == stream_count+noninterleaved_count && if(s->nb_streams == stream_count+noninterleaved_count &&
delta_dts_min > 20*AV_TIME_BASE) { delta_dts_max > 20*AV_TIME_BASE) {
av_log(s, AV_LOG_DEBUG, "flushing with %d noninterleaved\n", noninterleaved_count); av_log(s, AV_LOG_DEBUG, "flushing with %d noninterleaved\n", noninterleaved_count);
flush = 1; flush = 1;
} }