Changeset 1302 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

21 Jul 2015, 00:23:23 (9 years ago)

Author:

seregin

Message:

port rev 4345 and rev 4346

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/SEI.h (modified) (2 diffs)
• TLibDecoder/SEIread.cpp (modified) (1 diff)
• TLibEncoder/SEIEncoder.cpp (modified) (2 diffs)

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

@@ -531 +531 @@
 
   SEIScalableNesting() {}
+
   virtual ~SEIScalableNesting()
   {
-    if (!m_callerOwnsSEIs)
-    {
-      deleteSEIs(m_nestedSEIs);
-    }
+    deleteSEIs(m_nestedSEIs);
   }
 
@@ -551 +549 @@
   UChar m_nestingLayerId[MAX_NESTING_NUM_LAYER];     //value valid if m_nestingOpFlag == 0 and m_allLayersFlag == 0. This can e.g. be a static array of 64 UChar values
 
-  Bool  m_callerOwnsSEIs;
   SEIMessages m_nestedSEIs;
 };

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

@@ -1121 +1121 @@
   }
 
-  sei.m_callerOwnsSEIs = false;
-
   // read nested SEI messages
   do

branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp

@@ -267 +267 @@
 }
 
+//! initialize scalable nesting SEI message.
+//! Note: The SEI message structures input into this function will become part of the scalable nesting SEI and will be 
+//!       automatically freed, when the nesting SEI is disposed.
 Void SEIEncoder::initSEIScalableNesting(SEIScalableNesting *scalableNestingSEI, SEIMessages &nestedSEIs)
 {
@@ -279 +282 @@
   scalableNestingSEI->m_nestingNumLayersMinus1        = 1 - 1;  //nesting_num_layers_minus1
   scalableNestingSEI->m_nestingLayerId[0]             = 0;
-  scalableNestingSEI->m_callerOwnsSEIs                = true;
 
   scalableNestingSEI->m_nestedSEIs.clear();