Changeset 1334 in 3DVCSoftware for branches/HTM-15.1-dev0-BBC/source/Lib/TLibEncoder

Timestamp:

22 Sep 2015, 23:25:33 (10 years ago)

Author:

tech

Message:

Alpha channel SEI modifications. On behalf of Matteo.

Location:

branches/HTM-15.1-dev0-BBC/source/Lib/TLibEncoder

Files:

• SEIwrite.cpp (modified) (4 diffs)
• SEIwrite.h (modified) (1 diff)

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

@@ -148 +148 @@
      xWriteSEISubBitstreamProperty(*static_cast<const SEISubBitstreamProperty*>(&sei));
      break; 
-#if NH_MV_SEI_TBD
    case SEI::ALPHA_CHANNEL_INFO:
      xWriteSEIAlphaChannelInfo(*static_cast<const SEIAlphaChannelInfo*>(&sei));
-     break; 
+     break;
+#if NH_MV_SEI_TBD
    case SEI::OVERLAY_INFO:
      xWriteSEIOverlayInfo(*static_cast<const SEIOverlayInfo*>(&sei));
@@ -977 +977 @@
   }
 };
-#if NH_MV_SEI_TBD
+
 Void SEIWriter::xWriteSEIAlphaChannelInfo( const SEIAlphaChannelInfo& sei)
 {
@@ -985 +985 @@
     WRITE_CODE( sei.m_alphaChannelUseIdc, 3, "alpha_channel_use_idc" );
     WRITE_CODE( sei.m_alphaChannelBitDepthMinus8, 3, "alpha_channel_bit_depth_minus8" );
-    WRITE_CODE( sei.m_alphaTransparentValue, getAlphaTransparentValueLen ), "alpha_transparent_value" );
-    WRITE_CODE( sei.m_alphaOpaqueValue, getAlphaOpaqueValueLen ), "alpha_opaque_value" );
+    WRITE_CODE( sei.m_alphaTransparentValue, sei.m_alphaChannelBitDepthMinus8+9, "alpha_transparent_value" );
+    WRITE_CODE( sei.m_alphaOpaqueValue, sei.m_alphaChannelBitDepthMinus8+9, "alpha_opaque_value" );
     WRITE_FLAG( ( sei.m_alphaChannelIncrFlag ? 1 : 0 ), "alpha_channel_incr_flag" );
     WRITE_FLAG( ( sei.m_alphaChannelClipFlag ? 1 : 0 ), "alpha_channel_clip_flag" );
@@ -996 +996 @@
 };
 
+#if NH_MV_SEI_TBD
 Void SEIWriter::xWriteSEIOverlayInfo( const SEIOverlayInfo& sei)
 {

branches/HTM-15.1-dev0-BBC/source/Lib/TLibEncoder/SEIwrite.h

@@ -93 +93 @@
 #endif
   Void xWriteSEISubBitstreamProperty          ( const SEISubBitstreamProperty& sei);
+  Void xWriteSEIAlphaChannelInfo              ( const SEIAlphaChannelInfo& sei);
 #if NH_MV_SEI_TBD
-  Void xWriteSEIAlphaChannelInfo              ( const SEIAlphaChannelInfo& sei);
   Void xWriteSEIOverlayInfo                   ( const SEIOverlayInfo& sei);
 #endif