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

Timestamp:

31 Oct 2014, 18:18:38 (11 years ago)

Author:

seregin

Message:

Overlay SEI with macro Q0096_OVERLAY_SEI, patch was provided by Nikolce Stefanoski <stefanos@…>

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (3 diffs)
• SEIread.h (modified) (1 diff)
• SyntaxElementParser.cpp (modified) (2 diffs)
• SyntaxElementParser.h (modified) (4 diffs)

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

@@ -146 +146 @@
     break;
 #endif
+#if Q0096_OVERLAY_SEI
+  case SEI::OVERLAY_INFO:
+    fprintf( g_hTrace, "=========== Overlay Information SEI message ===========\n");
+    break;
+#endif
 #endif //SVC_EXTENSION
   default:
@@ -412 +417 @@
      break;
 #endif
+#if Q0096_OVERLAY_SEI
+   case SEI::OVERLAY_INFO:
+     sei = new SEIOverlayInfo;
+     xParseSEIOverlayInfo((SEIOverlayInfo&) *sei, payloadSize);
+     break;
+#endif
 #endif //SVC_EXTENSION
       break;
@@ -1726 +1737 @@
 #endif
 
+#if Q0096_OVERLAY_SEI
+Void SEIReader::xParseSEIOverlayInfo(SEIOverlayInfo& sei, UInt /*payloadSize*/){
+  Int i, j;
+  UInt val;
+  READ_FLAG( val, "overlay_info_cancel_flag" );                 sei.m_overlayInfoCancelFlag = val;
+  if ( !sei.m_overlayInfoCancelFlag )
+  {
+    READ_UVLC( val, "overlay_content_aux_id_minus128" );            sei.m_overlayContentAuxIdMinus128 = val;
+    READ_UVLC( val, "overlay_label_aux_id_minus128" );              sei.m_overlayLabelAuxIdMinus128 = val;
+    READ_UVLC( val, "overlay_alpha_aux_id_minus128" );              sei.m_overlayAlphaAuxIdMinus128 = val;
+    READ_UVLC( val, "overlay_element_label_value_length_minus8" );  sei.m_overlayElementLabelValueLengthMinus8 = val;
+    READ_UVLC( val, "num_overlays_minus1" );                        sei.m_numOverlaysMinus1 = val;
+
+    assert( sei.m_numOverlaysMinus1 < MAX_OVERLAYS );
+    sei.m_overlayIdx.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_languageOverlayPresentFlag.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayContentLayerId.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayLabelPresentFlag.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayLabelLayerId.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayAlphaPresentFlag.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayAlphaLayerId.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_numOverlayElementsMinus1.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayElementLabelMin.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayElementLabelMax.resize( sei.m_numOverlaysMinus1+1 );
+    for ( i=0 ; i<=sei.m_numOverlaysMinus1 ; i++ )
+    {
+      READ_UVLC( val, "overlay_idx" );                      sei.m_overlayIdx[i] = val;
+      READ_FLAG( val, "language_overlay_present_flag" );    sei.m_languageOverlayPresentFlag[i] = val;
+      READ_CODE( 6, val, "overlay_content_layer_id");       sei.m_overlayContentLayerId[i] = val;
+      READ_FLAG( val, "overlay_label_present_flag" );       sei.m_overlayLabelPresentFlag[i] = val;
+      if ( sei.m_overlayLabelPresentFlag[i] )
+      {
+        READ_CODE( 6, val, "overlay_label_layer_id");     sei.m_overlayLabelLayerId[i] = val;
+      }
+      READ_FLAG( val, "overlay_alpha_present_flag" );       sei.m_overlayAlphaPresentFlag[i] = val;
+      if ( sei.m_overlayAlphaPresentFlag[i] )
+      {
+        READ_CODE( 6, val, "overlay_alpha_layer_id");     sei.m_overlayAlphaLayerId[i] = val;
+      }
+      if ( sei.m_overlayLabelPresentFlag[i] )
+      {
+        READ_UVLC( val, "num_overlay_elements_minus1");   sei.m_numOverlayElementsMinus1[i] = val;
+        assert( sei.m_numOverlayElementsMinus1[i] < MAX_OVERLAY_ELEMENTS );
+        sei.m_overlayElementLabelMin[i].resize( sei.m_numOverlayElementsMinus1[i]+1 );
+        sei.m_overlayElementLabelMax[i].resize( sei.m_numOverlayElementsMinus1[i]+1 );
+        for ( j=0 ; j<=sei.m_numOverlayElementsMinus1[i] ; j++ )
+        {
+          READ_CODE(sei.m_overlayElementLabelValueLengthMinus8 + 8, val, "overlay_element_label_min"); sei.m_overlayElementLabelMin[i][j] = val;
+          READ_CODE(sei.m_overlayElementLabelValueLengthMinus8 + 8, val, "overlay_element_label_max"); sei.m_overlayElementLabelMax[i][j] = val;
+        }      
+      }
+      else
+      {
+        sei.m_numOverlayElementsMinus1[i] = 0;
+      }
+    }
+
+    // byte alignment
+    while ( m_pcBitstream->getNumBitsRead() % 8 != 0 )
+    {
+      READ_FLAG( val, "overlay_zero_bit" );
+      assert( val==0 );
+    }
+
+    UChar* sval = new UChar[MAX_OVERLAY_STRING_BYTES];
+    UInt slen;    
+    sei.m_overlayLanguage.resize( sei.m_numOverlaysMinus1+1, NULL );
+    sei.m_overlayLanguageLength.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayName.resize( sei.m_numOverlaysMinus1+1, NULL );
+    sei.m_overlayNameLength.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayElementName.resize( sei.m_numOverlaysMinus1+1 );
+    sei.m_overlayElementNameLength.resize( sei.m_numOverlaysMinus1+1 );
+    for ( i=0 ; i<=sei.m_numOverlaysMinus1 ; i++ )
+    {
+      if ( sei.m_languageOverlayPresentFlag[i] )
+      {
+        READ_STRING( MAX_OVERLAY_STRING_BYTES, sval, slen, "overlay_language" );
+        sei.m_overlayLanguage[i] = new UChar[slen];
+        memcpy(sei.m_overlayLanguage[i], sval, slen);
+        sei.m_overlayLanguageLength[i] = slen;
+      }
+      READ_STRING( MAX_OVERLAY_STRING_BYTES, sval, slen, "overlay_name" );
+      sei.m_overlayName[i] = new UChar[slen];
+      memcpy(sei.m_overlayName[i], sval, slen);
+      sei.m_overlayNameLength[i] = slen;
+      if ( sei.m_overlayLabelPresentFlag[i] )
+      {
+        sei.m_overlayElementName[i].resize( sei.m_numOverlayElementsMinus1[i]+1, NULL );
+        sei.m_overlayElementNameLength[i].resize( sei.m_numOverlayElementsMinus1[i]+1 );
+        for ( j=0 ; j<=sei.m_numOverlayElementsMinus1[i] ; j++)
+        {
+          READ_STRING( MAX_OVERLAY_STRING_BYTES, sval, slen, "overlay_element_name" );
+          sei.m_overlayElementName[i][j] = new UChar[slen];
+          memcpy(sei.m_overlayElementName[i][j], sval, slen);
+          sei.m_overlayElementNameLength[i][j] = slen;
+        }
+      }
+    }
+    READ_FLAG( val, "overlay_info_persistence_flag" );        sei.m_overlayInfoPersistenceFlag = val;
+  }
+  xParseByteAlign();
+}
+#endif
+
 #endif //SVC_EXTENSION
 

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

@@ -146 +146 @@
   Void xParseSEIFrameFieldInfo    (SEIFrameFieldInfo& sei, UInt payloadSize);
 #endif
+#if Q0096_OVERLAY_SEI
+  Void xParseSEIOverlayInfo           (SEIOverlayInfo& sei, UInt payloadSize);
+#endif
   Void xParseByteAlign();
 };

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

@@ -85 +85 @@
 }
 
+#if Q0096_OVERLAY_SEI
+Void  SyntaxElementParser::xReadStringTr        (UInt buSize, UChar *pValue, UInt& rLength, const Char *pSymbolName)
+{
+  xReadString(buSize, pValue, rLength);
+  fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
+  fprintf( g_hTrace, "%-50s st(v=%d)  : %s\n", pSymbolName, rLength, pValue );
+  fflush ( g_hTrace );
+}
+#endif
+
 #endif
 
@@ -153 +163 @@
 }
 
+#if Q0096_OVERLAY_SEI
+Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength)
+{
+  assert( m_pcBitstream->getNumBitsRead() % 8 == 0 ); //always start reading at a byte-aligned position
+  assert ( bufSize > 1 ); //last byte always used for null-termination
+  UInt val;
+  UInt i;
+  for (i=0 ; i<bufSize ; ++i ) 
+  {
+    m_pcBitstream->readByte( val );
+    pVal[i] = val;
+    if ( val == 0)
+    {
+      break;
+    }
+  }
+  rLength = i;
+  assert( pVal[rLength] == 0 );
+}
+#endif
 
 //! \}

branches/SHM-dev/source/Lib/TLibDecoder/SyntaxElementParser.h

@@ -51 +51 @@
 #define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
 #define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
+#if Q0096_OVERLAY_SEI
+#define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
+#endif
 
 #else
@@ -58 +61 @@
 #define READ_SVLC(        code, name)     xReadSvlc (         code )
 #define READ_FLAG(        code, name)     xReadFlag (         code )
+#if Q0096_OVERLAY_SEI
+#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
+#endif
 
 #endif
@@ -82 +88 @@
   Void  xReadSvlc    ( Int&   val );
   Void  xReadFlag    ( UInt&  val );
+#if Q0096_OVERLAY_SEI
+  Void  xReadString  (UInt bufSize, UChar *val, UInt& length);
+#endif
 #if ENC_DEC_TRACE
   Void  xReadCodeTr  (UInt  length, UInt& rValue, const Char *pSymbolName);
@@ -87 +96 @@
   Void  xReadSvlcTr  (               Int& rValue, const Char *pSymbolName);
   Void  xReadFlagTr  (              UInt& rValue, const Char *pSymbolName);
+#if Q0096_OVERLAY_SEI
+  Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
+#endif
 #endif
 public: