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

Timestamp:

31 Oct 2014, 18:18:38 (10 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/TLibCommon

Files:

• SEI.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/SEI.h

@@ -111 +111 @@
     FRAME_FIELD_INFO                     = 147,
 #endif
+#if Q0096_OVERLAY_SEI
+    OVERLAY_INFO                         = 166,    
+#endif
   };
   
@@ -699 +702 @@
 #endif
 
+#if Q0096_OVERLAY_SEI
+class SEIOverlayInfo : public SEI
+{
+public:
+  PayloadType payloadType() const { return OVERLAY_INFO; }
+  SEIOverlayInfo() 
+    :  m_numOverlaysMinus1(-1) 
+    {}
+
+  virtual ~SEIOverlayInfo() 
+  {
+    for (Int i=0 ; i<=m_numOverlaysMinus1 ; i++)
+    { 
+      delete [] m_overlayLanguage[i];          
+      delete [] m_overlayName[i];
+      for (Int j=0 ; j<=m_numOverlayElementsMinus1[i] ; j++)
+      {
+        delete [] m_overlayElementName[i][j];
+      }
+    }
+  }
+
+  Bool                                m_overlayInfoCancelFlag;
+  UInt                                m_overlayContentAuxIdMinus128;
+  UInt                                m_overlayLabelAuxIdMinus128;
+  UInt                                m_overlayAlphaAuxIdMinus128;
+  UInt                                m_overlayElementLabelValueLengthMinus8;
+  UInt                                m_numOverlaysMinus1;
+  std::vector<UInt>                   m_overlayIdx;
+  std::vector<Bool>                   m_languageOverlayPresentFlag;
+  std::vector<UInt>                   m_overlayContentLayerId;
+  std::vector<Bool>                   m_overlayLabelPresentFlag;
+  std::vector<UInt>                   m_overlayLabelLayerId;
+  std::vector<Bool>                   m_overlayAlphaPresentFlag;
+  std::vector<UInt>                   m_overlayAlphaLayerId;
+  std::vector<UInt>                   m_numOverlayElementsMinus1;
+  std::vector< std::vector<UInt> >    m_overlayElementLabelMin;
+  std::vector< std::vector<UInt> >    m_overlayElementLabelMax;
+  std::vector<UChar*>                 m_overlayLanguage;
+  std::vector<UInt>                   m_overlayLanguageLength;
+  std::vector<UChar*>                 m_overlayName;
+  std::vector<UInt>                   m_overlayNameLength;
+  std::vector< std::vector<UChar*> >  m_overlayElementName;
+  std::vector< std::vector<UInt> >    m_overlayElementNameLength;
+  Bool                                m_overlayInfoPersistenceFlag;
+};
+#endif
+
 //! \}

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -320 +320 @@
 #define Q0247_FRAME_FIELD_INFO           1      ///< JCTVC-Q0247: field_frame_info SEI message
 #define R0247_SEI_ACTIVE                 1      ///< JCTVC-R0247: active parameter sets SEI message
+#define Q0096_OVERLAY_SEI                1      ///< JCTVC-Q0096, JCTVC-Q0045: selectable overlays SEI message
+#if Q0096_OVERLAY_SEI 
+# define MAX_OVERLAYS                    16
+# define MAX_OVERLAY_ELEMENTS            256
+# define MAX_OVERLAY_STRING_BYTES        256
+#endif
 
 #endif // SVC_EXTENSION