From patchwork Thu May 20 22:24:09 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: 27849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2841914iof; Thu, 20 May 2021 15:24:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCCS+UHzZ1J7oixBQ8MWqtL3MSZLZUwGCAUWqBhNKiDfXjzkQH5BqLt1W0L7Kp0UtfQasc X-Received: by 2002:a17:906:1c8b:: with SMTP id g11mr6981645ejh.158.1621549473584; Thu, 20 May 2021 15:24:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621549473; cv=none; d=google.com; s=arc-20160816; b=jHuB6M7yjeCzmQSWiYsCDFJqlkOYSSyFAAc5743QqCb0eIXbf4O72riFKSe05afxHv 7xspK9pRgQjqacv1W1uJd5X++Ty7+C44Wovzv7CJNrEtzcnqgK0lkyGgNFGwA0ZRjKt+ r1K/s+9ESKb9fn3Gi/uK4/X4xXqRgnFNyI3i4AT7k5JYJTKOOtffb3org+Vl0EXW6cZB VpUQqSeNcV6fQBh3ld4KXUXyjPwtlWA1fDAwgNF6v0AUe6nthUBxoqFPgDLoT0iMM/nl 2KviklHX52gp7MWtO7/K1nKKO3vcz4ImXEfMBiDfbiiKEf8JITh3aXLKYaVYdRP9S43f FA+g== 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=wfRUR0WQhwMEV52D6AwiZtj6J/NM/mSdSsyIDsJ2SSM=; b=iknr/IO/AqaryzUzQXcnQQj3fePEWcrJIT1fmynw6BzOxYFfR7pRNVoqTFOIDgL5TU GAXRFp1zzaDmCwhSQ0nbpvVUPSwCvG26mNBUoyecE+uu6DVBP4pSgznJ+QHWVdCvQ1mC FAC3aFtU0BeJCrIJsdNnJyho6AOVOJ/HCH7xS7ScemJwKH4XBftDXesEHX0QWCz+KB+K wKRp5iIYZM58PEm6nEgG/btwmTRv8fi0yIuiqxlPE9WyWLz7dMvJJIy9HMCJFKl2IebE mZum/CW+GX9BzikBLBNu7ZfCifxF+QIm1iuzR1UrofuNOE1Mx/iXJcTliP1q6AXqJgPK rsqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=mail header.b=PbWWJs67; 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 eb8si3912812edb.103.2021.05.20.15.24.33; Thu, 20 May 2021 15:24:33 -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=PbWWJs67; 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 75F7E68804B; Fri, 21 May 2021 01:24:30 +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 67E256804AA for ; Fri, 21 May 2021 01:24:23 +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=1621549463; bh=3W8jxwOQ1o+a6/ultnY+TrModFHs87r49nhHqqW1kCg=; h=From:To:Cc:Subject:Date:From; b=PbWWJs67WxRV1OU6POPrdWsSQnAFKo5Cu+6QPTG1PghJi2g9SHM9KmhX10dCF49kW 5FP+a3YF1gtp+GtQRfmHaOl7yLjIMNDdph0tKF1togiu7LmuZJuqpkdYVutcz2rPQp YV8xxi8/JpcYP7yzkA4tWPvDP64pgjMHbXmuvpNusa7SsLrDRZBTKMxuA3bTCJiUCy f2d0129AYxOvvCYAyMZiKw0UYYZs4mS0XBb2btm2rCdI95ee63IZmqJSL1p+nnsbSo Wfh2qko1196hQPy+HDl1GsAfA3YM+VtRnMyxQzpzZFp2MK6pna8WodB40HHFIe7FsL j7Q3TilrH+PhQ== Received: from localhost.localdomain (unknown [90.187.35.181]) by mail.xaymar.com (Postfix) with ESMTPSA id E978AE0079; Fri, 21 May 2021 00:24:22 +0200 (CEST) From: michael.dirks@xaymar.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 00:24:09 +0200 Message-Id: <20210520222409.1516-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: qlptEGeaHMgS 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 | 25 ++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index e1c6ad0829..8655be94ff 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/1000} (1 millisecond). + @end table @anchor{md5} diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 186a25d920..4a78b60b1f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -158,6 +158,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 +1816,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 +1853,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 +1889,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 +1954,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; } @@ -2738,8 +2744,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 +2765,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 +2836,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.001 }, 0.000000001, INT_MAX, FLAGS}, { NULL }, };