Changeset 1273 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

15 Jul 2015, 20:51:59 (10 years ago)

Author:

seregin

Message:

port rev 4306 and rev 4307

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (3 diffs)
• TDecGop.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

@@ -341 +341 @@
 #endif
 #if SUB_BITSTREAM_PROPERTY_SEI
-   case SEI::SUB_BITSTREAM_PROPERTY:
-     sei = new SEISubBitstreamProperty;
-     xParseSEISubBitstreamProperty((SEISubBitstreamProperty&) *sei, vps, pDecodedMessageOutputStream);
-     break;
+    case SEI::SUB_BITSTREAM_PROPERTY:
+      sei = new SEISubBitstreamProperty;
+      xParseSEISubBitstreamProperty((SEISubBitstreamProperty&) *sei, vps, pDecodedMessageOutputStream);
+      break;
 #endif
 #if O0164_MULTI_LAYER_HRD
-   case SEI::BSP_NESTING:
-     sei = new SEIBspNesting;
+    case SEI::BSP_NESTING:
+      sei = new SEIBspNesting;
 #if LAYERS_NOT_PRESENT_SEI
-     xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, vps, sps, *nestingSei, pDecodedMessageOutputStream);
-#else
-     xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, sps, *nestingSei, pDecodedMessageOutputStream);
-#endif
-     break;
-   case SEI::BSP_INITIAL_ARRIVAL_TIME:
-     sei = new SEIBspInitialArrivalTime;
-     xParseSEIBspInitialArrivalTime((SEIBspInitialArrivalTime&) *sei, vps, sps, *nestingSei, *bspNestingSei, pDecodedMessageOutputStream);
-     break;
+      xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, vps, sps, *nestingSei, pDecodedMessageOutputStream);
+#else
+      xParseSEIBspNesting((SEIBspNesting&) *sei, nalUnitType, sps, *nestingSei, pDecodedMessageOutputStream);
+#endif
+      break;
+    case SEI::BSP_INITIAL_ARRIVAL_TIME:
+      sei = new SEIBspInitialArrivalTime;
+      xParseSEIBspInitialArrivalTime((SEIBspInitialArrivalTime&) *sei, vps, sps, *nestingSei, *bspNestingSei, pDecodedMessageOutputStream);
+      break;
 #endif
 #if Q0189_TMVP_CONSTRAINTS
-   case SEI::TMVP_CONSTRAINTS:
-     sei =  new SEITMVPConstrains;
-     xParseSEITMVPConstraints((SEITMVPConstrains&) *sei, payloadSize, pDecodedMessageOutputStream);
-     break;
+    case SEI::TMVP_CONSTRAINTS:
+      sei =  new SEITMVPConstrains;
+      xParseSEITMVPConstraints((SEITMVPConstrains&) *sei, payloadSize, pDecodedMessageOutputStream);
+      break;
 #endif
 #if Q0247_FRAME_FIELD_INFO
-   case SEI::FRAME_FIELD_INFO:
-     sei =  new SEIFrameFieldInfo;
-     xParseSEIFrameFieldInfo    ((SEIFrameFieldInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
-     break;
+    case SEI::FRAME_FIELD_INFO:
+      sei =  new SEIFrameFieldInfo;
+      xParseSEIFrameFieldInfo    ((SEIFrameFieldInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
+      break;
 #endif
 #if P0123_ALPHA_CHANNEL_SEI
-   case SEI::ALPHA_CHANNEL_INFO:
-     sei = new SEIAlphaChannelInfo;
-     xParseSEIAlphaChannelInfo((SEIAlphaChannelInfo &) *sei, payloadSize, pDecodedMessageOutputStream);
-     break;
+    case SEI::ALPHA_CHANNEL_INFO:
+      sei = new SEIAlphaChannelInfo;
+      xParseSEIAlphaChannelInfo((SEIAlphaChannelInfo &) *sei, payloadSize, pDecodedMessageOutputStream);
+      break;
 #endif
 #if Q0096_OVERLAY_SEI
-   case SEI::OVERLAY_INFO:
-     sei = new SEIOverlayInfo;
-     xParseSEIOverlayInfo((SEIOverlayInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
-     break;
+    case SEI::OVERLAY_INFO:
+      sei = new SEIOverlayInfo;
+      xParseSEIOverlayInfo((SEIOverlayInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
+      break;
 #endif
 #endif //SVC_EXTENSION
-   default:
-     for (UInt i = 0; i < payloadSize; i++)
-     {
-       UInt seiByte;
-       sei_read_code (NULL, 8, seiByte, "unknown prefix SEI payload byte");
-     }
-     printf ("Unknown prefix SEI message (payloadType = %d) was found!\n", payloadType);
-     if (pDecodedMessageOutputStream)
-     {
-       (*pDecodedMessageOutputStream) << "Unknown prefix SEI message (payloadType = " << payloadType << ") was found!\n";
-     }
-     break;
+    default:
+      for (UInt i = 0; i < payloadSize; i++)
+      {
+        UInt seiByte;
+        sei_read_code (NULL, 8, seiByte, "unknown prefix SEI payload byte");
+      }
+      printf ("Unknown prefix SEI message (payloadType = %d) was found!\n", payloadType);
+      if (pDecodedMessageOutputStream)
+      {
+        (*pDecodedMessageOutputStream) << "Unknown prefix SEI message (payloadType = " << payloadType << ") was found!\n";
+      }
+      break;
     }
   }
@@ -539 +539 @@
   }
 
-  sei.m_digest.hash.clear();
+  sei.m_pictureHash.hash.clear();
   for(;bytesRead < payloadSize; bytesRead++)
   {
     sei_read_code( NULL, 8, val, traceString);
-    sei.m_digest.hash.push_back((UChar)val);
+    sei.m_pictureHash.hash.push_back((UChar)val);
     if (pDecodedMessageOutputStream)
     {
@@ -858 +858 @@
         sei.m_duCommonCpbRemovalDelayMinus1 = code;
       }
-      if( sei.m_numNalusInDuMinus1 != NULL )
-      {
-        delete sei.m_numNalusInDuMinus1;
-      }
-      sei.m_numNalusInDuMinus1 = new UInt[ ( sei.m_numDecodingUnitsMinus1 + 1 ) ];
-      if( sei.m_duCpbRemovalDelayMinus1  != NULL )
-      {
-        delete sei.m_duCpbRemovalDelayMinus1;
-      }
-      sei.m_duCpbRemovalDelayMinus1  = new UInt[ ( sei.m_numDecodingUnitsMinus1 + 1 ) ];
+      sei.m_numNalusInDuMinus1.resize(sei.m_numDecodingUnitsMinus1 + 1 );
+      sei.m_duCpbRemovalDelayMinus1.resize( sei.m_numDecodingUnitsMinus1 + 1 );
 
       for( i = 0; i <= sei.m_numDecodingUnitsMinus1; i ++ )

branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp

@@ -278 +278 @@
 {
   /* calculate MD5sum for entire reconstructed picture */
-  TComDigest recon_digest;
+  TComPictureHash recon_digest;
   Int numChar=0;
   const Char* hashType = "\0";
@@ -319 +319 @@
   {
     ok = "(OK)";
-    if (recon_digest != pictureHashSEI->m_digest)
+    if (recon_digest != pictureHashSEI->m_pictureHash)
     {
       ok = "(***ERROR***)";
@@ -326 +326 @@
   }
 
-  printf("[%s:%s,%s] ", hashType, digestToString(recon_digest, numChar).c_str(), ok);
+  printf("[%s:%s,%s] ", hashType, hashToString(recon_digest, numChar).c_str(), ok);
 
   if (mismatch)
   {
     g_md5_mismatch = true;
-    printf("[rx%s:%s] ", hashType, digestToString(pictureHashSEI->m_digest, numChar).c_str());
-  }
-}
-
+    printf("[rx%s:%s] ", hashType, hashToString(pictureHashSEI->m_pictureHash, numChar).c_str());
+  }
+}
 //! \}