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

Timestamp:

25 Aug 2015, 19:35:49 (10 years ago)

Author:

seregin

Message:

port rev 4596

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)

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

@@ -716 +716 @@
 #endif
   READ_FLAG( uiCode, "sps_temporal_id_nesting_flag" );           pcSPS->setTemporalIdNestingFlag ( uiCode > 0 ? true : false );
-  parsePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1);
-#if SVC_EXTENSION
+#if SVC_EXTENSION
+    parsePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1);
   }
 #else
@@ -725 +725 @@
     assert( uiCode == 1 );
   }
-#endif
-
+
+  parsePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1);
+#endif
   READ_UVLC(     uiCode, "sps_seq_parameter_set_id" );           pcSPS->setSPSId( uiCode );
   assert(uiCode <= 15);
@@ -829 +830 @@
     pcSPS->setNumReorderPics(uiCode, i);
     READ_UVLC ( uiCode, "sps_max_latency_increase_plus1[i]");
-    pcSPS->setMaxLatencyIncrease( uiCode, i );
+    pcSPS->setMaxLatencyIncreasePlus1( uiCode, i );
 
     if (!subLayerOrderingInfoPresentFlag)
@@ -837 +838 @@
         pcSPS->setMaxDecPicBuffering(pcSPS->getMaxDecPicBuffering(0), i);
         pcSPS->setNumReorderPics(pcSPS->getNumReorderPics(0), i);
-        pcSPS->setMaxLatencyIncrease(pcSPS->getMaxLatencyIncrease(0), i);
+        pcSPS->setMaxLatencyIncreasePlus1(pcSPS->getMaxLatencyIncreasePlus1(0), i);
       }
       break;
@@ -2235 +2236 @@
   }
   else
-  {  
+  {
 #if SVC_EXTENSION
     READ_FLAG(    uiCode, PTL_TRACE_TEXT("inbld_flag"                      ));