From patchwork Wed Jan 4 16:42:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39868 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8942203pzb; Wed, 4 Jan 2023 08:46:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXvx4H0/DZIHzgfdOMYHwk2p34nEeUqe0TV1uJT6m6vjOVWzJKY/dFhzh/AE9HegdUOam0NN X-Received: by 2002:aa7:c516:0:b0:485:48ed:b1f3 with SMTP id o22-20020aa7c516000000b0048548edb1f3mr28971905edq.26.1672850767013; Wed, 04 Jan 2023 08:46:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672850767; cv=none; d=google.com; s=arc-20160816; b=IrHbLMl/97yWLGzOBZlflY8y+GRfeWy7mzFwoTjWA0RG1Fs+9KLqQw4ofKpx+WdChC R2Ismp7Epw/y4luZBY3RRr7fgJlZWu5+GMnjMSuBv7F1rpb0B+Lwa0Aix55KWnhbhyDF zc+wycAVHdqYBWzAlPZHwMf+34i7RMyjgmcMgN+X2PzjF1aTtoCGkEN4aQg7GSvF9PE+ 03ydgEUWAXoAKH0uZPCth81YfjZYctMrGdDbjUrZm+YX4JtHAOmDYoT3Q9QsErWM11Qd Az/8LsWn+Bii3oWgOuFj3AsInccpe9a1CAy1gX2Wzq2wvQUqgThVq+cHqY5Cso7y2/UX ordg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Y8tTvgBplSG41FuOZDuzikSTXvRMmcJLkX0bvZfqOHM=; b=P/sWV/dpQWCn2G2yy48dQn6bTU2Wpdu2JC9mkUY4j9SK+nnn8TGb2tjXHrHyH+bI/p wCuKfR+IFXb6FCR/3OEoh6gr3iYFdoss7OaxqcF+OvtjKeKPsaFJa8b0uDO1TfHN1D81 aehCwvdu9JDl7YlEKP35AkwcFFWBtD4N3dsNCRIwjZ5ST/n3EfUu2Iol0UNFAeDH6NyW UD7Ba+2R407YbzeMzuyeA7FPXC+Z4UNSAS//psiYRdmQZxwg3jbL6E0rwmkLVYqdEUC9 bgemubMkl62KBC3B5WREGFXKVB3lpjiPxnko58lCXbMVKOot8/LQd3gSnNel1EIThSwL 0XXQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y11-20020a056402440b00b0048ea26ce021si8231588eda.68.2023.01.04.08.46.06; Wed, 04 Jan 2023 08:46:06 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36EA968BD07; Wed, 4 Jan 2023 18:45:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1ACA568BCE0 for ; Wed, 4 Jan 2023 18:45:22 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 933D2240499 for ; Wed, 4 Jan 2023 17:45:21 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 6PVPvOuHP6Wp for ; Wed, 4 Jan 2023 17:45:21 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 9BF8D2405F9 for ; Wed, 4 Jan 2023 17:45:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C0CA93A03D9 for ; Wed, 4 Jan 2023 17:45:10 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2023 17:42:45 +0100 Message-Id: <20230104164246.6133-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230104164246.6133-1-anton@khirnov.net> References: <20230104164246.6133-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] doc/ffmpeg: improve -r documentation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CJ5k3ih+AohA Explain different behavior for encoding and streamcopy. --- doc/ffmpeg.texi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 65634b82cf..67b3294256 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -877,9 +877,20 @@ This is not the same as the @option{-framerate} option used for some input forma like image2 or v4l2 (it used to be the same in older versions of FFmpeg). If in doubt use @option{-framerate} instead of the input option @option{-r}. -As an output option, duplicate or drop input frames to achieve constant output +As an output option: +@table @option +@item video encoding +Duplicate or drop frames right before encoding them to achieve constant output frame rate @var{fps}. +@item video streamcopy +Indicate to the muxer that @var{fps} is the stream frame rate. No data is +dropped or duplicated in this case. This may produce invalid files if @var{fps} +does not match the actual stream frame rate as determined by packet timestamps. +See also the @code{setts} bitstream filter. + +@end table + @item -fpsmax[:@var{stream_specifier}] @var{fps} (@emph{output,per-stream}) Set maximum frame rate (Hz value, fraction or abbreviation).