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

Timestamp:

20 Aug 2015, 19:49:34 (10 years ago)

Author:

seregin

Message:

port rev 4593

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (1 diff)
• TDecGop.cpp (modified) (4 diffs)

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

@@ -520 +520 @@
   UInt val;
   sei_read_code( pDecodedMessageOutputStream, 8, val, "hash_type");
-  sei.method = static_cast<SEIDecodedPictureHash::Method>(val); bytesRead++;
+  sei.method = static_cast<HashType>(val); bytesRead++;
 
   const TChar *traceString="\0";
   switch (sei.method)
   {
-    case SEIDecodedPictureHash::MD5: traceString="picture_md5"; break;
-    case SEIDecodedPictureHash::CRC: traceString="picture_crc"; break;
-    case SEIDecodedPictureHash::CHECKSUM: traceString="picture_checksum"; break;
+    case HASHTYPE_MD5: traceString="picture_md5"; break;
+    case HASHTYPE_CRC: traceString="picture_crc"; break;
+    case HASHTYPE_CHECKSUM: traceString="picture_checksum"; break;
     default: assert(false); break;
   }

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

@@ -95 +95 @@
 #if SVC_EXTENSION
 Void TDecGop::init( TDecTop**               ppcDecTop,
-                   TDecEntropy*             pcEntropyDecoder,
+                    TDecEntropy*            pcEntropyDecoder,
 #else
 Void TDecGop::init( TDecEntropy*            pcEntropyDecoder,
@@ -290 +290 @@
     switch (pictureHashSEI->method)
     {
-      case SEIDecodedPictureHash::MD5:
+      case HASHTYPE_MD5:
         {
           hashType = "MD5";
@@ -296 +296 @@
           break;
         }
-      case SEIDecodedPictureHash::CRC:
+      case HASHTYPE_CRC:
         {
           hashType = "CRC";
@@ -302 +302 @@
           break;
         }
-      case SEIDecodedPictureHash::CHECKSUM:
+      case HASHTYPE_CHECKSUM:
         {
           hashType = "Checksum";