Changeset 1301 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

21 Jul 2015, 00:19:48 (10 years ago)

Author:

seregin

Message:

port rev 4339 and rev 4340

Location:

branches/SHM-dev/source/App

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (4 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -83 +83 @@
   string cfg_TargetDecLayerIdSetFile;
   string outputColourSpaceConvert;
+  Int warnUnknowParameter = 0;
 
   po::Options opts;
@@ -107 +108 @@
                                                                                    "YUV writing is skipped if omitted")
 #endif
-
+  ("WarnUnknowParameter,w",     warnUnknowParameter,                                  0, "warn for unknown configuration parameters instead of failing")
   ("SkipFrames,s",              m_iSkipFrame,                          0,          "number of frames to skip before random access")
   ("OutputBitDepth,d",          m_outputBitDepth[CHANNEL_TYPE_LUMA],   0,          "bit depth of YUV output luma component (default: use 0 for native depth)")
@@ -131 +132 @@
 
   po::setDefaults(opts);
-  const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv);
+  po::ErrorReporter err;
+  const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv, err);
 
   for (list<const Char*>::const_iterator it = argv_unhandled.begin(); it != argv_unhandled.end(); it++)
@@ -142 +144 @@
     po::doHelp(cout, opts);
     return false;
+  }
+
+  if (err.is_errored)
+  {
+    if (!warnUnknowParameter)
+    {
+      /* errors have already been reported to stderr */
+      return false;
+    }
   }
 

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1024 +1024 @@
   SMultiValueInput<Int>  cfg_timeCodeSeiTimeOffsetLength     (0, 31, 0, MAX_TIMECODE_SEI_SETS);
   SMultiValueInput<Int>  cfg_timeCodeSeiTimeOffsetValue      (std::numeric_limits<Int>::min(), std::numeric_limits<Int>::max(), 0, MAX_TIMECODE_SEI_SETS);
+  Int warnUnknowParameter = 0;
 
 #if Q0096_OVERLAY_SEI
@@ -1045 +1046 @@
   ("help",                                            do_help,                                          false, "this help text")
   ("c",    po::parseConfigFile, "configuration file name")
+  ("WarnUnknowParameter,w",                           warnUnknowParameter,                                  0, "warn for unknown configuration parameters instead of failing")
 
   // File, I/O and source parameters
@@ -1688 +1690 @@
 
   po::setDefaults(opts);
-  const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv);
+  po::ErrorReporter err;
+  const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv, err);
 
 #if SVC_EXTENSION
@@ -1720 +1723 @@
     po::doHelp(cout, opts);
     return false;
+  }
+
+  if (err.is_errored)
+  {
+    if (!warnUnknowParameter)
+    {
+      /* error report has already been printed on stderr */
+      return false;
+    }
   }