[FFmpeg-cvslog] avconv: do not send non-monotonous DTS to the muxers.
Anton Khirnov
git at videolan.org
Fri Jun 20 01:21:47 CEST 2014
ffmpeg | branch: release/1.1 | Anton Khirnov <anton at khirnov.net> | Wed Apr 24 08:34:44 2013 +0200| [ba8ab4e7ae016cf970b0f335a7933f2db53784bc] | committer: Anton Khirnov
avconv: do not send non-monotonous DTS to the muxers.
Hack partially based on a commit by Michael Niedermayer <michaelni at gmx.at>
Should fix (or work around) bug 458.
(cherry picked from commit 76d23f40314fc1dcd74a3d470b17782cc0ee5a3a)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba8ab4e7ae016cf970b0f335a7933f2db53784bc
---
avconv.c | 19 +++++++++++++++++++
avconv.h | 2 ++
avconv_opt.c | 1 +
3 files changed, 22 insertions(+)
diff --git a/avconv.c b/avconv.c
index ad64c52..bd2ea69 100644
--- a/avconv.c
+++ b/avconv.c
@@ -346,6 +346,25 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
bsfc = bsfc->next;
}
+ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
+ ost->last_mux_dts != AV_NOPTS_VALUE &&
+ pkt->dts < ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT)) {
+ av_log(NULL, AV_LOG_WARNING, "Non-monotonous DTS in output stream "
+ "%d:%d; previous: %"PRId64", current: %"PRId64"; ",
+ ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts);
+ if (exit_on_error) {
+ av_log(NULL, AV_LOG_FATAL, "aborting.\n");
+ exit(1);
+ }
+ av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result "
+ "in incorrect timestamps in the output file.\n",
+ ost->last_mux_dts + 1);
+ pkt->dts = ost->last_mux_dts + 1;
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts = FFMAX(pkt->pts, pkt->dts);
+ }
+ ost->last_mux_dts = pkt->dts;
+
pkt->stream_index = ost->index;
ret = av_interleaved_write_frame(s, pkt);
if (ret < 0) {
diff --git a/avconv.h b/avconv.h
index defdf59..0bf7998 100644
--- a/avconv.h
+++ b/avconv.h
@@ -267,6 +267,8 @@ typedef struct OutputStream {
/* pts of the first frame encoded for this stream, used for limiting
* recording time */
int64_t first_pts;
+ /* dts of the last packet sent to the muxer */
+ int64_t last_mux_dts;
AVBitStreamFilterContext *bitstream_filters;
AVCodec *enc;
int64_t max_frames;
diff --git a/avconv_opt.c b/avconv_opt.c
index e67abef..d6a6f8f 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -845,6 +845,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
av_opt_get_int(o->g->sws_opts, "sws_flags", 0, &ost->sws_flags);
ost->pix_fmts[0] = ost->pix_fmts[1] = AV_PIX_FMT_NONE;
+ ost->last_mux_dts = AV_NOPTS_VALUE;
return ost;
}
More information about the ffmpeg-cvslog
mailing list