From 49ecbf50a71e8cdb89ba3d1e4f3742bbf7f1aa8f Mon Sep 17 00:00:00 2001
From: Seungsoo <ss00.jeong@samsung.com>
Date: Fri, 5 Apr 2019 15:42:51 +0900
Subject: [PATCH] software-manual.tex and related source code are changed.
---
doc/software-manual.tex | 6 ++++++
source/App/EncoderApp/EncAppCfg.cpp | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index cbe8e48afd..9f4991ca9a 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -1228,6 +1228,12 @@ Specifies the maximum number of merge candidates to use.
Flag to disable intra PUs in inter slices.
\\
+\Option{MMVD} &
+%\ShortOption{\None} &
+\Default{1} &
+Flag to enable MMVD in inter slices.
+\\
+
\Option{MmvdDisNum} &
%\ShortOption{\None} &
\Default{6} &
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 4e11826555..2d4198e430 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -836,7 +836,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("DualITree", m_dualTree, false, "Use separate QTBT trees for intra slice luma and chroma channel types")
("SubPuMvp", m_SubPuMvpMode, 0, "Enable Sub-PU temporal motion vector prediction (0:off, 1:ATMVP, 2:STMVP, 3:ATMVP+STMVP) [default: off]")
#if JVET_N0127_MMVD_SPS_FLAG
- ("MMVD", m_MMVD, false, "Merge mode with Motion Vector Difference")
+ ("MMVD", m_MMVD, true, "Enable Merge mode with Motion Vector Difference (0:off, 1:on) [default: 1]")
#endif
("Affine", m_Affine, false, "Enable affine prediction (0:off, 1:on) [default: off]")
("AffineType", m_AffineType, true, "Enable affine type prediction (0:off, 1:on) [default: on]" )
--
GitLab