Changeset 1292 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

18 Jul 2015, 04:14:13 (10 years ago)

Author:

seregin

Message:

port rev 4326

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecTop.cpp (modified) (1 diff)
• TAppDecTop.h (modified) (1 diff)
• decmain.cpp (modified) (5 diffs)

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

@@ -66 +66 @@
 #endif
 {
+  memset( m_apcTDecTop, NULL, sizeof(m_apcTDecTop) );
+
   for(UInt layer=0; layer < MAX_LAYERS; layer++)
   {

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h

@@ -95 +95 @@
   Void  destroy           (); ///< destroy internal members
   Void  decode            (); ///< main decoding function
+#if SVC_EXTENSION
+  UInt  getNumberOfChecksumErrorsDetected() const
+  { 
+    UInt sum = 0;
+
+    for( UInt layerId = 0; layerId < MAX_NUM_LAYER_IDS; layerId++ )
+    {
+      if( m_apcTDecTop[layerId] )
+      {
+        sum += m_apcTDecTop[layerId]->getNumberOfChecksumErrorsDetected();
+      }
+    }
+
+    return sum;
+  }
+#else
+  UInt  getNumberOfChecksumErrorsDetected() const { return m_cTDecTop.getNumberOfChecksumErrorsDetected(); }
+#endif
 
 protected:

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

@@ -44 +44 @@
 //! \{
 
-Bool g_md5_mismatch = false; ///< top level flag that indicates if there has been a decoding mismatch
-
 // ====================================================================================================================
 // Main function
@@ -52 +50 @@
 int main(int argc, char* argv[])
 {
+  Int returnCode = EXIT_SUCCESS;
   TAppDecTop  cTAppDecTop;
 
@@ -73 +72 @@
   {
     cTAppDecTop.destroy();
-    return 1;
+    returnCode = EXIT_FAILURE;
+    return returnCode;
   }
 
@@ -83 +83 @@
   cTAppDecTop.decode();
 
-  if (g_md5_mismatch)
+  if (cTAppDecTop.getNumberOfChecksumErrorsDetected() != 0)
   {
     printf("\n\n***ERROR*** A decoding mismatch occured: signalled md5sum does not match\n");
+    returnCode = EXIT_FAILURE;
   }
 
@@ -95 +96 @@
   cTAppDecTop.destroy();
 
-  return g_md5_mismatch ? EXIT_FAILURE : EXIT_SUCCESS;
+  return returnCode;
 }