diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 02e61a854297a29f45a538010362ac56164b410a..c6f7c693ffa617d8564d41e59ec94af841350544 100755
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -1405,6 +1405,12 @@ Specifies the base value of the quantization parameter. If it is non-integer, th
Specifies a QP offset from the base QP value to be used for intra frames.
\\
+\Option{DepQuant} &
+%\ShortOption{\None} &
+\Default{true} &
+Enables or disables the usage of dependent quantization.
+\\
+
\Option{LambdaFromQpEnable} &
%\ShortOption{\None} &
\Default{false} &
@@ -1643,10 +1649,10 @@ value delta for the picture with POC value $n$.
\Option{PerceptQPA (-qpa)} &
%\ShortOption{-qpa} &
\Default{false} &
-Enables or disables the perceptually optimized QP adaptation (QPA) method described in JVET-H0047, JVET-K0206, and JVET-M0091. Use this together with 'SliceChromaQPOffsetPeriodicity=1' and, in case of HDR input, 'LumaLevelToDeltaQPMode=1' for best subjective quality. Cannot be used together with 'SelectiveRDOQ' (see above) or 'AdaptiveQp' (see below).
+Enables or disables the perceptually optimized QP adaptation (QPA) method described in JVET-H0047, JVET-K0206, and JVET-M0091. Use this together with 'SliceChromaQPOffsetPeriodicity=1' and, in case of HDR input, 'LumaLevelToDeltaQPMode=1' for best subjective quality. Cannot be used together with 'SelectiveRDOQ' (see above) or 'AdaptiveQP' (see below).
\\
-\Option{AdaptiveQp (-aq)} &
+\Option{AdaptiveQP (-aq)} &
%\ShortOption{-aq} &
\Default{false} &
Enables or disables the legacy QP adaptation method based upon a psycho-visual model.
@@ -2037,7 +2043,7 @@ Enables the use of weighted prediction in P slices.
Enables the use of weighted prediction in B slices.
\\
-\Option{WPMethod (-wpM)} &
+\Option{WeightedPredMethod (-wpM)} &
%\ShortOption{\-wpM} &
\Default{0} &
Sets the Weighted Prediction method to be used.
@@ -2063,16 +2069,6 @@ bitstream, but may be inferred from the parity of the sum of all nonzero
coefficients in the current coefficient group.
\\
-\Option{StrongIntraSmoothing (-sis)} &
-%\ShortOption{-sis} &
-\Default{true} &
-If enabled specifies that for 32x32 intra prediction block, the intra smoothing
-when applied is either the 1:2:1 smoothing filter or a stronger bi-linear
-interpolation filter. Key reference sample values are tested and if the criteria
-is satisfied, the stronger intra smoothing filter is applied.
-If disabled, the intra smoothing filter when applied is the 1:2:1 smoothing filter.
-\\
-
\Option{TMVPMode} &
%\ShortOption{\None} &
\Default{1} &
@@ -2479,7 +2475,7 @@ Signals whether colour_primaries, transfer_characteristics and matrix_coefficien
\Default{2} &
Indicates chromaticity coordinates of the source primaries.
\\
-\Option{TransferCharateristics} &
+\Option{TransferCharacteristics} &
\Default{2} &
Indicates the opto-electronic transfer characteristics of the source.
\\
@@ -2524,16 +2520,6 @@ input video from the conformance window in luma samples.
Must be a multiple of the chroma resolution (e.g. a multiple of two for 4:2:0).
\\
-\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.
@@ -2701,6 +2687,7 @@ The table below lists the SEI messages defined for Version 1 and Range-Extension
154 & Sphere rotation & Table \ref{tab:sei-sphere-rotation} \\
155 & Region-wise packing & Table \ref{tab:sei-rwp} \\
156 & Omni viewport & Table \ref{tab:sei-omni-viewport} \\
+ 168 & Frame-field information & Table \ref{tab:sei-frame-field} \\
203 & Subpicture Level Information & Table \ref{tab:sei-subpic-level} \\
204 & Sample Aspect Ratio Information & Table \ref{tab:sei-sari} \\
\end{SEIListTable}
@@ -3404,15 +3391,15 @@ Indicates that the sphere rotation SEI message cancels the persistence (true) or
\Default{false} &
Specifies the persistence of the sphere rotation SEI message.
\\
-\Option{SEISphereRotationYawRotation} &
+\Option{SEISphereRotationYaw} &
\Default{0} &
Specifies the value of the yaw rotation angle.
\\
-\Option{SEISphereRotationPitchRotation} &
+\Option{SEISphereRotationPitch} &
\Default{0} &
Specifies the value of the pitch rotation angle.
\\
-\Option{SEISphereRotationRollRotation} &
+\Option{SEISphereRotationRoll} &
\Default{0} &
Specifies the value of the roll rotation angle.
\\
@@ -3595,7 +3582,14 @@ Specifies the vertical size of the sample aspect ratio, if SEISARIAspectRatioIdc
\\
\end{OptionTableNoShorthand}
-\begin{OptionTableNoShorthand}{Sample Aspect Ratio Information SEI message encoder parameters}{tab:sei-subpic-level}
+\begin{OptionTableNoShorthand}{Frame-Field Information SEI message encoder parameters}{tab:sei-frame-field}
+\Option{SEIFrameFieldInfo} &
+\Default{false} &
+Enables (true) or disables (false) the insertion of Frame-Field Information SEI message.
+\\
+\end{OptionTableNoShorthand}
+
+\begin{OptionTableNoShorthand}{Subpicture Level Information SEI message encoder parameters}{tab:sei-subpic-level}
\Option{SEISubpictureLevelInfo} &
\Default{false} &
Enables (true) or disables (false) the insertion of Subpicture Level Information SEI message.
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index a8f331907a1ac682c383b2f8176966ea95009682..30e1bb073338abdf307d7f00d324749fa6747466 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1201,8 +1201,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("GOPSize,g", m_iGOPSize, 1, "GOP size of temporal structure")
("DRAPPeriod", m_drapPeriod, 0, "DRAP period in frames (0: disable Dependent RAP indication SEI messages)")
("ReWriteParamSets", m_rewriteParamSets, false, "Enable rewriting of Parameter sets before every (intra) random access point")
- //Alias with same name as in HM
- ("ReWriteParamSetsFlag", m_rewriteParamSets, false, "Alias for ReWriteParamSets")
("IDRRefParamList", m_idrRefParamList, false, "Enable indication of reference picture list syntax elements in slice headers of IDR pictures")
// motion search options
("DisableIntraInInter", m_bDisableIntraPUsInInterSlices, false, "Flag to disable intra PUs in inter slices")
@@ -1393,8 +1391,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
#if JVET_P0365_SCALING_MATRIX_LFNST
("DisableScalingMatrixForLFNST", m_disableScalingMatrixForLfnstBlks, true, "Disable scaling matrices, when enabled, for LFNST-coded blocks")
#endif
- ("DepQuant", m_depQuantEnabledFlag, true )
- ("SignHideFlag,-SBH", m_signDataHidingEnabledFlag, false )
+ ("DepQuant", m_depQuantEnabledFlag, true, "Enable dependent quantization (Default: 1)" )
+ ("SignHideFlag,-SBH", m_signDataHidingEnabledFlag, false, "Enable sign hiding" )
("MaxNumMergeCand", m_maxNumMergeCand, 5u, "Maximum number of merge candidates")
("MaxNumAffineMergeCand", m_maxNumAffineMergeCand, 5u, "Maximum number of affine merge candidates")
("MaxNumTriangleCand", m_maxNumTriangleCand, 5u, "Maximum number of triangle candidates")
@@ -4384,8 +4382,8 @@ void EncAppCfg::xPrintParameter()
{
msg(DETAILS, "[%d]th subpictures location :[%d %d]\n", i, m_subPicCtuTopLeftX[i], m_subPicCtuTopLeftY[i]);
msg(DETAILS, "[%d]th subpictures size :[%d %d]\n", i, m_subPicWidth[i], m_subPicHeight[i]);
- msg(DETAILS, "[%d]th subpictures treated as picture flag :%d\n", i, m_subPicTreatedAsPicFlag);
- msg(DETAILS, "loop filter cross [%d]th subpictures enabled flag :%d\n", i, m_loopFilterAcrossSubpicEnabledFlag);
+ msg(DETAILS, "[%d]th subpictures treated as picture flag :%d\n", i, m_subPicTreatedAsPicFlag[i]);
+ msg(DETAILS, "loop filter cross [%d]th subpictures enabled flag :%d\n", i, m_loopFilterAcrossSubpicEnabledFlag[i]);
}
}
@@ -4396,7 +4394,7 @@ void EncAppCfg::xPrintParameter()
for (int i = 0; i < m_numSubPics; i++)
{
msg(DETAILS, "[%d]th subpictures ID length :%d\n", i, m_subPicIdLen);
- msg(DETAILS, "[%d]th subpictures ID :%d\n", i, m_subPicId);
+ msg(DETAILS, "[%d]th subpictures ID :%d\n", i, m_subPicId[i]);
}
}
@@ -4454,7 +4452,7 @@ void EncAppCfg::xPrintParameter()
}
msg( DETAILS, "RateControl : %d\n", m_RCEnableRateControl );
- msg( DETAILS, "WPMethod : %d\n", int(m_weightedPredictionMethod));
+ msg( DETAILS, "WeightedPredMethod : %d\n", int(m_weightedPredictionMethod));
if(m_RCEnableRateControl)
{
diff --git a/source/Lib/CommonLib/HRD.h b/source/Lib/CommonLib/HRD.h
index 03b1cb81e66067852fa45273a09cfdbbe6e680ba..3a208e495ff6260678a0c4527343d8056e22cde0 100644
--- a/source/Lib/CommonLib/HRD.h
+++ b/source/Lib/CommonLib/HRD.h
@@ -44,7 +44,6 @@ protected:
bool m_timingInfoPresentFlag;
uint32_t m_numUnitsInTick;
uint32_t m_timeScale;
- bool m_pocProportionalToTimingFlag;
int m_numTicksPocDiffOneMinus1;
public:
@@ -52,7 +51,6 @@ public:
: m_timingInfoPresentFlag (false)
, m_numUnitsInTick (1001)
, m_timeScale (60000)
- , m_pocProportionalToTimingFlag(false)
, m_numTicksPocDiffOneMinus1 (0)
{}
@@ -64,9 +62,6 @@ public:
void setTimeScale( uint32_t value ) { m_timeScale = value; }
uint32_t getTimeScale( ) const { return m_timeScale; }
- void setPocProportionalToTimingFlag(bool x) { m_pocProportionalToTimingFlag = x; }
- bool getPocProportionalToTimingFlag( ) const { return m_pocProportionalToTimingFlag; }
-
void setNumTicksPocDiffOneMinus1(int x) { m_numTicksPocDiffOneMinus1 = x; }
int getNumTicksPocDiffOneMinus1( ) const { return m_numTicksPocDiffOneMinus1; }
};