Changeset 1337 in 3DVCSoftware for branches/HTM-15.1-dev0-Ericsson/source/Lib/TLibEncoder/SEIwrite.cpp

Timestamp:

23 Sep 2015, 18:32:42 (9 years ago)

Author:

ericsson

Message:

Integration of the 3D reference displays information SEI message.

File:

• branches/HTM-15.1-dev0-Ericsson/source/Lib/TLibEncoder/SEIwrite.cpp (modified) (4 diffs)

branches/HTM-15.1-dev0-Ericsson/source/Lib/TLibEncoder/SEIwrite.cpp

@@ -163 +163 @@
      xWriteSEIFrameFieldInfo(*static_cast<const SEIFrameFieldInfo*>(&sei));
      break; 
+#endif
    case SEI::THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO:
      xWriteSEIThreeDimensionalReferenceDisplaysInfo(*static_cast<const SEIThreeDimensionalReferenceDisplaysInfo*>(&sei));
      break; 
+ #if NH_MV_SEI_TBD
    case SEI::DEPTH_REPRESENTATION_INFO:
      xWriteSEIDepthRepresentationInfo(*static_cast<const SEIDepthRepresentationInfo*>(&sei));
@@ -1069 +1071 @@
   WRITE_FLAG( ( sei.m_ffinfoDuplicateFlag ? 1 : 0 ), "ffinfo_duplicate_flag" );
 };
+#endif
 
 Void SEIWriter::xWriteSEIThreeDimensionalReferenceDisplaysInfo( const SEIThreeDimensionalReferenceDisplaysInfo& sei)
@@ -1079 +1082 @@
   }
   WRITE_UVLC( sei.m_numRefDisplaysMinus1, "num_ref_displays_minus1" );
-  for( Int i = 0; i  <=  NumRefDisplaysMinus1( ); i++ )
+  for( Int i = 0; i  <=  sei.getNumRefDisplaysMinus1( ); i++ )
   {
     WRITE_UVLC( sei.m_leftViewId[i], "left_view_id" );
     WRITE_UVLC( sei.m_rightViewId[i], "right_view_id" );
     WRITE_CODE( sei.m_exponentRefDisplayWidth[i], 6, "exponent_ref_display_width" );
-    WRITE_CODE( sei.m_mantissaRefDisplayWidth[i], getMantissaRefDisplayWidthLen ), "mantissa_ref_display_width" );
+    WRITE_CODE( sei.m_mantissaRefDisplayWidth[i], sei.getMantissaReferenceDisplayWidthLen(i) , "mantissa_ref_display_width" );
     if( sei.m_refViewingDistanceFlag )
     {
       WRITE_CODE( sei.m_exponentRefViewingDistance[i], 6, "exponent_ref_viewing_distance" );
-      WRITE_CODE( sei.m_mantissaRefViewingDistance[i], getMantissaRefViewingDistanceLen ), "mantissa_ref_viewing_distance" );
+      WRITE_CODE( sei.m_mantissaRefViewingDistance[i], sei.getMantissaReferenceViewingDistanceLen(i), "mantissa_ref_viewing_distance" );
     }
     WRITE_FLAG( ( sei.m_additionalShiftPresentFlag[i] ? 1 : 0 ), "additional_shift_present_flag" );
-    if( sei.m_additionalShiftPresentFlag( i ) )
+    if( sei.m_additionalShiftPresentFlag[i] )
     {
       WRITE_CODE( sei.m_numSampleShiftPlus512[i], 10, "num_sample_shift_plus512" );
@@ -1099 +1102 @@
 };
 
+#if NH_MV_SEI_TBD
 Void SEIWriter::xWriteSEIDepthRepresentationInfo( const SEIDepthRepresentationInfo& sei)
 {