From patchwork Sat Aug 26 10:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43327 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:906:4f0f:b0:99c:ff93:59c5 with SMTP id t15csp877611eju; Sat, 26 Aug 2023 03:56:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+Ue18NCkvdpX/MnAKUTsYDaWt2u6v7Dc2dy6RD3TfNfV81LxmNHL7HhhKjiDKIv3VzQVw X-Received: by 2002:aa7:da53:0:b0:523:1ce9:1f49 with SMTP id w19-20020aa7da53000000b005231ce91f49mr12435743eds.42.1693047383126; Sat, 26 Aug 2023 03:56:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693047383; cv=none; d=google.com; s=arc-20160816; b=G23/Q2EncG9ehjiBq1hvv3D+72Ag+5tb+mHP9ZJKBaPlF58+UCMltFPTa3d3rzU7Ps U1rY+vJgYEXhn8isQgPgqyVi2EhWgAvnXHS1vFhz6hW/t+0oJ5lS5AlNogXOePUKuA6j AoEHJL/aHr4dqnx/GcGFcZUPG06lJMQG2uEKTw584ukMsuGYcPhRbe57AM+SZcTWP7p6 YStJJTN8mfIKVGXilj+id6VcdlTizFY8pWIYJPYJ9gV3OH/AOVlY2SELudZlORpbg/zW Ne7fY1yyYdi4p1zYsGOKP4b6Juc3m6sQ2zei4yn8/M+TKtY7wnTo342mM/nY17VrU+GT Mvcw== 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=CQRsl/mbhdX+JIkstaAfVimCpe/gT8W1pF7/8tzTmts=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=gdJQJV5eJQZKw7o4ACQLP1/DV0GI+2BpCVBJxyOrvJJmGrnQWWF1VG2LO4qakmttJ7 0lqymW0EmdkSEY8hnhm50n73aSayZBgwEZ8gMuTrD/5/+8PQL/CwoAeC6uL7uvaIuiYV ZqMCkguVY37TMyso4tkJJGW71FZVOcB9ydAoEybda4Moa96wJ7OtXHpaa5lUS74fA1ZE uovJSOSCb/rue5YwQibsrbp9ySeGfEMLOv83CdUMV6YxMpH7Cy5fjRaSGFKCJjL2BKpR W9hmPWFOGIyhoze3a/ZPhggVNBN9gmvAnKDL5wT2WRwB0nQfGOd4IIdIDHTi4cYo11fx JWAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=PkaSfu7Z; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j24-20020aa7ca58000000b0052328243d1csi112838edt.141.2023.08.26.03.56.22; Sat, 26 Aug 2023 03:56:23 -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=@gmail.com header.s=20221208 header.b=PkaSfu7Z; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4427A68C60A; Sat, 26 Aug 2023 13:56:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D29D68BD6B for ; Sat, 26 Aug 2023 13:56:14 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3fef56f7248so15213635e9.3 for ; Sat, 26 Aug 2023 03:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693047373; x=1693652173; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=X8qmEefIpWALGT5sjB7QGyYn2bwjuWWu9D26+4QDrlY=; b=PkaSfu7Zq2PtbiHYJaiueCbevx/s1MmSQQgxwi2rgyp2b08XuV5k/CbV0Sse2UaSum TUACAJS+ehWyjwjpjS/XHEptVxNIhSrVjI3uUAJEennBwDzOYuBLzUQMybmbG9Nz7eZt kMXnActSySoZYVK0SFRx/loFlrjdnPemgkPY3IBQ/ByV2+9BwwliZzHDN/gpXVTjEEtD UNuqaIoZFzGjD6ugYoc9NKlgueCgEim5F2/NFxur5gEAtThg8Czdlf45HgnFtL9lLQHc mw6VYV9BExCOXEEfPy/fU5qkalILsOOsM/GXcx9EDdVe1Y190SlNgMUul2Dy5gRy3aCo a31w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693047373; x=1693652173; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X8qmEefIpWALGT5sjB7QGyYn2bwjuWWu9D26+4QDrlY=; b=OJtmeNd9uxxmMFdcMrOmdEvSEDZm9T3iDtBRS3/dmT1s7VvYUKoQfq/94op8ZH+pQ7 k94dcsDf6gbDXgnYSz0djAjqdlVISD4amfhhK0VTlOO04e3+k82Jr17QFDkfT34tOO8Q Ftggyjd6U25r5iQ1aEI6SXao+3H0Mql6SUIPfMKwuz2pzLZQFl79g9z7gWGt+fVs5hCn qBTmaDaGLYP23OsdHikILh7fH4ncJkADx3kh6bHkiHR/6OsuqEYyNn1jp60fAzmJzSM9 WGNsFYkqh2fedTkfFIAvdG+no7Ap55rSs788PYbJefeEPoHJLmmBh395NgIG7LGpkpG4 lvAQ== X-Gm-Message-State: AOJu0YxI09jyq8QPTEgSeVBQaKme8uFVNMnlhx4opdzy6OLftCstkzls WcalelEeK9tSMNlt1kk2qhm3E98lUsI= X-Received: by 2002:a7b:c3c2:0:b0:3fe:10d8:e7f3 with SMTP id t2-20020a7bc3c2000000b003fe10d8e7f3mr16516320wmj.32.1693047372656; Sat, 26 Aug 2023 03:56:12 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id c26-20020a05600c0ada00b003feee8d4b92sm4614604wmr.47.2023.08.26.03.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Aug 2023 03:56:11 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id C6585BFCDA; Sat, 26 Aug 2023 12:56:10 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Sat, 26 Aug 2023 12:56:10 +0200 Message-Id: <20230826105610.85148-1-stefasab@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] doc/encoders/libxvid: fix references for me_quality 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XkZ+6QzTmMvz Drop reference to constants removed in 94eed68ace9f2416af8. In particular, rename me_method to me_quality and add description for supported values. Address trac issue: http://trac.ffmpeg.org/ticket/10003 --- doc/encoders.texi | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 14c69fc7b3..25c40a6486 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2981,27 +2981,24 @@ Place global headers in extradata instead of every keyframe. @item trellis -@item me_method -Set motion estimation method. Possible values in decreasing order of +@item me_quality +Set motion estimation quality level. Possible values in decreasing order of speed and increasing order of quality: @table @samp -@item zero +@item 0 Use no motion estimation (default). -@item phods -@item x1 -@item log +@item 1, 2 Enable advanced diamond zonal search for 16x16 blocks and half-pixel -refinement for 16x16 blocks. @samp{x1} and @samp{log} are aliases for -@samp{phods}. +refinement for 16x16 blocks. -@item epzs +@item 3, 4 Enable all of the things described above, plus advanced diamond zonal -search for 8x8 blocks, half-pixel refinement for 8x8 blocks, and motion -estimation on chroma planes. +search for 8x8 blocks and half-pixel refinement for 8x8 blocks, also +enable motion estimation on chrom planes for P and B-frames. -@item full +@item 5, 6 Enable all of the things described above, plus extended 16x16 and 8x8 blocks search. @end table