Skip to content

F
ffmpeg.wasm-core
Commit b2a1d92b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffmpeg: port loglevel selection code to new dts workaround code 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 30c05f6b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
ffmpeg.c
View file @ b2a1d92b
...@@ -616,14 +616,15 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost) ...@@ -616,14 +616,15 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
ost->last_mux_dts != AV_NOPTS_VALUE) { ost->last_mux_dts != AV_NOPTS_VALUE) {
int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT);
if (pkt->dts < max) { if (pkt->dts < max) {
av_log(NULL, AV_LOG_WARNING, "Non-monotonous DTS in output stream " int loglevel = max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG;
av_log(NULL, loglevel, "Non-monotonous DTS in output stream "
"%d:%d; previous: %"PRId64", current: %"PRId64"; ", "%d:%d; previous: %"PRId64", current: %"PRId64"; ",
ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts); ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts);
if (exit_on_error) { if (exit_on_error) {
av_log(NULL, AV_LOG_FATAL, "aborting.\n"); av_log(NULL, AV_LOG_FATAL, "aborting.\n");
exit(1); exit(1);
} }
av_log(NULL, AV_LOG_WARNING, "changing to %"PRId64". This may result " av_log(NULL, loglevel, "changing to %"PRId64". This may result "
"in incorrect timestamps in the output file.\n", "in incorrect timestamps in the output file.\n",
max); max);
if(pkt->pts >= pkt->dts) if(pkt->pts >= pkt->dts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment