Merge pull request #181 from adamjw24/develop_minor_fixes

Deprecating the gopsize parameter. Marking DTS as correctly set
fraunhoferhhi · Jul 21, 2022 · 5765352 · 5765352
2 parents 3dd31e0 + efea44f
commit 5765352
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
@@ -2022,6 +2022,7 @@ void EncGOP::xWritePicture( Picture& pic, AccessUnitList& au, bool isEncodeLtRef
     au.cts      = pic.cts;
     au.ctsValid = pic.ctsValid;
     au.dts      = ( ( iDiffFrames - m_pcEncCfg->m_maxTLayer ) * m_ticksPerFrameMul4 ) / 4 + au.cts;
+    au.dtsValid = pic.ctsValid;
   }
 
   pic.actualTotalBits += xWriteParameterSets( pic, au, m_HLSWriter );

diff --git a/source/Lib/apputils/VVEncAppCfg.cpp b/source/Lib/apputils/VVEncAppCfg.cpp
@@ -537,7 +537,6 @@ int VVEncAppCfg::parse( int argc, char* argv[], vvenc_config* c, std::ostream& r
     ("qp,q",                                            c->m_QP,                                             "quantization parameter, QP (0-63)")
     ("qpa",                                             toQPA,                                               "Enable perceptually motivated QP adaptation, XPSNR based (0:off, 1:on)", true)
     ("threads,t",                                       c->m_numThreads,                                     "Number of threads default: [size < 720p: 4, >= 720p: 8]")
-    ("gopsize,g",                                       c->m_GOPSize,                                        "GOP size of temporal structure (16,32)")
     ("refreshtype,-rt",                                 toDecRefreshType,                                    "intra refresh type (idr,cra,idr2,cra_cre - CRA with constrained encoding for RASL pictures)")
     ("refreshsec,-rs",                                  c->m_IntraPeriodSec,                                 "Intra period/refresh in seconds")
     ("intraperiod,-ip",                                 c->m_IntraPeriod,                                    "Intra period in frames (0: use intra period in seconds (refreshsec), else: n*gopsize)")
@@ -618,6 +617,9 @@ int VVEncAppCfg::parse( int argc, char* argv[], vvenc_config* c, std::ostream& r
     ("vuiparameterspresent,-vui",                       toVui,                                              "Emit VUI information (auto(-1),off(0),on(1); default: auto - only if needed by dependent options)", true)
     ("hrdparameterspresent,-hrd",                       c->m_hrdParametersPresent,                          "Emit VUI HRD information (0: off, 1: on; default: 1)")
     ("decodedpicturehash,-dph",                         toHashType,                                         "Control generation of decode picture hash SEI messages, (0:off, 1:md5, 2:crc, 3:checksum)")
+    // --> deprecated
+    ("gopsize,g",                                       c->m_GOPSize,                                       "GOP size of temporal structure (16,32) (deprecated)")
+    // <-- deprecated
     ;
   }
 
@@ -1137,6 +1139,11 @@ int VVEncAppCfg::parse( int argc, char* argv[], vvenc_config* c, std::ostream& r
       }
     }
 
+    if( m_easyMode && c->m_GOPSize != 32 )
+    {
+      err.warn( "deprecated option" ) << "--gopsize option is deprecated as it is not needed anymore (auto adapted by arbitrary intra period)\n";
+    }
+
     for( auto& a : argv_unhandled )
     {
       rcOstr << "Unknown argument: '" << a << "'\n";