Changeset 1310 in SHVCSoftware

Timestamp:

21 Jul 2015, 01:25:41 (9 years ago)

Author:

seregin

Message:

port rev 4381

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (5 diffs)
• TEncGOP.h (modified) (2 diffs)

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

@@ -103 +103 @@
   ::memset(m_ltRefPicUsedByCurrPicFlag, 0, sizeof(m_ltRefPicUsedByCurrPicFlag));
   m_lastBPSEI         = 0;
-  xResetNonNestedSEIPresentFlags();
-  xResetNestedSEIPresentFlags();
+  m_bufferingPeriodSEIPresentInAU = false;
   m_associatedIRAPType = NAL_UNIT_CODED_SLICE_IDR_N_LP;
   m_associatedIRAPPOC  = 0;
@@ -572 +571 @@
     m_seiEncoder.initSEIActiveParameterSets (sei, m_pcCfg->getVPS(), sps);
     seiMessages.push_back(sei);
-    m_activeParameterSetSEIPresentInAU = true;
   }
 
@@ -1084 +1082 @@
       pictureTimingSEI->m_picStruct = (isField && slice->getPic()->isTopField())? 1 : isField? 2 : 0;
       seiMessages.push_back(pictureTimingSEI);
-      m_pictureTimingSEIPresentInAU = true;
 
       if ( m_pcCfg->getScalableNestingSEIEnabled() ) // put picture timing SEI into scalable nesting SEI
       {
-        if (m_pcCfg->getScalableNestingSEIEnabled())
-        {
-          SEIPictureTiming *pictureTimingSEIcopy = new SEIPictureTiming();
-          pictureTimingSEI->copyTo(*pictureTimingSEIcopy);
-          nestedSeiMessages.push_back(pictureTimingSEIcopy);
-        }
-        m_nestedPictureTimingSEIPresentInAU = true;
+        SEIPictureTiming *pictureTimingSEIcopy = new SEIPictureTiming();
+        pictureTimingSEI->copyTo(*pictureTimingSEIcopy);
+        nestedSeiMessages.push_back(pictureTimingSEIcopy);
       }
     }
@@ -2597 +2590 @@
 #endif
 
+    // reset presence of BP SEI indication
+    m_bufferingPeriodSEIPresentInAU = false;
     // create prefix SEI associated with a picture
     xCreatePerPictureSEIMessages(iGOPid, leadingSeiMessages, nestedSeiMessages, pcSlice);
@@ -2887 +2882 @@
     }
 #endif
-
-    xResetNonNestedSEIPresentFlags();
-    xResetNestedSEIPresentFlags();
 
     pcPic->getPicYuvRec()->copyToPic(pcPicYuvRecOut);

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -136 +136 @@
   UInt                    m_lastBPSEI;
   UInt                    m_totalCoded;
-  Bool                    m_activeParameterSetSEIPresentInAU;
   Bool                    m_bufferingPeriodSEIPresentInAU;
-  Bool                    m_pictureTimingSEIPresentInAU;
-  Bool                    m_nestedBufferingPeriodSEIPresentInAU;
-  Bool                    m_nestedPictureTimingSEIPresentInAU;
   SEIEncoder              m_seiEncoder;
 
@@ -274 +270 @@
   Int xWriteParameterSets (AccessUnit &accessUnit, TComSlice *slice);
 
-  Void xResetNonNestedSEIPresentFlags()
-  {
-    m_activeParameterSetSEIPresentInAU = false;
-    m_bufferingPeriodSEIPresentInAU    = false;
-    m_pictureTimingSEIPresentInAU      = false;
-  }
-  Void xResetNestedSEIPresentFlags()
-  {
-    m_nestedBufferingPeriodSEIPresentInAU    = false;
-    m_nestedPictureTimingSEIPresentInAU      = false;
-  }
   Void applyDeblockingFilterMetric( TComPic* pcPic, UInt uiNumSlices );