Changeset 1319 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

21 Jul 2015, 23:31:40 (9 years ago)

Author:

seregin

Message:

port rev 4394

Location:

branches/SHM-dev/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (5 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -215 +215 @@
     AnnexBStats stats = AnnexBStats();
 
-    vector<uint8_t> nalUnit;
     InputNALUnit nalu;
-    byteStreamNALUnit(bytestream, nalUnit, stats);
+    byteStreamNALUnit(bytestream, nalu.getBitstream().getFifo(), stats);
 
     // call actual decoding function
@@ -223 +222 @@
     Bool bNewPOC = false;
 
-    if (nalUnit.empty())
+    if (nalu.getBitstream().getFifo().empty())
     {
       /* this can happen if the following occur:
@@ -234 +233 @@
     else
     {
-      read(nalu, nalUnit);
+      read(nalu);
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  ||
 #if CONFORMANCE_BITSTREAM_MODE
@@ -473 +472 @@
     AnnexBStats stats = AnnexBStats();
 
-    vector<uint8_t> nalUnit;
     InputNALUnit nalu;
-    byteStreamNALUnit(bytestream, nalUnit, stats);
+    byteStreamNALUnit(bytestream, nalu.getBitstream().getFifo(), stats);
 
     // call actual decoding function
     Bool bNewPicture = false;
-    if (nalUnit.empty())
+    if (nalu.getBitstream().getFifo().empty())
     {
       /* this can happen if the following occur:
@@ -490 +488 @@
     else
     {
-      read(nalu, nalUnit);
+      read(nalu);
       if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  )
       {

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -3114 +3114 @@
       fprintf(stderr, "****************************************************************************\n");
     }
-  }
-  if ( m_bufferingPeriodSEIEnabled && !m_activeParameterSetsSEIEnabled)
-  {
-    fprintf(stderr, "****************************************************************************\n");
-    fprintf(stderr, "** WARNING: using buffering period SEI requires SPS activation with       **\n"); 
-    fprintf(stderr, "**          active parameter sets SEI. Enabling active parameter sets SEI **\n");
-    fprintf(stderr, "****************************************************************************\n");
-    m_activeParameterSetsSEIEnabled = 1;
-  }
-  if ( m_pictureTimingSEIEnabled && !m_activeParameterSetsSEIEnabled)
-  {
-    fprintf(stderr, "****************************************************************************\n");
-    fprintf(stderr, "** WARNING: using picture timing SEI requires SPS activation with active  **\n"); 
-    fprintf(stderr, "**          parameter sets SEI. Enabling active parameter sets SEI.       **\n");
-    fprintf(stderr, "****************************************************************************\n");
-    m_activeParameterSetsSEIEnabled = 1;
   }