Index: trunk/doc/software-manual.tex
===================================================================
--- trunk/doc/software-manual.tex	(revision 964)
+++ trunk/doc/software-manual.tex	(revision 1313)
@@ -67,4 +67,70 @@
 }
 
+\newenvironment{OptionTableNoShorthand}[2]{%
+	\footnotesize
+	\def\arraystretch{1.8}
+	\clearOptions
+	\begin{longtable}{l<{\makecell[tl]{\optOption}}%
+	                  c<{\makecell[tc]{\optDefault}}%
+	                  >{\def\arraystretch{1.0}}p{0.5\textwidth}<{\clearOptions}}
+	\caption{#1} \label{#2} \\
+	\hspace*{12em}&\hspace*{8em}&\kill
+	\hline
+	 \thead{Option} &
+	 \thead{Default} &
+	 \thead{Description} \\
+	\hline
+	\endfirsthead
+	\caption[]{#1 (Continued)} \\
+	\hspace*{12em}&\hspace*{8em}&\kill
+	\hline
+	 \thead{Option} &
+	 \thead{Default} &
+	 \thead{Description} \\
+	\hline
+	\endhead
+	 \multicolumn{3}{r}{Continued...}\\
+	 \hline
+	\endfoot
+	 \hline
+	\endlastfoot
+}{%
+	\hline
+	\end{longtable}
+}
+
+\newenvironment{SEIListTable}[1]{%
+	\footnotesize
+	\def\arraystretch{1.8}
+	\clearOptions
+	\begin{longtable}{c<{\makecell[tl]{\optOption}}%
+	                  l<{\makecell[tc]{\optDefault}}%
+	                  >{\def\arraystretch{1.0}}p{0.3\textwidth}<{\clearOptions}}
+	\caption{#1} \\
+	\hspace*{12em}&\hspace*{8em}&\kill
+	\hline
+	 \thead{SEI Number} &
+	 \thead{SEI Name} &
+	 \thead{Table number of encoder controls, if available} \\
+	\hline
+	\endfirsthead
+	\caption[]{#1 (Continued)} \\
+	\hspace*{12em}&\hspace*{8em}&\kill
+	\hline
+	 \thead{SEI Number} &
+	 \thead{SEI Name} &
+	 \thead{Table number of encoder controls, if available} \\
+	\hline
+	\endhead
+	 \multicolumn{3}{r}{Continued...}\\
+	 \hline
+	\endfoot
+	 \hline
+	\endlastfoot
+}{%
+	\hline
+	\end{longtable}
+}
+
 \newenvironment{MacroTable}[1]{%
 	\footnotesize
@@ -104,4 +170,7 @@
 	\email{dflynn@blackberry.com}
 	\and
+  Karl Sharman
+	\email{karl.sharman@eu.sony.com}
+	\and
 	Karsten S\"uhring
 	\email{karsten.suehring@hhi.fraunhofer.de}
@@ -118,5 +187,5 @@
 \begin{abstract}
 This document is a user manual describing usage of reference software
-for the HEVC project. It applies to version 14.0
+for the HEVC project. It applies to version 16.6
 of the software.
 \end{abstract}
@@ -125,7 +194,9 @@
 \listoftables
 
+
+
 \section{General Information}
 Reference software is being made available to provide a reference
-implementation of the draft HEVC standard being developed by the Joint
+implementation of the HEVC standard being developed by the Joint
 Collaborative Team on Video Coding (JCT-VC) regrouping experts from
 ITU-T SG 16 and ISO/IEC SC29 WG11. One of the main goals of the
@@ -172,4 +243,5 @@
 MS Visual Studio 8   & build/HM_vc8.sln \\
 MS Visual Studio 9   & build/HM_vc9.sln \\
+MS Visual Studio 10  & build/HM_vc10.sln \\
 Xcode                & HM.xcodeproj \\
 Linux                & build/linux/makefile \\
@@ -186,5 +258,5 @@
 \section{Using the encoder}
 \begin{verbatim}
-TAppEncoder 	[-h] [-c config.cfg] [--parameter=value]
+TAppEncoder 	[--help] [-c config.cfg] [--parameter=value]
 \end{verbatim}
 
@@ -197,5 +269,5 @@
  \thead{Description} \\
 \hline
-\texttt{-h} & Prints parameter usage. \\
+\texttt{--help} & Prints parameter usage. \\
 \texttt{-c} & Defines configuration file to use.  Multiple configuration files
      may be used with repeated --c options. \\
@@ -203,5 +275,6 @@
     & Assigns value to a given parameter as further described below.
       Some parameters are also supported by shorthand
-      "--\em{opt}~\emph{value}".\\
+      "--\em{opt}~\emph{value}". These are shown in brackets after the parameter
+      name in the tables of this document\\
 \hline
 \end{tabular}
@@ -209,4 +282,8 @@
 
 Sample configuration files are provided in the cfg/ folder.
+Parameters are defined by the last value encountered on the command line.
+Therefore if a setting is set via a configuration file, and then a subsequent
+command line parameter changes that same setting, the command line parameter
+value will be used.
 
 \subsection{GOP structure table}
@@ -220,6 +297,6 @@
 includes pictures that are used for reference for the current
 picture as well as pictures that will be used for reference in
-the future. The encoder will not automatically calculate what
-pictures that has to be kept for future references, they have to
+the future. The encoder will not automatically calculate which
+pictures have to be kept for future references, they must
 be specified. Note that some specified reference frames for
 pictures encoded in the very first GOP after an IDR frame might
@@ -450,11 +527,13 @@
 %% File, I/O and source parameters
 %%
-\begin{OptionTable}{File, I/O and source parameters}
-\Option{InputFile} &
-\ShortOption{-i} &
+Shorthand alternatives for the parameter that can be used on the command line are shown in brackets after the parameter name.
+
+\begin{OptionTableNoShorthand}{File, I/O and source parameters.}{tab:fileIO}
+\Option{InputFile (-i)} &
+%\ShortOption{-i} &
 \Default{\NotSet} &
 Specifies the input video file.
 
-Video data must be in a raw 4:2:0 planar format (Y$'$CbCr).
+Video data must be in a raw 4:2:0, or 4:2:2 planar format, 4:4:4 planar format (Y$'$CbCr, RGB or GBR), or in a raw 4:0:0 format. 
 
 Note: When the bit depth of samples is larger than 8, each sample is encoded in
@@ -462,20 +541,20 @@
 \\
 
-\Option{BitstreamFile} &
-\ShortOption{-b} &
+\Option{BitstreamFile (-b)} &
+%\ShortOption{-b} &
 \Default{\NotSet} &
 Specifies the output coded bit stream file.
 \\
 
-\Option{ReconFile} &
-\ShortOption{-o} &
+\Option{ReconFile (-o)} &
+%\ShortOption{-o} &
 \Default{\NotSet} &
 Specifies the output locally reconstructed video file.
 \\
 
-\Option{SourceWidth}%
-\Option{SourceHeight} &
-\ShortOption{-wdt}%
-\ShortOption{-hgt} &
+\Option{SourceWidth (-wdt)}%
+\Option{SourceHeight (-hgt)} &
+%\ShortOption{-wdt}%
+%\ShortOption{-hgt} &
 \Default{0}%
 \Default{0} &
@@ -483,14 +562,24 @@
 \\
 
-\Option{InputBitDepth} &
-\ShortOption{\None} &
+\Option{InputBitDepth}
+ &
+%\ShortOption{\None} &
 \Default{8} &
 Specifies the bit depth of the input video.
 \\
 
+\Option{MSBExtendedBitDepth} &
+%\ShortOption{\None} &
+\Default{0} &
+Extends the input video by adding MSBs of value 0. When 0, no extension is applied and the InputBitDepth is used.
+
+The MSBExtendedBitDepth becomes the effective file InputBitDepth for subsequent processing.
+\\
+
 \Option{InternalBitDepth} &
-\ShortOption{\None} &
-\Default{0 \\ (InputBitDepth)} &
-Specifies the bit depth used for coding.
+%\ShortOption{\None} &
+\Default{0} &
+Specifies the bit depth used for coding. When 0, the setting defaults to the
+value of the MSBExtendedBitDepth.
 
 If the input video is a different bit depth to InternalBitDepth, it is
@@ -499,70 +588,155 @@
 \left\lfloor
  \frac{\mathrm{Pel} * 2^{\mathrm{InternalBitDepth}}}{
-     2^{\mathrm{InputBitDepth}}}
+     2^{\mathrm{MSBExtendedBitDepth}}}
 \right\rfloor
 \end{displaymath}
 
 Note: The effect of this option is as if the input video is externally
-converted to the InternalBitDepth and then coded with this value as
-InputBitDepth.  The codec has no notion of two different bit depths.
+converted to the MSBExtendedBitDepth and then to the InternalBitDepth
+and then coded with this value as InputBitDepth. The codec has no
+notion of different bit depths.
 \\
 
 \Option{OutputBitDepth} &
-\ShortOption{\None} &
-\Default{0 \\ (InternalBitDepth)} &
+%\ShortOption{\None} &
+\Default{0} &
 Specifies the bit depth of the output locally reconstructed video file.
-
+When 0, the setting defaults to the value of InternalBitDepth.
 Note: This option has no effect on the decoding process.
 \\
 
 \Option{InputBitDepthC}%
+\Option{MSBExtendedBitDepthC}%
 \Option{InternalBitDepthC}%
 \Option{OutputBitDepthC} &
-\ShortOption{\None} &
-\Default{(InputBitDepth)}%
-\Default{(InternalBitDepth)}%
-\Default{(InternalBitDepthC)} &
+%\ShortOption{\None} &
+\Default{0}%
+\Default{0}%
+\Default{0}%
+\Default{0} &
 Specifies the various bit-depths for chroma components.  These only need
 to be specified if non-equal luma and chroma bit-depth processing is
-required.
-\\
-
-\Option{ConformanceMode} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies the conformance mode (cropping/padding parameters) to be applied to the input
-video. The following modes are available:
-\par
-\begin{tabular}{cp{0.45\textwidth}}
+required. When 0, the setting defaults to the corresponding non-Chroma value.
+\\
+
+\Option{InputColourSpaceConvert} &
+%\ShortOption{\None} &
+\Default{\NotSet} &
+The colour space conversion to apply to input video. Permitted values are:
+\par
+\begin{tabular}{lp{0.3\textwidth}}
+  UNCHANGED & No colour space conversion is applied \\
+  YCbCrToYCrCb & Swap the second and third components \\
+  YCbCrtoYYY & Set the second and third components to the values in the first \\
+  RGBtoGBR & Reorder the three components \\
+\end{tabular}
+\par
+If no value is specified, no colour space conversion is applied. The list may eventually also include RGB to YCbCr or YCgCo conversions.
+\\
+
+\Option{SNRInternalColourSpace} &
+%\ShortOption{\None} &
+\Default{false} &
+When this is set true, then no colour space conversion is applied prior to PSNR calculation, otherwise the inverse of InputColourSpaceConvert is applied.
+\\
+
+\Option{OutputInternalColourSpace} &
+%\ShortOption{\None} &
+\Default{false} &
+When this is set true, then no colour space conversion is applied to the reconstructed video, otherwise the inverse of InputColourSpaceConvert is applied.
+\\
+
+\Option{InputChromaFormat} &
+%\ShortOption{\None} &
+\Default{420} &
+Specifies the chroma format used in the input file. Permitted values (depending on the profile) are 400, 420, 422 or 444.
+\\
+
+\Option{ChromaFormatIDC (-cf)} &
+%\ShortOption{-cf} &
+\Default{0} &
+Specifies the chroma format to use for processing. Permitted values (depending on the profile) are 400, 420, 422 or 444; the value of 0 indicates that the value of InputChromaFormat should be used instead.
+\\
+
+\Option{MSEBasedSequencePSNR} &
+%\ShortOption{\None} &
+\Default{false} &
+When 0, the PSNR output is a linear average of the frame PSNRs; when 1, additional PSNRs are output which are formed from the average MSE of all the frames. The latter is useful when coding near-losslessly, where occasional frames become lossless.
+\\
+
+\Option{PrintFrameMSE} &
+%\ShortOption{\None} &
+\Default{false} &
+When 1, the Mean Square Error (MSE) values of each frame will also be output alongside the default PSNR values.
+\\
+
+\Option{PrintSequenceMSE} &
+%\ShortOption{\None} &
+\Default{false} &
+When 1, the Mean Square Error (MSE) values of the entire sequence will also be output alongside the default PSNR values.
+\\
+
+\Option{SummaryOutFilename} &
+%\ShortOption{\None} &
+\Default{false} &
+Filename to use for producing summary output file. If empty, do not produce a file.
+\\
+
+\Option{SummaryPicFilenameBase} &
+%\ShortOption{\None} &
+\Default{false} &
+Base filename to use for producing summary picture output files. The actual filenames used will have I.txt, P.txt and B.txt appended. If empty, do not produce a file.
+\\
+
+\Option{SummaryVerboseness} &
+%\ShortOption{\None} &
+\Default{false} &
+Specifies the level of the verboseness of the text output.
+\\
+
+\Option{CabacZeroWordPaddingEnabled} &
+%\ShortOption{\None} &
+\Default{false} &
+When 1, CABAC zero word padding will be enabled. This is currently not the default value for the setting.
+\\
+
+\Option{ConformanceWindowMode} &
+%\ShortOption{\None} &
+\Default{0} &
+Specifies how the parameters related to the conformance window are interpreted (cropping/padding).
+The following modes are available:
+\par
+\begin{tabular}{cp{0.43\textwidth}}
 0 & No cropping / padding \\
 1 & Automatic padding to the next minimum CU size \\
 2 & Padding according to parameters HorizontalPadding and VerticalPadding \\
-3 & Cropping according to parameters ConfLeft, ConfRight, ConfTop and ConfBottom \\
-\end{tabular}
-\\
-
-\Option{HorizontalPadding}%
-\Option{VerticalPadding} &
-\ShortOption{-pdx}%
-\ShortOption{-pdy} &
+3 & Cropping according to parameters ConfWinLeft, ConfWinRight, ConfWinTop and ConfWinBottom \\
+\end{tabular}
+\\
+
+\Option{HorizontalPadding (-pdx)}%
+\Option{VerticalPadding (-pdy)} &
+%\ShortOption{-pdx}%
+%\ShortOption{-pdy} &
 \Default{0} &
 Specifies the horizontal and vertical padding to be applied to the input
-video in luma samples.  Must be a multiple of the chroma resolution
-(e.g. a multiple of two for 4:2:0).
-\\
-
-\Option{ConfLeft}%
-\Option{ConfRight}%
-\Option{ConfTop}%
-\Option{ConfBottom} &
-\ShortOption{\None} &
+video in luma samples when ConformanceWindowMode is 2.  Must be a multiple of
+the chroma resolution (e.g. a multiple of two for 4:2:0).
+\\
+
+\Option{ConfWinLeft}%
+\Option{ConfWinRight}%
+\Option{ConfWinTop}%
+\Option{ConfWinBottom} &
+%\ShortOption{\None} &
 \Default{0} &
 Specifies the horizontal and vertical cropping to be applied to the
-input video in luma samples.  Must be a multiple of the chroma
-resolution (e.g. a multiple of two for 4:2:0).
-\\
-
-\Option{FrameRate} &
-\ShortOption{-fr} &
+input video in luma samples when ConformanceWindowMode is 3. 
+Must be a multiple of the chroma resolution (e.g. a multiple of
+two for 4:2:0).
+\\
+
+\Option{FrameRate (-fr)} &
+%\ShortOption{-fr} &
 \Default{0} &
 Specifies the frame rate of the input video.
@@ -571,54 +745,127 @@
 \\
 
-\Option{FrameSkip} &
-\ShortOption{-fs} &
+\Option{FrameSkip (-fs)} &
+%\ShortOption{-fs} &
 \Default{0} &
 Specifies a number of frames to skip at beginning of input video file.
 \\
 
-\Option{FramesToBeEncoded} &
-\ShortOption{-f} &
-\Default{0 \\ (all)} &
-Specifies the number of frames to be encoded.
-\\
-\end{OptionTable}
+\Option{FramesToBeEncoded (-f)} &
+%\ShortOption{-f} &
+\Default{0} &
+Specifies the number of frames to be encoded. When 0, all frames are coded.
+\\
+
+\Option{FieldCoding} &
+%\ShortOption{\None} &
+\Default{false} &
+When 1, indicates that field-based coding is to be applied.
+\\
+
+\Option{TopFieldFirst (-Tff)} &
+%\ShortOption{\None} &
+\Default{0} &
+Indicates the order of the fields packed into the input frame. When 1, the top field is temporally first.
+\\
+
+\Option{ClipInputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip input video to the Rec. 709 Range on loading when InternalBitDepth is less than MSBExtendedBitDepth.
+\\
+
+\Option{ClipOutputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip output video to the Rec. 709 Range on saving when OutputBitDepth is less than InternalBitDepth.
+\\
+
+\Option{EfficientFieldIRAPEnabled} &
+%\ShortOption{\None} &
+\Default{1} &
+Enable to code fields in a specific, potentially more efficient, order.
+\\
+
+\Option{HarmonizeGopFirstFieldCoupleEnabled} &
+%\ShortOption{\None} &
+\Default{1} &
+Enables harmonization of Gop first field couple.
+\\
+
+\end{OptionTableNoShorthand}
 
 %%
 %% profile, level and conformance options
 %%
-\begin{OptionTable}{Profile and level parameters}
+\begin{OptionTableNoShorthand}{Profile and level parameters}{tab:profile}
 \Option{Profile} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{none} &
 Specifies the profile to which the encoded bitstream complies.
-Valid values are: none, main, main10, main-still-picture.
+
+Valid HEVC Ver. 1 values are: none, main, main10, main-still-picture
+
+Valid HEVC Ver. 2 (RExt) values are: main-RExt, high-throughput-RExt,
+monochrome, monochrome12, monochrome16, main12, main_422_10,
+main_422_12, main_444, main_444_10, main_444_12, main_444_16,
+main_intra, main_10_intra, main_12_intra, main_422_10_intra, main_422_12_intra,
+main_444_intra, main_444_10_intra, main_444_12_intra, main_444_16_intra.
+
+When main-RExt is specified, the constraint flags are either manually specified, or calculated via the other supplied settings.
 
 Compatibility flags are automatically determined according to the profile.
-If --Profile=main, then main10 will always be signalled as compatible.
-If --Profile=main10, then main will be signalled as compatible if the bit-depth is 8-bit.
-
-NB: There is currently no validation that the encoder configuration complies with the profile and level constraints.
+NB: There is currently only limited validation that the encoder configuration complies with the profile, level and tier constraints.
 \\
 
 \Option{Level} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{none} &
 Specifies the level to which the encoded bitstream complies.
-Valid values are: none, 1, 2, 2.1, 3, 3.1, 4, 4.1, 5, 5.1, 5.2, 6, 6.1, 6.2.
-
-NB: There is currently no validation that the encoder configuration complies with the profile and level constraints.
+Valid values are: none, 1, 2, 2.1, 3, 3.1, 4, 4.1, 5, 5.1, 5.2, 6, 6.1, 6.2, 8.5
+
+NB: There is currently only limited validation that the encoder configuration complies with the profile, level and tier constraints.
 \\
 
 \Option{Tier} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{main} &
 Specifies the level tier to which the encoded bitsream complies.
 Valid values are: main, high.
 
-NB: There is currently no validation that the encoder configuration complies with the profile and level constraints.
+NB: There is currently only limited validation that the encoder configuration complies with the profile, level and tier constraints.
+\\
+
+\Option{MaxBitDepthConstraint} &
+%\ShortOption{\None} &
+\Default{0} &
+For --profile=main-RExt, specifies the value to use to derive the general_max_bit_depth constraint flags for RExt profiles; when 0, use $\max(InternalBitDepth, InternalBitDepthC)$
+\\
+
+\Option{MaxChromaFormatConstraint} &
+%\ShortOption{\None} &
+\Default{0} &
+For --profile=main-RExt, specifies the chroma-format to use for the general profile constraints for RExt profiles; when 0, use the value of ChromaFormatIDC.
+\\
+
+\Option{IntraConstraintFlag} &
+%\ShortOption{\None} &
+\Default{false} &
+For --profile=main-RExt, specifies the value of general_intra_constraint_flag to use for RExt profiles.
+\\
+
+\Option{OnePictureOnlyConstraintFlag} &
+%\ShortOption{\None} &
+\Default{false} &
+For --profile=main-RExt, specifies the value of general_one_picture_only_constraint_flag to use for RExt profiles.
+\\
+
+\Option{LowerBitRateConstraintFlag} &
+%\ShortOption{\None} &
+\Default{true} &
+Specifies the value of general_lower_bit_constraint_flag to use for RExt profiles.
 \\
 
 \Option{ProgressiveSource} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Specifies the value of general_progressive_source_flag
@@ -626,5 +873,5 @@
 
 \Option{InterlacedSource} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Specifies the value of general_interlaced_source_flag 
@@ -632,5 +879,5 @@
 
 \Option{NonPackedSource} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Specifies the value of general_non_packed_constraint_flag
@@ -638,10 +885,10 @@
 
 \Option{FrameOnly} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Specifies the value of general_frame_only_constraint_flag
 \\
 
-\end{OptionTable}
+\end{OptionTableNoShorthand}
 
 
@@ -649,7 +896,8 @@
 %% Unit definition parameters
 %%
-\begin{OptionTable}{Unit definition parameters}
+
+\begin{OptionTableNoShorthand}{Unit definition parameters}{tab:unit}
 \Option{MaxCUWidth} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{64} &
 Defines the maximum CU width.
@@ -657,17 +905,17 @@
 
 \Option{MaxCUHeight} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{64} &
 Defines the maximum CU height.
 \\
 
-\Option{MaxCUSize} &
-\ShortOption{\None} &
+\Option{MaxCUSize (-s)} &
+%\ShortOption{\None} &
 \Default{64} &
 Defines the maximum CU size.
 \\
 
-\Option{MaxPartitionDepth} &
-\ShortOption{-h} &
+\Option{MaxPartitionDepth (-h)} &
+%\ShortOption{-h} &
 \Default{4} &
 Defines the depth of the CU tree.
@@ -675,5 +923,5 @@
 
 \Option{QuadtreeTULog2MaxSize} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{6 \\ ($= \mathrm{log}_2(64)$)} &
 Defines the Maximum TU size in logarithm base 2.
@@ -681,5 +929,5 @@
 
 \Option{QuadtreeTULog2MinSize} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{2 \\ ($= \mathrm{log}_2(4)$)} &
 Defines the Minimum TU size in logarithm base 2.
@@ -687,5 +935,5 @@
 
 \Option{QuadtreeTUMaxDepthIntra} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{1} &
 Defines the depth of the TU tree for intra CUs.
@@ -693,9 +941,10 @@
 
 \Option{QuadtreeTUMaxDepthInter} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{2} &
 Defines the depth of the TU tree for inter CUs.
 \\
-\end{OptionTable}
+
+\end{OptionTableNoShorthand}
 
 
@@ -703,7 +952,8 @@
 %% Coding structure parameters
 %%
-\begin{OptionTable}{Coding structure parameters}
-\Option{IntraPeriod} &
-\ShortOption{-ip} &
+
+\begin{OptionTableNoShorthand}{Coding structure parameters}{tab:coding-structure}
+\Option{IntraPeriod (-ip)} &
+%\ShortOption{-ip} &
 \Default{$-1$} &
 Specifies the intra frame period.
@@ -711,6 +961,6 @@
 \\
 
-\Option{DecodingRefreshType} &
-\ShortOption{-dr} &
+\Option{DecodingRefreshType (-dr)} &
+%\ShortOption{-dr} &
 \Default{0} &
 Specifies the type of decoding refresh to apply at the intra frame period
@@ -718,12 +968,13 @@
 \par
 \begin{tabular}{cp{0.45\textwidth}}
-0 & Applies an I picture (not a clean random access point). \\
-1 & Applies a non-IDR clean random access point (open GOP). \\
-2 & Applies an IDR random access point (closed GOP). \\
-\end{tabular}
-\\
-
-\Option{GOPSize} &
-\ShortOption{-g} &
+0 & Applies an I picture (not a intra random access point). \\
+1 & Applies a CRA intra random access point (open GOP). \\
+2 & Applies an IDR intra random access point (closed GOP). \\
+3 & Use recovery point SEI messages to indicate random access. \\
+\end{tabular}
+\\
+
+\Option{GOPSize (-g)} &
+%\ShortOption{-g} &
 \Default{1} &
 Specifies the size of the cyclic GOP structure.
@@ -731,5 +982,5 @@
 
 \Option{Frame\emph{N}} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{\NotSet} &
 Multiple options that define the cyclic GOP structure that will be used
@@ -739,30 +990,14 @@
 See section~\ref{sec:gop-structure} for further details.
 \\
-
-\Option{ListCombination} &
-\ShortOption{-lc} &
-\Default{true} &
-Enables or disables the use of the combined reference list for uni-prediction
-in B-slices.
-\par
-\begin{tabular}{cp{0.45\textwidth}}
-  0 & Reference list~0 and reference list~1 are identical and reference
-      list~0 is used as the combined reference list. \\
-  1 & The combined reference list is derived from reference list~0 and
-      reference list~1. \\
-\end{tabular}
-NB: LComb can only be 0 in low delay coding (more precisely, when list 0
-and list 1 are the same)
-\\
-\end{OptionTable}
-
+\end{OptionTableNoShorthand}
 
 %%
 %% Motion estimation parameters
 %%
-\begin{OptionTable}{Motion estimation parameters}
+
+\begin{OptionTableNoShorthand}{Motion estimation parameters}{tab:motion-estimation}
 \Option{FastSearch} &
-\ShortOption{\None} &
-\Default{true} &
+%\ShortOption{\None} &
+\Default{1} &
 Enables or disables the use of a fast motion search.
 \par
@@ -770,9 +1005,10 @@
  0 & Full search method \\
  1 & Fast search method \\
-\end{tabular}
-\\
-
-\Option{SearchRange} &
-\ShortOption{-sr} &
+ 2 & Previous motion vector fast search method \\
+\end{tabular}
+\\
+
+\Option{SearchRange (-sr)} &
+%\ShortOption{-sr} &
 \Default{96} &
 Specifies the search range used for motion estimation.
@@ -784,5 +1020,5 @@
 
 \Option{BipredSearchRange} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{4} &
 Specifies the search range used for bi-prediction refinement in motion
@@ -790,6 +1026,18 @@
 \\
 
+\Option{ClipForBiPredMEEnabled} &
+%\ShortOption{\None} &
+\Default{0} &
+Enables clipping in the Bi-Pred ME, which prevents values over- or under-flowing. It is usually disabled to reduce encoder run-time.
+\\
+
+\Option{FastMEAssumingSmootherMVEnabled} &
+%\ShortOption{\None} &
+\Default{0} &
+Enables fast ME assuming a smoother MV.
+\\
+
 \Option{HadamardME} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Enables or disables the use of the Hadamard transform in fractional-pel motion
@@ -803,5 +1051,5 @@
 
 \Option{ASR} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables the use of adaptive search ranges, where the motion
@@ -819,5 +1067,18 @@
 \end{displaymath}
 \\
-\end{OptionTable}
+
+\Option{MaxNumMergeCand} &
+%\ShortOption{\None} &
+\Default{5} &
+Specifies the maximum number of merge candidates to use.
+\\
+
+\Option{DisableIntraInInter} &
+%\ShortOption{\None} &
+\Default{0} &
+Flag to disable intra PUs in inter slices.
+\\
+
+\end{OptionTableNoShorthand}
 
 
@@ -825,7 +1086,8 @@
 %% Mode decision parameters
 %%
-\begin{OptionTable}{Mode decision parameters}
-\Option{LambdaModifier$N$} &
-\ShortOption{-LM$N$} &
+
+\begin{OptionTableNoShorthand}{Mode decision parameters}{tab:mode-decision}
+\Option{LambdaModifier$N$ (-LM$N$)} &
+%\ShortOption{-LM$N$} &
 \Default{1.0} &
 Specifies a value that is multiplied with the Lagrange multiplier
@@ -833,9 +1095,27 @@
 when encoding temporal layer~$N$.
 \par
-$N$ may be in the range 0--7.
+$N$ may be in the range 0 (inclusive) to 7 (exclusive).
+\\
+
+\Option{ECU} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables the use of early CU determination.  When enabled, skipped CUs will not be split further.
+\\
+
+\Option{CFM} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables the use of Cbf-based fast encoder mode.  When enabled, once a 2Nx2N CU has been evaluated, if the RootCbf is 0, further PU splits will not be evaluated.
+\\
+
+\Option{ESD} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables the use of early skip detection.  When enabled, the skip mode will be tested before any other.
 \\
 
 \Option{FEN} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables the use of fast encoder mode.  When enabled,
@@ -850,5 +1130,5 @@
 
 \Option{FDM} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Enables or disables the use of fast encoder decisions for 2Nx2N merge
@@ -859,5 +1139,5 @@
 
 \Option{RDpenalty} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 RD-penalty for 32x32 TU for intra in non-intra slices.
@@ -871,20 +1151,20 @@
 \\
 
-\end{OptionTable}
+\end{OptionTableNoShorthand}
 
 %%
 %% Quantization parameters
 %%
-\begin{OptionTable}{Quantization parameters}
-\Option{QP} &
-\ShortOption{-q} &
+\begin{OptionTableNoShorthand}{Quantization parameters}{tab:quantization}
+\Option{QP (-q)} &
+%\ShortOption{-q} &
 \Default{30.0} &
-Specifies the base value of the quantization parameter.
-\\
-
-\Option{CbQpOffset}%
-\Option{CrQpOffset} &
-\ShortOption{-cbqpofs}%
-\ShortOption{-crqpofs} &
+Specifies the base value of the quantization parameter. If it is non-integer, the QP is switched once during encoding.
+\\
+
+\Option{CbQpOffset (-cbqpofs)}%
+\Option{CrQpOffset (-crqpofs)} &
+%\ShortOption{-cbqpofs}%
+%\ShortOption{-crqpofs} &
 \Default{0}%
 \Default{0} &
@@ -895,6 +1175,6 @@
 \\
 
-\Option{MaxCuDQPDepth} &
-\ShortOption{\None} &
+\Option{MaxCuDQPDepth (-dqd)} &
+%\ShortOption{\None} &
 \Default{0} &
 Defines maximum depth of a minimum CuDQP for sub-LCU-level delta QP.
@@ -903,17 +1183,26 @@
 
 \Option{RDOQ} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
-Enables or disables rate-distortion-optimized quantization.
+Enables or disables rate-distortion-optimized quantization for transformed TUs.
 \\
 
 \Option{RDOQTS} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Enables or disables rate-distortion-optimized quantization for transform-skipped TUs.
 \\
 
-\Option{DeltaQpRD} &
-\ShortOption{-dqr} &
+\Option{SelectiveRDOQ} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables selective rate-distortion-optimized quantization.
+A simple quantization is use to pre-analyze, whether to bypass the RDOQ process or not. 
+If all the coefficients are quantized to 0, the RDOQ process is bypassed. 
+Otherwise, the RDOQ process is performed as usual.
+\\
+
+\Option{DeltaQpRD (-dqr)} &
+%\ShortOption{-dqr} &
 \Default{0} &
 Specifies the maximum QP offset at slice level for multi-pass slice
@@ -923,6 +1212,6 @@
 \\
 
-\Option{MaxDeltaQP} &
-\ShortOption{-d} &
+\Option{MaxDeltaQP (-d)} &
+%\ShortOption{-d} &
 \Default{0} &
 Specifies the maximum QP offset at the largest coding unit level for
@@ -933,6 +1222,6 @@
 \\
 
-\Option{dQPFile} &
-\ShortOption{-m} &
+\Option{dQPFile (-m)} &
+%\ShortOption{-m} &
 \Default{\NotSet} &
 Specifies a file containing a list of QP deltas. The $n$-th line
@@ -941,16 +1230,56 @@
 \\
 
-\Option{AdaptiveQpSelection} &
-\ShortOption{-aqps} &
+\Option{AdaptiveQp (-aq)} &
+%\ShortOption{-aq} &
+\Default{false} &
+Enable or disable QP adaptation based upon a psycho-visual model.
+\\
+
+\Option{MaxQPAdaptationRange (-aqr)} &
+%\ShortOption{-aqps} &
+\Default{6} &
+Specifies the maximum QP adaptation range.
+\\
+
+\Option{AdaptiveQpSelection (-aqps)} &
+%\ShortOption{-aqps} &
 \Default{false} &
 Specifies whether QP values for non-I frames will be calculated on the
 fly based on statistics of previously coded frames.
 \\
-\Option{RecalculateQPAccordingToLambda} &
-\ShortOption{\None} &
+
+\Option{RecalculateQP...} \Option{AccordingToLambda} &
+%\ShortOption{\None} &
 \Default{false} &
 Recalculate QP values according to lambda values. Do not suggest to be enabled in all intra case.
 \\
-\end{OptionTable}
+
+\Option{ScalingList} &
+%\ShortOption{\None} &
+\Default{0} &
+Controls the specification of scaling lists:
+\par
+\begin{tabular}{cp{0.45\textwidth}}
+ 0 & Scaling lists are disabled \\
+ 1 & Use default scaling lists \\
+ 2 & Scaling lists are specified in the file indicated by ScalingListFile \\
+\end{tabular}
+\\
+
+\Option{ScalingListFile} &
+%\ShortOption{\None} &
+\Default{\NotSet} &
+When ScalingList is set to 2, this parameter indicates the name of the file, which contains the defined scaling lists.
+If ScalingList is set to 2 and this parameter is an empty string, information on the format of the scaling list file
+is output and the encoder stops.
+\\
+
+\Option{MaxCUChromaQpAdjustmentDepth} &
+%\ShortOption{\None} &
+\Default{-1} &
+Specifies the maximum depth for CU chroma QP adjustment; if negative, CU chroma QP adjustment is disabled.
+\\
+
+\end{OptionTableNoShorthand}
 
 
@@ -958,5 +1287,5 @@
 %% Slice coding parameters
 %%
-\begin{OptionTable}{Slice coding parameters}
+\begin{OptionTableNoShorthand}{Slice coding parameters}{tab:slice-coding}
 %\Option{SliceGranularity} &
 %\ShortOption{\None} &
@@ -976,5 +1305,5 @@
 
 \Option{SliceMode} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Controls the slice partitioning method in conjunction with
@@ -990,5 +1319,5 @@
 
 \Option{SliceArgument} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{\NotSet} &
 Specifies the maximum number of CTUs, bytes or tiles in a slice depending on the
@@ -997,5 +1326,5 @@
 
 \Option{SliceSegmentMode} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Enables (dependent) slice segment coding in conjunction with 
@@ -1011,5 +1340,5 @@
 
 \Option{SliceSegmentArgument} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{\NotSet} &
 Defines the maximum number of CTUs, bytes or tiles a slice segment
@@ -1018,5 +1347,5 @@
 
 \Option{WaveFrontSynchro} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables the use of specific CABAC probabilities synchronization at the
@@ -1025,7 +1354,19 @@
 \\
 
+\Option{TileUniformSpacing} &
+%\ShortOption{\None} &
+\Default{false} &
+Controls the mode used to determine per row and column tile sizes.
+\par
+\begin{tabular}{cp{0.45\textwidth}}
+ 0 & Each tile column width and tile row height is explicitly set
+     by TileColumnWidthArray and TileRowHeightArray respectively \\
+ 1 & Tile columns and tile rows are uniformly spaced. \\
+\end{tabular}
+\\
+
 \Option{NumTileColumnsMinus1}%
 \Option{NumTileRowsMinus1} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Specifies the tile based picture partitioning geometry as
@@ -1034,19 +1375,7 @@
 \\
 
-\Option{UniformSpacingIdc} &
-\ShortOption{\None} &
-\Default{0} &
-Controls the mode used to determine per row and column tile sizes.
-\par
-\begin{tabular}{cp{0.45\textwidth}}
- 0 & Each tile column width and tile row height is explicitly set
-     by ColumnWidthArray and RowHeightArray respectively \\
- 1 & Tile columns and tile rows are uniformly spaced. \\
-\end{tabular}
-\\
-
-\Option{ColumnWidthArray}%
-\Option{RowHeightArray} &
-\ShortOption{\None} &
+\Option{TileColumnWidthArray}%
+\Option{TileRowHeightArray} &
+%\ShortOption{\None} &
 \Default{\NotSet} &
 Specifies a space or comma separated list of widths and heights,
@@ -1054,5 +1383,5 @@
 list corresponds to the leftmost tile column or topmost tile row.
 \\
-\end{OptionTable}
+\end{OptionTableNoShorthand}
 
 
@@ -1061,7 +1390,7 @@
 %% Deblocking filter parameters
 %%
-\begin{OptionTable}{Deblocking filter parameters}
+\begin{OptionTableNoShorthand}{Deblocking filter parameters}{tab:deblocking-filter}
 \Option{LoopFilterDisable} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables the in-loop deblocking filter.
@@ -1069,5 +1398,5 @@
 
 \Option{LFCrossSliceBoundaryFlag} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Enables or disables the use of in-loop filtering across slice
@@ -1075,14 +1404,6 @@
 \\
 
-\Option{DeblockingFilterControlPresent}&
-\ShortOption{\None}&
-\Default{false}&
-Enables or disables the presence of the deblocking filter control
-parameters in the picture parameter set and in the slice segment header.
-When disabled, the default deblocking filter parameters are used.
-\\
-
 \Option{LoopFilterOffsetInPPS}&
-\ShortOption{\None}&
+%\ShortOption{\None}&
 \Default{false}&
 If enabled, the in-loop deblocking filter control parameters are sent in PPS. 
@@ -1097,5 +1418,5 @@
 
 \Option{LoopFilterTcOffset_div2}&
-\ShortOption{\None}&
+%\ShortOption{\None}&
 \Default{0}&
 Specifies the base value for the in-loop deblocking filter parameter tc_offset_div2. The final value of tc_offset_div2 
@@ -1104,5 +1425,5 @@
 
 \Option{LoopFilterBetaOffset_div2}&
-\ShortOption{\None}&
+%\ShortOption{\None}&
 \Default{0}&
 Specifies the base value for the in-loop deblocking filter parameter beta_offset_div2. The final value of beta_offset_div2 
@@ -1110,5 +1431,18 @@
 \\
 
-\end{OptionTable}
+\Option{DeblockingFilterMetric}&
+%\ShortOption{\None}&
+\Default{false}&
+Enables or disables the use of a deblocking filter metric to evaluate the suitability of deblocking. If enabled then
+LoopFilterOffsetInPPS and LoopFilterDisable must be 0.
+\\
+
+\Option{LFCrossSliceBoundaryFlag}&
+%\ShortOption{\None}&
+\Default{true}&
+Enables or disables the use of a deblocking across tile boundaries.
+\\
+
+\end{OptionTableNoShorthand}
 
 
@@ -1117,26 +1451,39 @@
 %% Coding tools parameters
 %%
-\begin{OptionTable}{Coding tools parameters}
-%\Option{ALF} &
-%\ShortOption{\None} &
-%\Default{true} &
-%Enables or disables the adaptive loop filter.
-%\\
-
-%\Option{ALFLowLatencyEncode} &
-%\ShortOption{\None} &
-%\Default{false} &
-%Specifies the operating mode (low latency or high efficiency) of the
-%adaptive loop filter.
-%\\
+
+\begin{OptionTableNoShorthand}{Coding tools parameters}{tab:coding-tools}
+
+\Option{AMP} &
+%\ShortOption{\None} &
+\Default{true} &
+Enables or disables the use of asymmetric motion partitions.
+\\
 
 \Option{SAO} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Enables or disables the sample adaptive offset (SAO) filter.
 \\
 
+\Option{TestSAODisableAtPictureLevel} &
+%\ShortOption{\None} &
+\Default{false} &
+Enables the testing of disabling SAO at the picture level after having analysed all blocks.
+\\
+
+\Option{SaoEncodingRate} &
+%\ShortOption{\None} &
+\Default{0.75} &
+When >0 SAO early picture termination is enabled for luma and chroma.
+\\
+
+\Option{SaoEncodingRateChroma} &
+%\ShortOption{\None} &
+\Default{0.5} &
+The SAO early picture termination rate to use for chroma (when m_SaoEncodingRate is >0). If <=0, use results for luma.
+\\
+
 \Option{SAOLcuBoundary} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables SAO parameter estimation using non-deblocked pixels
@@ -1144,18 +1491,6 @@
 \\
 
-%\Option{LMChroma} &
-%\ShortOption{\None} &
-%\Default{true} &
-%Enables or disables the intra chroma-from-luma prediction mode.
-%\\
-
-%\Option{NSQT} &
-%\ShortOption{\None} &
-%\Default{true} &
-%Enables or disables the non-square quadtree transform.
-%\\
-
 \Option{ConstrainedIntraPred} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables constrained intra prediction.  Constrained intra
@@ -1164,6 +1499,24 @@
 \\
 
+\Option{FastUDIUseMPMEnabled} &
+%\ShortOption{\None} &
+\Default{true} &
+If enabled, adapt intra direction search, accounting for MPM
+\\
+
+\Option{FastMEForGenBLowDelayEnabled} &
+%\ShortOption{\None} &
+\Default{true} &
+If enabled use a fast ME for generalised B Low Delay slices
+\\
+
+\Option{UseBLambdaForNonKeyLowDelayPictures} &
+%\ShortOption{\None} &
+\Default{true} &
+Enables use of B-Lambda for non-key low-delay pictures
+\\
+
 \Option{TransquantBypassEnableFlag} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables the ability to bypass the transform,
@@ -1176,5 +1529,5 @@
 
 \Option{CUTransquantBypassFlagForce} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Controls the per CU transformation, quantization and filtering
@@ -1191,5 +1544,5 @@
 
 \Option{PCMEnabledFlag} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables the use of PCM. The encoder will use cost measures on a CU-by-CU basis to determine if PCM mode is to be applied.
@@ -1197,5 +1550,5 @@
 
 \Option{PCMLog2MaxSize} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{5 \\ ($= \mathrm{log}_2(32)$)} &
 Specifies log2 of the maximum PCM block size. When PCM is enabled, the
@@ -1205,5 +1558,5 @@
 
 \Option{PCMLog2MinSize} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{3} &
 Specifies log2 of the minimum PCM block size. When PCM is enabled, the
@@ -1215,6 +1568,6 @@
 
 \Option{PCMInputBitDepthFlag} &
-\ShortOption{\None} &
-\Default{1} &
+%\ShortOption{\None} &
+\Default{true} &
 If enabled specifies that PCM sample bit-depth is set equal to
 InputBitDepth. Otherwise, it specifies that PCM sample bit-depth is set
@@ -1223,5 +1576,5 @@
 
 \Option{PCMFilterDisableFlag} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 If enabled specifies that loop-filtering on reconstructed samples of PCM
@@ -1231,18 +1584,24 @@
 \\
 
-\Option{WeightedPredP} &
-\ShortOption{-wpP} &
+\Option{WeightedPredP (-wpP)} &
+%\ShortOption{-wpP} &
 \Default{false} &
 Enables the use of weighted prediction in P slices.
 \\
 
-\Option{WeightedPredB} &
-\ShortOption{-wpB} &
+\Option{WeightedPredB (-wpB)} &
+%\ShortOption{-wpB} &
 \Default{false} &
 Enables the use of weighted prediction in B slices.
 \\
 
-\Option{SignHideFlag} &
-\ShortOption{-SBH} &
+\Option{Log2ParallelMergeLevel} &
+%\ShortOption{\None} &
+\Default{2} &
+Defines the PPS-derived Log2ParMrgLevel variable.
+\\
+
+\Option{SignHideFlag (-SBH)} &
+%\ShortOption{-SBH} &
 \Default{true} &
 If enabled specifies that for each 4x4 coefficient group for which the
@@ -1254,6 +1613,6 @@
 \\
 
-\Option{StrongIntraSmoothing} &
-\ShortOption{-sis} &
+\Option{StrongIntraSmoothing (-sis)} &
+%\ShortOption{-sis} &
 \Default{true} &
 If enabled specifies that for 32x32 intra prediction block, the intra smoothing
@@ -1265,5 +1624,5 @@
 
 \Option{TMVPMode} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{1} &
 Controls the temporal motion vector prediction mode.
@@ -1277,12 +1636,11 @@
 
 \Option{TransformSkip} &
-\ShortOption{\None} &
-\Default{false} &
-Enables or disables transform-skipping mode decision for 4x4 TUs
-\footnote{Enables transform_skip_enabled and per 4x4 TU tests}.
+%\ShortOption{\None} &
+\Default{false} &
+Enables or disables transform-skipping mode decision.
 \\
 
 \Option{TransformSkipFast} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Enables or disables reduced testing of the transform-skipping mode
@@ -1293,13 +1651,14 @@
 This option has no effect if TransformSkip is disabled.
 \\
-\end{OptionTable}
+\end{OptionTableNoShorthand}
 
 %%
 %% Rate control parameters
 %%
-\begin{OptionTable}{Rate control parameters}
+
+\begin{OptionTableNoShorthand}{Rate control parameters}{tab:rate-control}
 
 \Option{RateControl} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Rate control: enables rate control or not.
@@ -1307,5 +1666,5 @@
 
 \Option{TargetBitrate} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Rate control: target bitrate, in bps.
@@ -1313,5 +1672,5 @@
 
 \Option{KeepHierarchicalBit} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Rate control: 0: equal bit allocation among pictures;
@@ -1321,5 +1680,5 @@
 
 \Option{LCULevelRateControl} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Rate control: true: LCU level RC; false: picture level RC.
@@ -1327,5 +1686,5 @@
 
 \Option{RCLCUSeparateModel} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{true} &
 Rate control: use LCU level separate R-lambda model or not.
@@ -1334,5 +1693,5 @@
 
 \Option{InitialQP} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0} &
 Rate control: initial QP value for the first picture.
@@ -1341,46 +1700,39 @@
 
 \Option{RCForceIntraQP} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{false} &
 Rate control: force intra QP to be equal to initial QP or not.
 \\
-\end{OptionTable}
+\end{OptionTableNoShorthand}
 
 %%
 %% VUI parameters
 %%
-\begin{OptionTable}{VUI parameters}
-\Option{VuiParametersPresent} &
-\ShortOption{-vui} &
+\begin{OptionTableNoShorthand}{VUI parameters}{tab:VUI}
+\Option{VuiParametersPresent (-vui)} &
 \Default{false} &
 Enable generation of vui_parameters().
 \\
 \Option{AspectRatioInfoPresent} &
-\ShortOption{} &
 \Default{false} &
 Signals whether aspect_ratio_idc is present.
 \\
 \Option{AspectRatioIdc} &
-\ShortOption{} &
 \Default{0} &
 aspect_ratio_idc
 \\
 \Option{SarWidth} &
-\ShortOption{} &
 \Default{0} &
 Specifies the horizontal size of the sample aspect ratio.
 \\
 \Option{SarHeight} &
-\ShortOption{} &
 \Default{0} &
 Specifies the vertical size of the sample aspect ratio.
 \\
 \Option{OverscanInfoPresent} &
-\ShortOption{} &
 \Default{false} &
 Signals whether overscan_info_present_flag is present.
 \\
 \Option{OverscanAppropriate} &
-\ShortOption{} &
 \Default{false} &
 Indicates whether cropped decoded pictures are suitable for display using overscan.
@@ -1392,15 +1744,12 @@
 \\
 \Option{VideoSignalTypePresent} &
-\ShortOption{} &
 \Default{false} &
 Signals whether video_format, video_full_range_flag, and colour_description_present_flag are present.
 \\
 \Option{VideoFormat} &
-\ShortOption{} &
 \Default{5} &
 Indicates representation of pictures.
 \\
 \Option{VideoFullRange} &
-\ShortOption{} &
 \Default{false} &
 Indicates the black level and range of luma and chroma signals.
@@ -1412,40 +1761,32 @@
 \\
 \Option{ColourDescriptionPresent} &
-\ShortOption{} &
 \Default{false} &
 Signals whether colour_primaries, transfer_characteristics and matrix_coefficients are present.
 \\
 \Option{ColourPrimaries} &
-\ShortOption{} &
 \Default{2} &
 Indicates chromaticity coordinates of the source primaries.
 \\
 \Option{TransferCharateristics} &
-\ShortOption{} &
 \Default{2} &
 Indicates the opto-electronic transfer characteristics of the source.
 \\
 \Option{MatrixCoefficients} &
-\ShortOption{} &
 \Default{2} &
 Describes the matrix coefficients used in deriving luma and chroma from RGB primaries.
 \\
 \Option{ChromaLocInfoPresent} &
-\ShortOption{} &
 \Default{false} &
 Signals whether chroma_sample_loc_type_top_field and chroma_sample_loc_type_bottom_field are present.
 \\
 \Option{ChromaSampleLocTypeTopField} &
-\ShortOption{} &
 \Default{0} &
 Specifies the location of chroma samples for top field.
 \\
 \Option{ChromaSampleLocTypeBottomField} &
-\ShortOption{} &
 \Default{0} &
 Specifies the location of chroma samples for bottom field.
 \\
 \Option{NeutralChromaIndication} &
-\ShortOption{} &
 \Default{false} &
 Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1).
@@ -1453,11 +1794,10 @@
 
 \Option{DefaultDisplayWindowFlag} &
-\ShortOption{\None} &
-\Default{0} &
+\Default{flag} &
 Indicates the presence of the Default Window parameters.
 \par
 \begin{tabular}{cp{0.45\textwidth}}
-0 & Disabled \\
-1 & Enabled \\
+false & Disabled \\
+true & Enabled \\
 \end{tabular}
 \\
@@ -1467,5 +1807,4 @@
 \Option{DefDispWinTopOffset}%
 \Option{DefDispWinBottomOffset} &
-\ShortOption{\None} &
 \Default{0} &
 Specifies the horizontal and vertical offset to be applied to the
@@ -1474,52 +1813,490 @@
 \\
 
+\Option{FrameFieldInfoPresentFlag} &
+\Default{false} &
+Specificies the value of the VUI syntax element `frame_field_info_present_flag', which indicates that pic_struct and field coding related values are present in picture timing SEI messages.
+\\
+
+\Option{PocProportionalToTimingFlag} &
+\Default{false} &
+Specificies the value of the VUI syntax element `vui_poc_proportional_to_timing_flag', which indicates that the POC value is proportional to the output time with respect to the first picture in the CVS.
+\\
+
+\Option{NumTicksPocDiffOneMinus} &
+\Default{0} &
+Specificies the value of the VUI syntax element `vui_num_ticks_poc_diff_one_minus1', which specifies the number of clock ticks corresponding to a difference of picture order count values equal to 1, and is used only when PocProportionalToTimingFlag is true.
+\\
+
 \Option{BitstreamRestriction} &
-\ShortOption{} &
 \Default{false} &
 Signals whether bitstream restriction parameters are present.
 \\
 \Option{TilesFixedStructure} &
-\ShortOption{} &
 \Default{false} &
 Indicates that each active picture parameter set has the same values of the syntax elements related to tiles.
 \\
 \Option{MotionVectorsOverPicBoundaries} &
-\ShortOption{} &
 \Default{false} &
 Indicates that no samples outside the picture boundaries are used for inter prediction.
 \\
 \Option{MaxBytesPerPicDenom} &
-\ShortOption{} &
 \Default{2} &
 Indicates a number of bytes not exceeded by the sum of the sizes of the VCL NAL units associated with any coded picture.
 \\
 \Option{MaxBitsPerMinCuDenom} &
-\ShortOption{} &
 \Default{1} &
 Indicates an upper bound for the number of bits of coding_unit() data.
 \\
 \Option{Log2MaxMvLengthHorizontal} &
-\ShortOption{} &
 \Default{15} &
 Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units.
 \\
 \Option{Log2MaxMvLengthVertical} &
-\ShortOption{} &
 \Default{15} &
 Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units.
 \\
-\end{OptionTable}
-
+\end{OptionTableNoShorthand}
+
+
+\begin{OptionTableNoShorthand}{Range Extensions (Version 2) tool parameters}{tab:rext-tools}
+
+\Option{CostMode} &
+\Default{lossy} &
+Specifies the cost mode to use.
+\par
+\begin{tabular}{lp{0.3\textwidth}}
+  lossy                   & $cost=distortion+\lambda \times bits$ \\
+  sequence_level_lossless & $cost=distortion / \lambda + bits$. \\
+  lossless                & As with sequence_level_lossless, but QP is also set to 0 (this will be deprecated in the future) \\
+  mixed_lossless_lossy    & As with sequence_level_lossless, but QP'=4 is used for pre-estimates of transquant-bypass blocks \\
+\end{tabular}
+\\
+
+\Option{ExtendedPrecision} &
+\Default{false} &
+Specifies the use of extended_precision_processing flag. Note that unless the HIGH_BIT_DEPTH_SUPPORT macro in TypeDef.h is enabled, all internal bit depths must be 8 when the ExtendedPrecision setting is enabled.
+This setting is only valid for the 16-bit RExt profiles.
+\\
+
+\Option{HighPrecisionPredictionWeighting} &
+\Default{false} &
+Specifies the value of high_precision_prediction_weighting_flag. This setting is only valid for the 16-bit or 4:4:4 RExt profiles.
+\\
+
+\Option{CrossComponentPrediction} &
+\Default{false} &
+When true, specifies the use of the cross component prediction tool (4:4:4 processing only). Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{ReconBasedCrossCPredictionEstimate} &
+\Default{false} &
+If true, then when determining the alpha value for cross-component prediction, use the reconstructed residual rather than the pre-transform encoder-side residual
+\\
+
+\Option{SaoLumaOffsetBitShift}
+\Option{SaoChromaOffsetBitShift}&
+\Default{0}
+\Default{0} &
+Specifies the shift to apply to the SAO parameters. If negative, an estimate will be calculated based upon the initial QP. Version 1 and some Version 2 (RExt) profiles require this to be 0.
+\\
+
+\Option{TransformSkipLog2MaxSize} &
+\Default{2} &
+Specifies the maximum TU size for which transform-skip can be used; the minimum value is 2. Version 1 and some Version 2 (RExt) profiles require this to be 2.
+\\
+
+\Option{ImplicitResidualDPCM} &
+\Default{false} &
+When true, specifies the use of the implicitly signalled residual RDPCM tool (for intra). Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{ExplicitResidualDPCM} &
+\Default{false} &
+When true, specifies the use of the explicitly signalled residual RDPCM tool (for intra-block-copy and inter). Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{ResidualRotation} &
+\Default{false} &
+When true, specifies the use of the residual rotation tool. Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{SingleSignificanceMapContext} &
+\Default{false} &
+When true, specifies the use of a single significance map context for transform-skipped and transquant-bypassed TUs. Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{GolombRiceParameterAdaptation} &
+\Default{false} &
+When true, enable the adaptation of the Golomb-Rice parameter over the course of each slice. Version 1 and some Version 2 (RExt) profiles require this to be false.
+\\
+
+\Option{AlignCABACBeforeBypass} &
+\Default{false} &
+When true, align the CABAC engine to a defined fraction of a bit prior to coding bypass data (including sign bits) when coeff_abs_level_remaining syntax elements are present in the group.
+This must always be true for the high-throughput-RExt profile, and false otherwise.
+\\
+
+\Option{IntraReferenceSmoothing} &
+\Default{true} &
+When true, enable intra reference smoothing, otherwise disable it. Version 1 and some Version 2 (RExt) profiles require this to be true.
+\\
+
+\end{OptionTableNoShorthand}
+
+\subsection{Encoder SEI parameters}
+The table below lists the SEI messages defined for Version 1 and Range-Extensions, and if available, the respective table that lists the controls within the HM Encoder to include the messages within the bit stream.
+
+\begin{SEIListTable}{List of Version 1 and RExt SEI messages}
+    0 & Buffering period                         & Table \ref{tab:sei-buffering-period} \\
+    1 & Picture timing                           & Table \ref{tab:sei-picture-timing} \\
+    2 & Pan-scan rectangle                       & (Not handled)\\
+    3 & Filler payload                           & (Not handled)\\
+    4 & User data registered by Rec. ITU-T T.35  & (Not handled)\\
+    5 & User data unregistered                   & Decoded only\\
+    6 & Recovery point                           & Table \ref{tab:sei-recovery-point} \\
+    9 & Scene information                        & (Not handled)\\
+   15 & Picture snapshot                         & (Not handled)\\
+   16 & Progressive refinement segment start     & (Not handled)\\
+   17 & Progressive refinement segment end       & (Not handled)\\
+   19 & Film grain characteristics               & (Not handled)\\
+   22 & Post-filter hint                         & (Not handled)\\
+   23 & Tone mapping information                 & Table \ref{tab:sei-tone-mapping-info} \\
+   45 & Frame packing arrangement                & Table \ref{tab:sei-frame-packing-arrangement} \\
+   47 & Display orientation                      & Table \ref{tab:sei-display-orientation} \\
+  128 & Structure of pictures information        & Table \ref{tab:sei-sop-info} \\
+  129 & Active parameter sets                    & Table \ref{tab:sei-active-parameter-sets} \\
+  130 & Decoding unit information                & Table \ref{tab:sei-decoding-unit-info} \\
+  131 & Temporal sub-layer zero index            & Table \ref{tab:sei-temporal-level-0} \\
+  132 & Decoded picture hash                     & Table \ref{tab:sei-decoded-picture-hash} \\
+  133 & Scalable nesting                         & Table \ref{tab:sei-scalable-nesting} \\
+  134 & Region refresh information               & Table \ref{tab:sei-region-refresh-info} \\
+  135 & No display                               & Table \ref{tab:sei-no-display} \\
+  136 & Time code                                & Table \ref{tab:sei-time-code} \\
+  137 & Mastering display colour volume          & Table \ref{tab:sei-mastering-display-colour-volume} \\
+  138 & Segmented rectangular frame packing arrangement & Table \ref{tab:sei-seg-rect-fpa}\\
+  139 & Temporal motion-constrained tile sets    & Table \ref{tab:sei-tmcts} \\
+  140 & Chroma resampling filter hint            & Table \ref{tab:chroma-resampling-filter-hint} \\
+  141 & Knee function information                & Table \ref{tab:sei-knee-function} \\
+  142 & Colour remapping information             & (Not handled)\\
+  143 & Deinterlaced field identification        & (Not handled)\\
+\end{SEIListTable}
 %%
 %% SEI messages
 %%
-\begin{OptionTable}{SEI messages}
+
+  
+
+\begin{OptionTableNoShorthand}{Buffering period SEI message encoder parameters}{tab:sei-buffering-period}
+\Option{SEIBufferingPeriod} &
+\Default{0} &
+Enables or disables the insertion of the Buffering period
+SEI messages. This option has no effect if VuiParametersPresent is disabled.
+SEIBufferingPeriod requires SEIActiveParameterSets to be enabled.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Picture timing SEI message encoder parameters}{tab:sei-picture-timing}
+\Option{SEIPictureTiming} &
+\Default{0} &
+Enables or disables the insertion of the Picture timing
+SEI messages. This option has no effect if VuiParametersPresent is disabled.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Recovery point SEI message encoder parameters}{tab:sei-recovery-point}
+\Option{SEIRecoveryPoint} &
+\Default{0} &
+Enables or disables the insertion of the Recovery point
+SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Tone mapping information SEI message encoder parameters}{tab:sei-tone-mapping-info}
+\Option{SEIToneMappingInfo} &
+\Default{0} &
+Enables or disables the insertion of the Tone Mapping SEI message.
+\\
+\Option{SEIToneMapId} &
+\Default{0} &
+Specifies Id of Tone Mapping SEI message for a given session.
+\\
+\Option{SEIToneMapCancelFlag} &
+\Default{false} &
+Indicates that Tone Mapping SEI message cancels the persistance or follows.
+\\
+\Option{SEIToneMapPersistenceFlag} &
+\Default{true} &
+Specifies the persistence of the Tone Mapping SEI message.
+\\
+\Option{SEIToneMapCodedDataBitDepth} &
+\Default{8} &
+Specifies Coded Data BitDepth of Tone Mapping SEI messages.
+\\
+\Option{SEIToneMapTargetBitDepth} &
+\Default{8} &
+Specifies Output BitDepth of Tome mapping function.
+\\
+\Option{SEIToneMapModelId} &
+\Default{0} &
+Specifies Model utilized for mapping coded data into 
+target_bit_depth range.
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+  0 & linear mapping with clipping \\
+  1 & sigmoidal mapping \\
+  2 & user-defined table mapping \\
+  3 & piece-wise linear mapping \\
+  4 & luminance dynamic range mapping \\
+\end{tabular}
+\\
+\Option{SEIToneMapMinValue} &
+\Default{0} &
+Specifies the minimum value in mode 0.
+\\
+\Option{SEIToneMapMaxValue} &
+\Default{1023} &
+Specifies the maxmum value in mode 0.
+\\
+\Option{SEIToneMapSigmoidMidpoint} &
+\Default{512} &
+Specifies the centre point in mode 1.
+\\
+\Option{SEIToneMapSigmoidWidth} &
+\Default{960} &
+Specifies the distance between 5% and 95% values of 
+the target_bit_depth in mode 1.
+\\
+\Option{SEIToneMapStartOfCodedInterval} &
+\Default{\None} &
+Array of user-defined mapping table. 
+Default table can be set to the following:
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+0 12 24 36 48 60 72 84 96 108 120 132 144 156 168 180 
+\\
+192 192 196 204 208 216 220 228 232 240 248 252 260 264 
+\\
+272 276 284 292 292 296 300 304 308 312 320 324 328 332 
+\\
+336 344 348 352 356 360 368 372 376 380 384 388 396 400 
+\\
+404 408 412 420 424 428 432 436 444 444 444 448 452 456 
+\\
+460 464 468 472 476 476 480 484 488 492 496 500 504 508 
+\\
+508 512 516 520 524 528 532 536 540 540 544 548 552 556 
+\\
+560 564 568 572 572 576 580 584 588 592 596 600 604 604 
+\\
+608 612 616 620 624 628 632 636 636 640 644 648 652 656 
+\\
+660 664 668 672 672 672 676 680 680 684 688 692 692 696 
+\\
+700 704 704 708 712 716 716 720 724 724 728 732 736 736 
+\\
+740 744 748 748 752 756 760 760 764 768 768 772 776 780 
+\\
+780 784 788 792 792 796 800 804 804 808 812 812 816 820 
+\\
+824 824 828 832 836 836 840 844 848 848 852 856 860 860 
+\\
+860 864 864 868 872 872 876 880 880 884 884 888 892 892 
+\\
+896 900 900 904 908 908 912 912 916 920 920 924 928 928 
+\\
+932 936 936 940 940 944 948 948 952 956 956 960 964 964 
+\\
+968 968 972 976 976 980 984 984 988 992 992 996 996 1000 
+\\
+1004 1004 1008 1012 1012 1016 1020 1024
+\\
+\end{tabular}
+\\
+\Option{SEIToneMapNumPivots} &
+\Default{0} &
+Specifies the number of pivot points in mode 3.
+\\
+\Option{SEIToneMapCodedPivotValue} &
+\Default{\None} &
+Array of coded pivot point in mode 3.
+A suggested table is:
+\par
+\begin{tabular}{cp{0.45\textwidth}}
+64 128 256 512 768
+\end{tabular}
+\\
+\Option{SEIToneMapTargetPivotValue} &
+\Default{\None} &
+Array of target pivot point in mode 3.
+A suggested table is:
+\par
+\begin{tabular}{cp{0.45\textwidth}}
+48 73 111 168 215
+\end{tabular}
+\\
+\Option{SEIToneMap...} \Option{CameraIsoSpeedIdc} &
+\Default{0} &
+Indicates the camera ISO speed for daylight illumination.
+\\
+\Option{SEIToneMap...} \Option{CameraIsoSpeedValue} &
+\Default{400} &
+Specifies the camera ISO speed for daylight illumination of Extended_ISO.
+\\
+\Option{SEIToneMap...} \Option{ExposureIndexIdc} &
+\Default{0} &
+Indicates the exposure index setting of the camera.
+\\
+\Option{SEIToneMap...} \Option{ExposureIndexValue} &
+\Default{400} &
+Specifies the exposure index setting of the cameran of Extended_ISO.
+\\
+\Option{SEIToneMapExposure...} \Option{CompensationValueSignFlag} &
+\Default{0} &
+Specifies the sign of ExposureCompensationValue.
+\\
+\Option{SEIToneMapExposure...} \Option{CompensationValueNumerator} &
+\Default{0} &
+Specifies the numerator of ExposureCompensationValue.
+\\
+\Option{SEIToneMapExposure...} \Option{CompensationValueDenomIdc} &
+\Default{2} &
+Specifies the denominator of ExposureCompensationValue.
+\\
+\Option{SEIToneMapRef...} \Option{ScreenLuminanceWhite} &
+\Default{350} &
+Specifies reference screen brightness setting in units of candela per square metre.
+\\
+\Option{SEIToneMapExtended...} \Option{RangeWhiteLevel} &
+\Default{800} &
+Indicates the luminance dynamic range.
+\\
+\Option{SEIToneMapNominal...} \Option{BlackLevelLumaCodeValue} &
+\Default{16} &
+Specifies luma sample value of the nominal black level assigned decoded pictures.
+\\
+\Option{SEIToneMapNominal...} \Option{WhiteLevelLumaCodeValue} &
+\Default{235} &
+Specifies luma sample value of the nominal white level assigned decoded pictures.
+\\
+\Option{SEIToneMapExtended...} \Option{WhiteLevelLumaCodeValue} &
+\Default{300} &
+Specifies luma sample value of the extended dynamic range assigned decoded pictures.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Frame packing arrangement SEI message encoder parameters}{tab:sei-frame-packing-arrangement}
+\Option{SEIFramePacking} &
+\Default{0} &
+Enables or disables the insertion of the Frame packing arrangement SEI messages.
+\\
+\Option{SEIFramePackingType} &
+\Default{0} &
+Indicates the arrangement type in the Frame packing arrangement SEI message.
+This option has no effect if SEIFramePacking is disabled.
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+  3 & Side by Side \\
+  4 & Top Bottom \\
+  5 & Frame Alternate \\
+\end{tabular}
+\\
+\Option{SEIFramePackingInterpretation} &
+\Default{0} &
+Indicates the constituent frames relationship in the Frame packing arrangement SEI message. 
+This option has no effect if SEIFramePacking is disabled.
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+  0 & Unspecified \\
+  1 & Frame 0 is associated with the left view of a stereo pair \\
+  2 & Frame 0 is associated with the right view of a stereo pair \\
+\end{tabular}
+\\
+\Option{SEIFramePackingQuincunx} &
+\Default{0} &
+Enables or disables the quincunx_sampling signalling in the
+Frame packing arrangement SEI messages. This option has no
+effect if SEIFramePacking is disabled.
+\\
+\Option{SEIFramePackingId} &
+\Default{0} &
+Indicates the session number in the Frame packing arrangement
+SEI messages. This option has no effect if SEIFramePacking is
+disabled.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Display orientation SEI message encoder parameters}{tab:sei-display-orientation}
+\Option{SEIDisplayOrientation} &
+\Default{0} &
+Enables or disables the insertion of the Display orientation
+SEI messages.
+\par
+\begin{tabular}{cp{0.20\textwidth}}
+  0 & Disabled \\
+  N: $0 < N < (2^{16} - 1)$ & Enable display orientation SEI message with 
+  \mbox{anticlockwise_rotation = N} 
+  and \mbox{display_orientation_repetition_period = 1} \\
+\end{tabular}
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Structure of pictures information SEI message encoder parameters}{tab:sei-sop-info}
+\Option{SEISOPDescription} &
+\Default{0} &
+Enables or disables the insertion of the Structure of pictures information SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Active parameter sets SEI message encoder parameters}{tab:sei-active-parameter-sets}
+\Option{SEIActiveParameterSets} &
+\Default{0} &
+Enables or disables the insertion of the Active parameter sets
+SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Decoding unit information SEI message encoder parameters}{tab:sei-decoding-unit-info}
+\Option{SEIDecodingUnitInfo} &
+\Default{0} &
+Enables or disables the insertion of the Decoding unit information
+SEI messages. This option has no effect if VuiParametersPresent is disabled.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Temporal sub-layer zero index SEI message encoder parameters}{tab:sei-temporal-level-0}
+\Option{SEITemporalLevel0Index} &
+\Default{0} &
+Enables or disables the insertion of the Temporal level zero index
+SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Decoded picture hash SEI message encoder parameters}{tab:sei-decoded-picture-hash}
 \Option{SEIDecodedPictureHash} &
-\ShortOption{\None} &
 \Default{0} &
 Enables or disables the calculation and insertion of the Decoded picture hash
 SEI messages.
 \par
-\begin{tabular}{cp{0.45\textwidth}}
+\begin{tabular}{cp{0.35\textwidth}}
   0 & Disabled \\
   1 & Transmits MD5 in SEI message and writes the value to the encoder
@@ -1531,288 +2308,254 @@
 \end{tabular}
 \\
-\Option{SEIpictureDigest} &
-\ShortOption{\None} &
-\Default{0} &
-Deprecated alias for SEIDecodedPictureHash.
-Do not use anymore.
-\\
-\Option{SEIRecoveryPoint} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Recovery point
-SEI messages.
-\\
-\Option{SEIActiveParameterSets} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Active parameter sets
-SEI messages.
-\\
-\Option{SEIBufferingPeriod} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Buffering period
-SEI messages. This option has no effect if VuiParametersPresent is disabled.
-SEIBufferingPeriod requires SEIActiveParameterSets to be enabled.
-\\
-\Option{SEIPictureTiming} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Picture timing
-SEI messages. This option has no effect if VuiParametersPresent is disabled.
-\\
-\Option{SEIDecodingUnitInfo} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Decoding unit information
-SEI messages. This option has no effect if VuiParametersPresent is disabled.
-\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Scalable nesting SEI message encoder parameters}{tab:sei-scalable-nesting}
+\Option{SEIScalableNesting} &
+\Default{0} &
+Enables or disables the use of the scalable nesting SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+        
+\begin{OptionTableNoShorthand}{Region refresh information SEI message encoder parameters}{tab:sei-region-refresh-info}
 \Option{SEIGradualDecodingRefreshInfo} &
-\ShortOption{\None} &
 \Default{0} &
 Enables or disables the insertion of the Gradual decoding refresh information
 SEI messages.
 \\
-\Option{SEITemporalLevel0Index} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Temporal level zero index
-SEI messages.
-\\
-\Option{SEIDisplayOrientation} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Display orientation
-SEI messages.
-\par
-\begin{tabular}{cp{0.30\textwidth}}
-  0 & Disabled \\
-  N: $0 < N < (2^{16} - 1)$ & Enable display orientation SEI message with 
-  \mbox{anticlockwise_rotation = N} 
-  and \mbox{display_orientation_repetition_period = 1} \\
-\end{tabular}
-\\
-\Option{SEIFramePacking} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Frame packing arrangement SEI messages.
-\\
-\Option{SEIFramePackingType} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates the arrangement type in the Frame packing arrangement SEI message.
-This option has no effect if SEIFramePacking is disabled.
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{No display SEI message encoder parameters}{tab:sei-no-display}
+\Option{SEINoDisplay} &
+\Default{0} &
+When non-zero, generate no-display SEI message for temporal layer N or higher.
+\\
+\end{OptionTableNoShorthand}
+
+
+        
+\begin{OptionTableNoShorthand}{Time code SEI message encoder parameters}{tab:sei-time-code}
+\Option{SEITimeCodeEnabled} &
+\Default{false} &
+When true (non-zero), generate Time code SEI messages.
+\\
+\Option{SEITimeCodeNumClockTs} &
+\Default{0} &
+Number of clock time sets, in the range of 0 to 3 (inclusive).
+\\
+\Option{SEITimeCodeTimeStampFlag} &
+\Default{\None} &
+Time stamp flag associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeFieldBasedFlag} &
+\Default{\None} &
+Field based flag associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeCountingType} &
+\Default{\None} &
+Counting type associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeFullTsFlag} &
+\Default{\None} &
+Full time stamp flag associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeDiscontinuityFlag} &
+\Default{\None} &
+Discontinuity flag associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeCntDroppedFlag} &
+\Default{\None} &
+Counter dropped flag associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeNumFrames} &
+\Default{\None} &
+Number of frames associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeSecondsFlag} &
+\Default{\None} &
+Flag to signal seconds value presence in each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeMinutesFlag} &
+\Default{\None} &
+Flag to signal minutes value presence in each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeHoursFlag} &
+\Default{\None} &
+Flag to signal hours value presence in each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeSecondsValue} &
+\Default{\None} &
+Seconds value for each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeMinutesValue} &
+\Default{\None} &
+Minutes value for each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeHoursValue} &
+\Default{\None} &
+Hours value for each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeOffsetLength} &
+\Default{\None} &
+Time offset length associated to each time set (comma or space separated list of entries).
+\\
+\Option{SEITimeCodeTimeOffset} &
+\Default{\None} &
+Time offset associated to each time set (comma or space separated list of entries).
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Mastering display colour volume SEI message encoder parameters}{tab:sei-mastering-display-colour-volume}
+\Option{SEIMasteringDisplayColourVolume} &
+\Default{false} &
+When true (non-zero), generate Mastering display colour volume SEI message.
+\\
+\Option{SEIMasteringDisplayMaxLuminance} &
+\Default{10000} &
+Specifies the mastering display maximum luminance value in units of 1/10000 candela per square metre.
+\\
+\Option{SEIMasteringDisplayMinLuminance} &
+\Default{0} &
+Specifies the mastering display minimum luminance value in units of 1/10000 candela per square metre.
+\\
+\Option{SEIMasteringDisplayPrimaries} &
+\Default{0,50000, 0,0, 50000,0} &
+Mastering display primaries for all three colour planes in CIE xy coordinates in increments of 1/50000 (results in the ranges 0 to 50000 inclusive).
+\\
+\Option{SEIMasteringDisplayWhitePoint} &
+\Default{16667, 16667} &
+Mastering display white point CIE xy coordinates in normalized increments of 1/50000 (e.g. 0.333 = 16667).
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Segmented rectangular frame packing arrangement SEI message encoder parameters}{tab:sei-seg-rect-fpa}
+\Option{SEISegmentedRectFramePacking} &
+\Default{0} &
+Controls generation of segmented rectangular frame packing SEI messages.
+\\
+\Option{SEISegmentedRectFramePackingCancel} &
+\Default{false} &
+If true, cancels the persistence of any previous SRFPA SEI message.
+\\
+\Option{SEISegmentedRectFramePackingType} &
+\Default{0} &
+Specifies the arrangement of the frames in the reconstructed picture.
+\\
+\Option{SEISegmentedRectFramePackingPersistence} &
+\Default{false} &
+If false the SEI applies to the current frame only.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Temporal motion-constrained tile sets SEI message encoder parameters}{tab:sei-tmcts}
+\Option{SEITempMotionConstrainedTileSets} &
+\Default{false} &
+When true (non-zero), generates example temporal motion constrained tile sets SEI messages.
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Chroma resampling filter hint SEI message encoder parameters}{tab:chroma-resampling-filter-hint}
+\Option{SEIChromaSamplingFilterHint} &
+\Default{false} &
+When true (non-zero), generates example chroma sampling filter hint SEI messages.
+\\
+\Option{SEIChromaSamplingHorizontalFilterType} &
+\Default{2} &
+Defines the index of the chroma sampling horizontal filter:
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+  0 & Unspecified \\
+  1 & Filters signalled within the SEI message \\
+  2 & Filters as described by SMPTE RP 2050-1:2012\\
+\end{tabular}
+\\
+\Option{SEIChromaSamplingVerticalFilterType} &
+\Default{2} &
+Defines the index of the chroma sampling vertical filter:
+\par
+\begin{tabular}{cp{0.35\textwidth}}
+  0 & Unspecified \\
+  1 & Filters signalled within the SEI message \\
+  2 & Filters as described in the 5/3 filter description of ITU-T Rec. T.800 | ISO/IEC 15444-1\\
+\end{tabular}
+\\
+\end{OptionTableNoShorthand}
+
+
+
+\begin{OptionTableNoShorthand}{Knee function SEI message encoder parameters}{tab:sei-knee-function}
+\Option{SEIKneeFunctionInfo} &
+\Default{false} &
+Enables (true) or disables (false) the insertion of the Knee function SEI messages.
+\\
+\Option{SEIKneeFunctionId} &
+\Default{0} &
+Specifies Id of Knee function SEI message for a given session.
+\\
+\Option{SEIKneeFunctionCancelFlag} &
+\Default{false} &
+Indicates that Knee function SEI message cancels the persistance (true) or follows (false).
+\\
+\Option{SEIKneeFunctionPersistenceFlag} &
+\Default{true} &
+Specifies the persistence of the Knee function SEI message.
+\\
+\Option{SEIKneeFunctionInputDrange} &
+\Default{1000} &
+Specifies the peak luminance level for the input picture of Knee function SEI messages.
+\\
+\Option{SEIKneeFunctionInputDispLuminance} &
+\Default{100} &
+Specifies the expected display brightness for the input picture of Knee function SEI messages.
+\\
+\Option{SEIKneeFunctionOutputDrange} &
+\Default{4000} &
+Specifies the peak luminance level for the output picture of Knee function SEI messages.
+\\
+\Option{SEIKneeFunctionOutputDispLuminance} &
+\Default{800} &
+Specifies the expected display brightness for the output picture of Knee function SEI messages.
+\\
+\Option{SEIKneeFunctionNumKneePointsMinus1} &
+\Default{2} &
+Specifies the number of knee points - 1.
+\\
+\Option{SEIKneeFunctionInputKneePointValue} &
+\Default{} &
+Array of input knee point. Default table can be set to the following:
 \par
 \begin{tabular}{cp{0.45\textwidth}}
-  3 & Side by Side \\
-  4 & Top Bottom \\
-  5 & Frame Alternate \\
-\end{tabular}
-\\
-\Option{SEIFramePackingInterpretation} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates the constituent frames relationship in the Frame packing arrangement SEI message. 
-This option has no effect if SEIFramePacking is disabled.
+600 800 900
+\end{tabular}
+\\
+\Option{SEIKneeFunctionOutputKneePointValue} &
+\Default{} &
+Array of output knee point. Default table can be set to the following:
 \par
 \begin{tabular}{cp{0.45\textwidth}}
-  0 & Unspecified \\
-  1 & Frame 0 is associated with the left view of a stereo pair \\
-  2 & Frame 0 is associated with the right view of a stereo pair \\
-\end{tabular}
-\\
-\Option{SEIFramePackingQuincunx} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the quincunx_sampling signalling in the
-Frame packing arrangement SEI messages. This option has no
-effect if SEIFramePacking is disabled.
-\\
-\Option{SEIFramePackingId} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates the session number in the Frame packing arrangement
-SEI messages. This option has no effect if SEIFramePacking is
-disabled.
-\\
-\Option{SEIToneMappingInfo} &
-\ShortOption{\None} &
-\Default{0} &
-Enables or disables the insertion of the Tone Mapping SEI message.
-\\
-\Option{SEIToneMapId} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies Id of Tone Mapping SEI message for a given session.
-\\
-\Option{SEIToneMapCancelFlag} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates that Tone Mapping SEI message cancels the persistance or follows.
-\\
-\Option{SEIToneMapPersistenceFlag} &
-\ShortOption{\None} &
-\Default{1} &
-Specifies the persistence of the Tone Mapping SEI message.
-\\
-\Option{SEIToneMapCodedDataBitDepth} &
-\ShortOption{\None} &
-\Default{10} &
-Specifies Coded Data BitDepth of Tone Mapping SEI messages.
-\\
-\Option{SEIToneMapTargetBitDepth} &
-\ShortOption{\None} &
-\Default{8} &
-Specifies Output BitDepth of Tome mapping function.
-\\
-\Option{SEIToneMapModelId} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies Model utilized for mapping coded data into 
-target_bit_depth range.
-\par
-\begin{tabular}{cp{0.45\textwidth}}
-  0 & linear mapping with clipping \\
-  1 & sigmoidal mapping \\
-  2 & user-defined table mapping \\
-  3 & piece-wise linear mapping \\
-  4 & luminance dynamic range mapping \\
-\end{tabular}
-\\
-\Option{SEIToneMapMinValue} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies the minimum value in mode 0.
-\\
-\Option{SEIToneMapMaxValue} &
-\ShortOption{\None} &
-\Default{1023} &
-Specifies the maxmum value in mode 0.
-\\
-\Option{SEIToneMapSigmoidMidpoint} &
-\ShortOption{\None} &
-\Default{512} &
-Specifies the centre point in mode 1.
-\\
-\Option{SEIToneMapSigmoidWidth} &
-\ShortOption{\None} &
-\Default{960} &
-Specifies the distance between 5% and 95% values of 
-the target_bit_depth in mode 1.
-\\
-\Option{SEIToneMapStartOfCodedInterval} &
-\ShortOption{\None} &
-\Default{\None} &
-Array of user-defined mapping table. 
-Default table can be set to the following:
-\par
-\begin{tabular}{cp{0.45\textwidth}}
-0 12 24 36 48 60 72 84 96 108 120 132 144 156 168 180 
-192 192 196 204 208 216 220 228 232 240 248 252 260 264 
-272 276 284 292 292 296 300 304 308 312 320 324 328 332 
-336 344 348 352 356 360 368 372 376 380 384 388 396 400 
-404 408 412 420 424 428 432 436 444 444 444 448 452 456 
-460 464 468 472 476 476 480 484 488 492 496 500 504 508 
-508 512 516 520 524 528 532 536 540 540 544 548 552 556 
-560 564 568 572 572 576 580 584 588 592 596 600 604 604 
-608 612 616 620 624 628 632 636 636 640 644 648 652 656 
-660 664 668 672 672 672 676 680 680 684 688 692 692 696 
-700 704 704 708 712 716 716 720 724 724 728 732 736 736 
-740 744 748 748 752 756 760 760 764 768 768 772 776 780 
-780 784 788 792 792 796 800 804 804 808 812 812 816 820 
-824 824 828 832 836 836 840 844 848 848 852 856 860 860 
-860 864 864 868 872 872 876 880 880 884 884 888 892 892 
-896 900 900 904 908 908 912 912 916 920 920 924 928 928 
-932 936 936 940 940 944 948 948 952 956 956 960 964 964 
-968 968 972 976 976 980 984 984 988 992 992 996 996 1000 
-1004 1004 1008 1012 1012 1016 1020 1024
-\end{tabular}
-\\
-\Option{SEIToneMapNumPivots} &
-\ShortOption{\None} &
-\Default{5} &
-Specifies the number of pivot points in mode 3.
-\\
-\Option{SEIToneMapCodedPivotValue} &
-\ShortOption{\None} &
-\Default{\None} &
-Array of coded pivot point in mode 3.
-Default table can be set to the following:
-\par
-\begin{tabular}{cp{0.45\textwidth}}
-64 128 256 512 768
-\end{tabular}
-\\
-\Option{SEIToneMapTargetPivotValue} &
-\ShortOption{\None} &
-\Default{\None} &
-Array of target pivot point in mode 3.
-Default table can be set to the following:
-\par
-\begin{tabular}{cp{0.45\textwidth}}
-48 73 111 168 215
-\end{tabular}
-\\
-\Option{SEIToneMapCameraIsoSpeedIdc} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates the camera ISO speed for daylight illumination.
-\\
-\Option{SEIToneMapCameraIsoSpeedValue} &
-\ShortOption{\None} &
-\Default{400} &
-Specifies the camera ISO speed for daylight illumination of Extended_ISO.
-\\
-\Option{SEIToneMapExposureIndexIdc} &
-\ShortOption{\None} &
-\Default{0} &
-Indicates the exposure index setting of the camera.
-\\
-\Option{SEIToneMapExposureIndexValue} &
-\ShortOption{\None} &
-\Default{400} &
-Specifies the exposure index setting of the cameran of Extended_ISO.
-\\
-\Option{SEIToneMapExposureCompensationValueSignFlag} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies the sign of ExposureCompensationValue.
-\\
-\Option{SEIToneMapExposureCompensationValueNumerator} &
-\ShortOption{\None} &
-\Default{0} &
-Specifies the numerator of ExposureCompensationValue.
-\\
-\Option{SEIToneMapExposureCompensationValueDenomIdc} &
-\ShortOption{\None} &
-\Default{2} &
-Specifies the denominator of ExposureCompensationValue.
-\\
-\Option{SEIToneMapRefScreenLuminanceWhite} &
-\ShortOption{\None} &
-\Default{350} &
-Specifies reference screen brightness setting in units of candela per square metre.
-\\
-\Option{SEIToneMapExtendedRangeWhiteLevel} &
-\ShortOption{\None} &
-\Default{800} &
-Indicates the luminance dynamic range.
-\\
-\Option{SEIToneMapNominalBlackLevelLumaCodeValue} &
-\ShortOption{\None} &
-\Default{16} &
-Specifies luma sample value of the nominal black level assigned decoded pictures.
-\\
-\Option{SEIToneMapNominalWhiteLevelLumaCodeValue} &
-\ShortOption{\None} &
-\Default{235} &
-Specifies luma sample value of the nominal white level assigned decoded pictures.
-\\
-\Option{SEIToneMapExtendedWhiteLevelLumaCodeValue} &
-\ShortOption{\None} &
-\Default{300} &
-Specifies luma sample value of the extended dynamic range assigned decoded pictures.
-\\
-\end{OptionTable}
+100 250 450
+\end{tabular}
+\\
+\end{OptionTableNoShorthand}
+
+
+
+%\Option{SEITimeCode} &
+%\Default{false} &
+%When true, generate time code SEI messages.
+%\\
 
 %%
@@ -1865,24 +2608,4 @@
 \\
 
-HB_LAMBDA_FOR_LDC &
-on &
-use of B-style lambda for non-key pictures in low-delay mode
-\\
-
-GPB_SIMPLE &
-on &
-Fast estimation of generalized B in low-delay mode
-\\
-
-GPB_SIMPLE_UNI &
-on &
-Fast estimation of generalized B in low-delay mode for uni-direction
-\\
-
-FASTME_SMOOTHER_MV &
-on &
-Fast ME using smoother MV assumption
-\\
-
 ADAPT_SR_SCALE &
 on &
@@ -1890,8 +2613,4 @@
 \\
 
-CLIP_TO_709_RANGE &
-off &
-\\
-
 EARLY_SKIP_THRES &
 1.5 &
@@ -1912,4 +2631,5 @@
 \url{source/Lib/TLibCommon/TypeDef.h}.
 
+
 %%
 %%
@@ -1917,29 +2637,49 @@
 \clearpage
 \section{Using the decoder}
+\subsection{General}
 \begin{verbatim}
 TAppDecoder -b str.bin -o dec.yuv [options]
 \end{verbatim}
 
-\begin{OptionTable}{Decoder options}
-\Option{} &
-\ShortOption{-h} &
+\begin{OptionTableNoShorthand}{Decoder options}{tab:decoder-options}
+\Option{(--help)} &
+%\ShortOption{\None} &
 \Default{\None} &
 Prints usage information.
 \\
 
-\Option{} &
-\ShortOption{-o} &
+\Option{BitStreamFile (-b)} &
+%\ShortOption{-b} &
 \Default{\NotSet} &
-Defines reconstructed YUV file name.
-\\
-
-\Option{} &
-\ShortOption{-s} &
+Defines the input bit stream file name.
+\\
+
+\Option{ReconFile (-o)} &
+%\ShortOption{-o} &
+\Default{\NotSet} &
+Defines reconstructed YUV file name. If empty, no file is generated.
+\\
+
+\Option{SkipFrames (-s)} &
+%\ShortOption{-s} &
 \Default{0} &
 Defines the number of pictures in decoding order to skip.
 \\
 
-\Option{OutputBitDepth} &
-\ShortOption{-d} &
+\Option{MaxTemporalLayer (-t)} &
+%\ShortOption{-t} &
+\Default{-1} &
+Defines the maximum temporal layer to be decoded. If -1, then all layers are decoded.
+\\
+
+\Option{TarDecLayerIdSetFile (-l)} &
+%\ShortOption{-t} &
+\Default{\NotSet} &
+Specifies the targetDecLayerIdSet file name. The file would contain white-space separated LayerId values of the layers that are to be decoded.
+Omitting the parameter, or using a value of -1 in the file decodes all layers.
+\\
+
+\Option{OutputBitDepth (-d)} &
+%\ShortOption{-d} &
 \Default{0 \\ (Native)} &
 Specifies the luma bit-depth of the reconstructed YUV file (the value 0 indicates
@@ -1948,5 +2688,5 @@
 
 \Option{OutputBitDepthC} &
-\ShortOption{\None} &
+%\ShortOption{\None} &
 \Default{0 \\ (Native)} &
 Defines the chroma bit-depth of the reconstructed YUV file (the value 0 indicates
@@ -1954,6 +2694,6 @@
 \\
 
-\Option{SEIPictureDigest} &
-\ShortOption{\None} &
+\Option{SEIDecodedPictureHash} &
+%\ShortOption{\None} &
 \Default{1} &
 Enable or disable verification of any Picture hash SEI messages. When
@@ -1963,5 +2703,5 @@
 \begin{itemize}
 \item
-  If Picture hash SEI messages are included in the bitstream, the same type
+  If Picture hash SEI messages are included in the bit stream, the same type
   of hash is calculated for each decoded picture and written to the
   log together with an indication whether the calculted value matches
@@ -1985,6 +2725,12 @@
 \\
 
-\Option{RespectDefDispWindow} &
-\ShortOption{-w} &
+\Option{OutputDecodedSEIMessagesFilename} &
+%\ShortOption{\None} &
+\Default{\NotSet} &
+When a non-empty file name is specified, information regarding any decoded SEI messages will be output to the indicated file. If the file name is '-', then stdout is used instead.
+\\
+
+\Option{RespectDefDispWindow (-w)} &
+%\ShortOption{-w} &
 \Default{0} &
 Video region to be output by the decoder.
@@ -1996,5 +2742,33 @@
 \\
 
-\end{OptionTable}
+\Option{OutputColourSpaceConvert} &
+\Default{\NotSet} &
+Specifies the colour space conversion to apply to 444 video. Permitted values are:
+\par
+\begin{tabular}{lp{0.45\textwidth}}
+  UNCHANGED   & No colour space conversion is applied \\
+  YCrCbToYCbCr & Swap the second and third components \\
+  GBRtoRGB     & Reorder the three components \\
+\end{tabular}
+If no value is specified, no colour space conversion is applied. The list may eventually also include RGB to YCbCr or YCgCo conversions.\\
+\\
+
+\Option{SEINoDisplay} &
+\Default{false} &
+When true, do not output frames for which there is an SEI NoDisplay message.
+\\
+
+\Option{ClipOutputVideoToRec709Range} &
+%\ShortOption{\None} &
+\Default{0} &
+If 1 then clip output video to the Rec. 709 Range on saving when OutputBitDepth is less than InternalBitDepth.
+\\
+
+\end{OptionTableNoShorthand}
+
+
+\subsection{Using the decoder analyser}
+If the decoder is compiled with the macro RExt__DECODER_DEBUG_BIT_STATISTICS defined as 1 (either externally, or by editing TypeDef.h), the decoder will gather fractional bit counts associated with the different syntax elements, producing a table of the number of bits per syntax element, and where appropriate, according to block size and colour component/channel.
+The Linux makefile will compile both the analyser and standard version when the `all' or `everything' target is used (where the latter will also build  high-bit-depth executables).
 
 
