From 21c545042745b9ec86057cd7c46fd54a45d672dd Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 17 May 2021 16:33:59 +0200
Subject: [PATCH] Change default for ConformanceWindowMode to "1" (automatic
padding)
---
doc/software-manual.tex | 2 +-
source/App/EncoderApp/EncAppCfg.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 5f6da0766..ec70cb49b 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -784,7 +784,7 @@ When 1, CABAC zero word padding will be enabled. This is currently not the defau
\Option{ConformanceWindowMode} &
%\ShortOption{\None} &
-\Default{0} &
+\Default{1} &
Specifies how the parameters related to the conformance window are interpreted (cropping/padding).
The following modes are available:
\par
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 08fb2edf2..6f9a938c7 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -739,7 +739,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("PrintWPSNR", m_printWPSNR, false, "0 (default) do not print HDR-PQ based wPSNR, 1 = print HDR-PQ based wPSNR")
("CabacZeroWordPaddingEnabled", m_cabacZeroWordPaddingEnabled, true, "0 do not add conforming cabac-zero-words to bit streams, 1 (default) = add cabac-zero-words as required")
("ChromaFormatIDC,-cf", tmpChromaFormat, 0, "ChromaFormatIDC (400|420|422|444 or set 0 (default) for same as InputChromaFormat)")
- ("ConformanceWindowMode", m_conformanceWindowMode, 0, "Window conformance mode (0: no window, 1:automatic padding, 2:padding parameters specified, 3:conformance window parameters specified")
+ ("ConformanceWindowMode", m_conformanceWindowMode, 1, "Window conformance mode (0: no window, 1:automatic padding (default), 2:padding parameters specified, 3:conformance window parameters specified")
("HorizontalPadding,-pdx", m_sourcePadding[0], 0, "Horizontal source padding for conformance window mode 2")
("VerticalPadding,-pdy", m_sourcePadding[1], 0, "Vertical source padding for conformance window mode 2")
("ConfWinLeft", m_confWinLeft, 0, "Left offset for window conformance mode 3")
--
GitLab