Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp

Timestamp:

14 Jul 2015, 00:26:07 (9 years ago)

Author:

seregin

Message:

port rev 4240

File:

• branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp (modified) (11 diffs)

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

@@ -66 +66 @@
 {
   READ_CODE(uiLength, ruiCode, pSymbolName);
-  if (pOS)      (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  if (pOS)
+  {
+    (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  }
 }
 
@@ -72 +75 @@
 {
   READ_UVLC(ruiCode, pSymbolName);
-  if (pOS)      (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  if (pOS)
+  {
+    (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  }
 }
 
@@ -78 +84 @@
 {
   READ_SVLC(ruiCode, pSymbolName);
-  if (pOS)      (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  if (pOS)
+  {
+    (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << ruiCode << "\n";
+  }
 }
 
@@ -84 +93 @@
 {
   READ_FLAG(ruiCode, pSymbolName);
-  if (pOS)      (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << (ruiCode?1:0) << "\n";
+  if (pOS)
+  {
+    (*pOS) << "  " << std::setw(55) << pSymbolName << ": " << (ruiCode?1:0) << "\n";
+  }
 }
 
@@ -124 +136 @@
     * in the parsing if bitstream not byte-aligned */
     assert(!m_pcBitstream->getNumBitsUntilByteAligned());
-  } while (m_pcBitstream->getNumBitsLeft() > 8);
+  }
+  while (m_pcBitstream->getNumBitsLeft() > 8);
 
   UInt rbspTrailingBits;
@@ -490 +503 @@
   for (UInt i = 0; i < sei.userDataLength; i++)
   {
-    sei_read_code( pDecodedMessageOutputStream, 8, val, "user_data" );
+    sei_read_code( NULL, 8, val, "user_data_payload_byte" );
     sei.userData[i] = val;
+  }
+  if (pDecodedMessageOutputStream)
+  {
+    (*pDecodedMessageOutputStream) << "  User data payload size: " << sei.userDataLength << "\n";
   }
 }
@@ -517 +534 @@
   }
 
-  if (pDecodedMessageOutputStream) (*pDecodedMessageOutputStream) << "  " << std::setw(55) << traceString << ": " << std::hex << std::setfill('0');
+  if (pDecodedMessageOutputStream)
+  {
+    (*pDecodedMessageOutputStream) << "  " << std::setw(55) << traceString << ": " << std::hex << std::setfill('0');
+  }
 
   sei.m_digest.hash.clear();
@@ -524 +544 @@
     sei_read_code( NULL, 8, val, traceString);
     sei.m_digest.hash.push_back((UChar)val);
-    if (pDecodedMessageOutputStream) (*pDecodedMessageOutputStream) << std::setw(2) << val;
-  }
-
-  if (pDecodedMessageOutputStream) (*pDecodedMessageOutputStream) << std::dec << std::setfill(' ') << "\n";
+    if (pDecodedMessageOutputStream)
+    {
+      (*pDecodedMessageOutputStream) << std::setw(2) << val;
+    }
+  }
+
+  if (pDecodedMessageOutputStream)
+  {
+    (*pDecodedMessageOutputStream) << std::dec << std::setfill(' ') << "\n";
+  }
 }
 
@@ -1106 +1132 @@
 
   // read nested SEI messages
-  do {
+  do
+  {
 #if O0164_MULTI_LAYER_HRD
 #if LAYERS_NOT_PRESENT_SEI
@@ -1122 +1149 @@
   } while (m_pcBitstream->getNumBitsLeft() > 8);
 
-  if (pDecodedMessageOutputStream) (*pDecodedMessageOutputStream) << "End of scalable nesting SEI message\n";
+  if (pDecodedMessageOutputStream)
+  {
+    (*pDecodedMessageOutputStream) << "End of scalable nesting SEI message\n";
+  }
 }
 
@@ -1216 +1246 @@
             sei_read_flag( pDecodedMessageOutputStream, code, "hours_flag"); currentTimeSet.hoursFlag = code;
             if(currentTimeSet.hoursFlag)
+            {
               sei_read_code( pDecodedMessageOutputStream, 5, code, "hours_value"); currentTimeSet.hoursValue = code;
+            }
           }
         }