Changeset 1343 in 3DVCSoftware for branches/HTM-15.1-dev0-Disney/source/Lib/TLibDecoder/SEIread.cpp

Timestamp:

2 Oct 2015, 16:44:04 (9 years ago)

Author:

disney-htm

Message:

Disney's part of AlternativeDepthInfo SEI message integrated

File:

• branches/HTM-15.1-dev0-Disney/source/Lib/TLibDecoder/SEIread.cpp (modified) (5 diffs)

branches/HTM-15.1-dev0-Disney/source/Lib/TLibDecoder/SEIread.cpp

@@ -387 +387 @@
       xParseSEIMultiviewViewPosition((SEIMultiviewViewPosition&) *sei, payloadSize, pDecodedMessageOutputStream );
       break;
-#if NH_MV_TBD
     case SEI::ALTERNATIVE_DEPTH_INFO:
       sei = new SEIAlternativeDepthInfo;
       xParseSEIAlternativeDepthInfo((SEIAlternativeDepthInfo&) *sei, payloadSize, pDecodedMessageOutputStream );
       break;
-#endif
 #endif
     default:
@@ -1692 +1690 @@
 };
 
-#if NH_MV_SEI_TBD
+
 Void SEIReader::xParseSEIAlternativeDepthInfo(SEIAlternativeDepthInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
 {
   UInt code;
+  Int scode;
   output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
 
@@ -1702 +1701 @@
   {
     sei_read_code( pDecodedMessageOutputStream, 2, code, "depth_type" ); sei.m_depthType = code;
+#if NH_MV_SEI_TBD
     if( sei.m_depthType  ==  0 )
     {
@@ -1774 +1774 @@
       }
     }
+#endif
+
     if( sei.m_depthType  ==  1 )
     {
-      sei_read_svlc( pDecodedMessageOutputStream, code, "min_offset_x_int" ); sei.m_minOffsetXInt = code;
+      sei_read_svlc( pDecodedMessageOutputStream, scode, "min_offset_x_int" ); sei.m_minOffsetXInt = scode;
       sei_read_code( pDecodedMessageOutputStream, 8, code, "min_offset_x_frac" ); sei.m_minOffsetXFrac = code;
-      sei_read_svlc( pDecodedMessageOutputStream, code, "max_offset_x_int" ); sei.m_maxOffsetXInt = code;
+      sei_read_svlc( pDecodedMessageOutputStream, scode, "max_offset_x_int" ); sei.m_maxOffsetXInt = scode;
       sei_read_code( pDecodedMessageOutputStream, 8, code, "max_offset_x_frac" ); sei.m_maxOffsetXFrac = code;
       sei_read_flag( pDecodedMessageOutputStream, code, "offset_y_present_flag" ); sei.m_offsetYPresentFlag = (code == 1);
       if( sei.m_offsetYPresentFlag )
       {
-        sei_read_svlc( pDecodedMessageOutputStream, code, "min_offset_y_int" ); sei.m_minOffsetYInt = code;
+        sei_read_svlc( pDecodedMessageOutputStream, scode, "min_offset_y_int" ); sei.m_minOffsetYInt = scode;
         sei_read_code( pDecodedMessageOutputStream, 8, code, "min_offset_y_frac" ); sei.m_minOffsetYFrac = code;
-        sei_read_svlc( pDecodedMessageOutputStream, code, "max_offset_y_int" ); sei.m_maxOffsetYInt = code;
+        sei_read_svlc( pDecodedMessageOutputStream, scode, "max_offset_y_int" ); sei.m_maxOffsetYInt = scode;
         sei_read_code( pDecodedMessageOutputStream, 8, code, "max_offset_y_frac" ); sei.m_maxOffsetYFrac = code;
       }
@@ -1797 +1799 @@
   }
 };
-#endif
+
 
 //! \}