From patchwork Thu May 20 17:18:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Fabian 'Xaymar' Dirks X-Patchwork-Id: 27844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2640109iof; Thu, 20 May 2021 10:19:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWCyc7DJGegf9eHbspIQlNNZw2onVcAN3x7hqrcPW92TTBwrvrTyY4oJI2ZWLhFB2RPh5n X-Received: by 2002:a17:906:1dc5:: with SMTP id v5mr2910261ejh.212.1621531183123; Thu, 20 May 2021 10:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621531183; cv=none; d=google.com; s=arc-20160816; b=UJE4Mvfaf8GVsFHRHxlYFQdGADfsS+h4KCGxlv6a8OVZVcGrReTPZ64A6YnnCdwR88 HTrMHsyS/pbRD0PZbDQyp0PD7J5mKFEoUJGEFXk7MUR1hsxs2U0gCgHknrRaqhDLwpXi HuUpNdL+RtLXNDBBGg6fJyni7tDJXB4Ov/hdOj3GxYZQCqIoXV8TNsjkIBNkHnMJ5TF4 rvv+9VEOr0PaNN67+FCebE6asNrmbpufprYzaKr+aPAXx5eAbhubhTGLG+LJCumCq2Eg 5euIOMyvhkPZ2LlVljiM7D+2Ui11yAz23suR1lOUQbAMlOfpW6u5h6mA1AFLO7QYl3Pg M34g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=pMzmj+KNFiDZp9pPExi4udeetVd6EBdyxqKe1bTR710=; b=C64zfnDg/FKaWuxeff/5SjwioHeeBSMFRgFn/XdxkJQnkafjZIMdtN01eKzBtBJduB rdTfGwoQHYlRGBR/7eoycaUWTxu5I8VBbuJ7BQuQg4+3rvYlvDCa3/tGEIW9w7OnhWbY cjxJS3RprnOwAm6YtqYo6jOV628O3DJlAoMS7pKc131oROVBgxMUMWTc9YIZKDbtAoJ4 JrOCR8z1hZamY83SwBsWE4xq6CGZM60vk+NMtXV1x+Gxgq49W9WzQ/0uN8aGG3A7C8NG a6ceG6w/pmPLdiroCvbqY1gYq4XqNLVx2OsPr626OJepdJlsZxqKzTLDCkWNgzCgfRWh WAlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=mail header.b=tcCeVU8w; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c95si3382933edf.464.2021.05.20.10.19.42; Thu, 20 May 2021 10:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=mail header.b=tcCeVU8w; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A923C6881EE; Thu, 20 May 2021 20:19:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.xaymar.com (mail.xaymar.com [88.99.2.119]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E9356809C9 for ; Thu, 20 May 2021 20:19:31 +0300 (EEST) Received-SPF: Temperror (mailfrom) identity=mailfrom; client-ip=90.187.35.181; helo=localhost.localdomain; envelope-from=michael.dirks@xaymar.com; receiver= DKIM-Signature: v=1; a=rsa-sha256; c=simple/relaxed; d=xaymar.com; s=mail; t=1621531170; bh=/NxFLul/mLWfjA3LBr7SIRx1nGq7TH6zn57InG2H6aA=; h=From:To:Cc:Subject:Date:From; b=tcCeVU8wEa8nY470lkxzzf9FYUi9Xj7f+ksrf6VF/06fRisc0pyXu1h2yYAPADIc/ n9Tk4cJYSHsDygFK6K1tgp0dcBDYcLIx2C3iefbFnUcwqqL6NatxC5o7X+n2k8Xj74 j8FNJ07C/F5nwUMkk+Hr+d0/GGkJfPcuZuJowb53dlev9yRTB+QXSghc/7Ojsh7O5B PQc/DjnhwWzHlfpBCpYxrwAhZ7vTAkEayB807rd5NAYCj1TjQkyppAbHbL72wwt01Z IlrQNpiO1daY3NYM8LApTrlNFLIp9dOMjbDPENp1XOE+0n2Vlei/CdxHBw0/cP29FW DbPrZPC/pni6Q== Received: from localhost.localdomain (business-90-187-35-181.pool2.vodafone-ip.de [90.187.35.181]) by mail.xaymar.com (Postfix) with ESMTPSA id 574BAE085D; Thu, 20 May 2021 19:19:30 +0200 (CEST) From: michael.dirks@xaymar.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 May 2021 19:18:50 +0200 Message-Id: <20210520171850.1215-1-michael.dirks@xaymar.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Allow changing the time stamp precision via option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o439FxL6Yx/q From: Michael Fabian 'Xaymar' Dirks Adds "timestamp_precision" to the available option for Matroska/WebM muxing. The option enables users and developers to change the precision of the time stamps in the Matroska/WebM container up to 1 nanosecond, which can aid with the proper detection of constant and variable rate content. Work-around fix for: 259, 6406, 7927, 8909 and 9124. Signed-off-by: Michael Fabian 'Xaymar' Dirks --- doc/muxers.texi | 8 ++++++++ libavformat/matroskaenc.c | 28 ++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index e1c6ad0829..d9f7badae1 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1583,6 +1583,14 @@ bitmap is stored bottom-up. Note that this option does not flip the bitmap which has to be done manually beforehand, e.g. by using the vflip filter. Default is @var{false} and indicates bitmap is stored top down. +@item timestamp_precision +Sets the timestamp precision up to 1 nanosecond for Matroska/WebM, which can +improve detection of constant rate content in demuxers. Note that some poorly +implemented demuxers may require a timestamp precision of 1 millisecond, so +increasing it past that point may result in playback issues. Higher precision +also reduces the maximum possible timestamp significantly. +Default is @var{1/1000000000} (1 nanosecond). + @end table @anchor{md5} diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 186a25d920..bff8c8e7f2 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -20,6 +20,7 @@ */ #include +#include #include "av1.h" #include "avc.h" @@ -158,6 +159,8 @@ typedef struct MatroskaMuxContext { int default_mode; uint32_t segment_uid[4]; + + AVRational time_base; } MatroskaMuxContext; /** 2 bytes * 7 for EBML IDs, 7 1-byte EBML lengths, 6 1-byte uint, @@ -1814,6 +1817,7 @@ static int mkv_write_header(AVFormatContext *s) const AVDictionaryEntry *tag; int ret, i, version = 2; int64_t creation_time; + int64_t time_base = 1; if (mkv->mode != MODE_WEBM || av_dict_get(s->metadata, "stereo_mode", NULL, 0) || @@ -1850,7 +1854,10 @@ static int mkv_write_header(AVFormatContext *s) return ret; pb = mkv->info.bc; - put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000); + time_base = av_rescale_q(time_base, mkv->time_base, (AVRational){1, 1000000000}); + av_log(s, AV_LOG_DEBUG, "TimestampScale is: %" PRId64 " ns\n", time_base); + put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, time_base); + if ((tag = av_dict_get(s->metadata, "title", NULL, 0))) put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value); if (!(s->flags & AVFMT_FLAG_BITEXACT)) { @@ -1883,11 +1890,11 @@ static int mkv_write_header(AVFormatContext *s) int64_t metadata_duration = get_metadata_duration(s); if (s->duration > 0) { - int64_t scaledDuration = av_rescale(s->duration, 1000, AV_TIME_BASE); + int64_t scaledDuration = av_rescale_q(s->duration, AV_TIME_BASE_Q, mkv->time_base); put_ebml_float(pb, MATROSKA_ID_DURATION, scaledDuration); av_log(s, AV_LOG_DEBUG, "Write early duration from recording time = %" PRIu64 "\n", scaledDuration); } else if (metadata_duration > 0) { - int64_t scaledDuration = av_rescale(metadata_duration, 1000, AV_TIME_BASE); + int64_t scaledDuration = av_rescale_q(metadata_duration, AV_TIME_BASE_Q, mkv->time_base); put_ebml_float(pb, MATROSKA_ID_DURATION, scaledDuration); av_log(s, AV_LOG_DEBUG, "Write early duration from metadata = %" PRIu64 "\n", scaledDuration); } else if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { @@ -1948,12 +1955,12 @@ static int mkv_write_header(AVFormatContext *s) // after 4k and on a keyframe if (IS_SEEKABLE(pb, mkv)) { if (mkv->cluster_time_limit < 0) - mkv->cluster_time_limit = 5000; + mkv->cluster_time_limit = av_rescale_q(5000, (AVRational){1, 1000}, mkv->time_base); if (mkv->cluster_size_limit < 0) mkv->cluster_size_limit = 5 * 1024 * 1024; } else { if (mkv->cluster_time_limit < 0) - mkv->cluster_time_limit = 1000; + mkv->cluster_time_limit = av_rescale_q(1000, (AVRational){1, 1000}, mkv->time_base); if (mkv->cluster_size_limit < 0) mkv->cluster_size_limit = 32 * 1024; } @@ -2323,7 +2330,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) ret = mkv_end_cluster(s); if (ret < 0) return ret; - av_log(s, AV_LOG_WARNING, "Starting new cluster due to timestamp\n"); + av_log(s, AV_LOG_VERBOSE, "Starting new cluster as timestamp offset exceeds signed 16-bit integer range.\n"); } } @@ -2738,8 +2745,8 @@ static int mkv_init(struct AVFormatContext *s) track->uid = mkv_get_uid(mkv->tracks, i, &c); } - // ms precision is the de-facto standard timescale for mkv files - avpriv_set_pts_info(st, 64, 1, 1000); + // Use user-defined timescale. + avpriv_set_pts_info(st, 64, mkv->time_base.num, mkv->time_base.den); if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) { if (mkv->mode == MODE_WEBM) { @@ -2759,6 +2766,10 @@ static int mkv_init(struct AVFormatContext *s) track->track_num_size = ebml_num_size(track->track_num); } + // Scale the configured cluster_time_limit. + if (mkv->cluster_time_limit >= 0) + mkv->cluster_time_limit = av_rescale_q(mkv->cluster_time_limit, (AVRational){1, 1000}, mkv->time_base); + if (mkv->is_dash && nb_tracks != 1) return AVERROR(EINVAL); @@ -2826,6 +2837,7 @@ static const AVOption options[] = { { "infer", "For each track type, mark the first track of disposition default as default; if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER }, 0, 0, FLAGS, "default_mode" }, { "infer_no_subs", "For each track type, mark the first track of disposition default as default; for audio and video: if none exists, mark the first track as default.", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_INFER_NO_SUBS }, 0, 0, FLAGS, "default_mode" }, { "passthrough", "Use the disposition flag as-is", 0, AV_OPT_TYPE_CONST, { .i64 = DEFAULT_MODE_PASSTHROUGH }, 0, 0, FLAGS, "default_mode" }, + { "timestamp_precision", "Timestamp precision to use for the entire container", OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0.000000001 }, 0.000000001, DBL_MAX, FLAGS}, { NULL }, };