From patchwork Wed Sep 28 20:15:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 771 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp606909vsd; Wed, 28 Sep 2016 13:16:17 -0700 (PDT) X-Received: by 10.194.178.65 with SMTP id cw1mr29072797wjc.215.1475093777016; Wed, 28 Sep 2016 13:16:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id io8si4455314wjb.284.2016.09.28.13.16.14; Wed, 28 Sep 2016 13:16:16 -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; 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 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 DB17C689F49; Wed, 28 Sep 2016 23:15:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f67.google.com (mail-oi0-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45A0A689F13 for ; Wed, 28 Sep 2016 23:15:53 +0300 (EEST) Received: by mail-oi0-f67.google.com with SMTP id n202so3733173oig.2 for ; Wed, 28 Sep 2016 13:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=9eoKc2VgMZ5SW+5F0ToU/iE+t317ZQdiWOLIL66rNNE=; b=VuE7PeNfzVmFNU4GHEDUZKlIQBZY3jb04YYQxTW48ZbTpn7AcX0epc+oGc0oP5C6s/ NFn0PkwoIr7QPZkxUPc8aQgFSIqc6YaEzwFGCrLPgV6g1RbvNuQHHbWknXaUNDa76hdh ysRe7it9QowRZ3ykRlC28ePGZk7HZ9cvRX9kTMEnrMxcLJpOn+EGsPGLaK2pXUJuyXcJ xilZ0bE2qw+6guuD6Zo235Uemi8f/sSvCH+4XYPQuckwxRwHihDzwoYl1PJinIt7TBML UyyEqyYJ4VvhkCfbuSSJ9MFEcaTL56Fyvz9zQAA1O3Kt3GaS+WvuwsBDpHsme/hiTYHF r5YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=9eoKc2VgMZ5SW+5F0ToU/iE+t317ZQdiWOLIL66rNNE=; b=UjnPN8X50O9/XeKVDkSx94aLWarZtHCh40zR0gpb2qT0niiIZn3QE5VddG7/aVG9Ra LF6yfywXEZPVwr4ZbPiyw4j0dFKb6wLfuDBOYhF7UDHjkrZWcRxLtNHs+tLlEBGS2lw0 Hjbs01eo36LsX5TWL1OVRQ3GCA4vSgRq6b9Iu0NTh4RWmYhfMV8if5G7aScF9UGLyGcZ xQC1vD4HY4O7KQADq6qK6qE4khSZipW4xrqiRy9ui+fzj0lHRXwCOCKPgsOhUWE/X3Td NtS9/R5qbNJwuMWNle1tTeHCEmPTWajY9ErxJzN7lpFMzOO6ppHwWhiKkn2KduVTpZ2H sY3g== X-Gm-Message-State: AE9vXwN8tWyI/XVbCMFVdTs0EGLXyiIK05ymqqY2kkHVqXEEzM/v1SKM/G0/HL7y3AZVBg== X-Received: by 10.202.221.138 with SMTP id u132mr38537771oig.120.1475093763931; Wed, 28 Sep 2016 13:16:03 -0700 (PDT) Received: from localhost.localdomain ([181.22.0.151]) by smtp.gmail.com with ESMTPSA id p126sm2923245oic.15.2016.09.28.13.16.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Sep 2016 13:16:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2016 17:15:43 -0300 Message-Id: <20160928201543.8364-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] doc/codecs.texi: fix and expand color related options doxigen X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Found-by: Michael Niedermayer Signed-off-by: James Almer --- doc/codecs.texi | 73 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 10 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 48fc3bf..913e257 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -1049,7 +1049,31 @@ Possible values: @item rc_max_vbv_use @var{float} (@emph{encoding,video}) @item rc_min_vbv_use @var{float} (@emph{encoding,video}) @item ticks_per_frame @var{integer} (@emph{decoding/encoding,audio,video}) + @item color_primaries @var{integer} (@emph{decoding/encoding,video}) +Possible values: +@table @samp +@item bt709 +BT.709 +@item bt470m +BT.470 M +@item bt470bg +BT.470 BG +@item smpte170m +SMPTE 170 M +@item smpte240m +SMPTE 240 M +@item film +Film +@item bt2020 +BT.2020 +@item smpte428_1 +SMPTE ST 428-1 +@item smpte431 +SMPTE 431-2 +@item smpte432 +SMPTE 432-1 +@end table @item color_trc @var{integer} (@emph{decoding/encoding,video}) Possible values: @@ -1060,29 +1084,58 @@ BT.709 BT.470 M @item gamma28 BT.470 BG -@item linear +@item smpte170m SMPTE 170 M -@item log +@item smpte240m SMPTE 240 M -@item log_sqrt +@item linear Linear -@item iec61966_2_4 +@item log Log -@item bt1361 +@item log_sqrt Log square root -@item iec61966_2_1 +@item iec61966_2_4 IEC 61966-2-4 -@item bt2020_10bit +@item bt1361 BT.1361 -@item bt2020_12bit +@item iec61966_2_1 IEC 61966-2-1 -@item smpte2084 +@item bt2020_10bit BT.2020 - 10 bit -@item smpte428_1 +@item bt2020_12bit BT.2020 - 12 bit +@item smpte2084 +SMPTE ST 2084 +@item smpte428_1 +SMPTE ST 428-1 +@item arib-std-b67 +ARIB STD-B67 @end table @item colorspace @var{integer} (@emph{decoding/encoding,video}) +Possible values: +@table @samp +@item rgb +RGB +@item bt709 +BT.709 +@item fcc +FCC +@item bt470bg +BT.470 BG +@item smpte170m +SMPTE 170 M +@item smpte240m +SMPTE 240 M +@item ycocg +YCOCG +@item bt2020_ncl +BT.2020 NCL +@item bt2020_cl +BT.2020 CL +@item smpte2085 +SMPTE 2085 +@end table @item color_range @var{integer} (@emph{decoding/encoding,video}) If used as input parameter, it serves as a hint to the decoder, which