Changeset 1464 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

port rev 4596

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -1835 +1835 @@
 
     maxDpbLimit.m_numAUsNotDisplayed = sps->getNumReorderPics( highestTId ); // m_numAUsNotDisplayed is only variable name - stores reorderpics
-    maxDpbLimit.m_maxLatencyIncrease = sps->getMaxLatencyIncrease( highestTId ) > 0;
+    maxDpbLimit.m_maxLatencyIncrease = sps->getMaxLatencyIncreasePlus1( highestTId ) > 0;
     if( maxDpbLimit.m_maxLatencyIncrease )
     {
-      maxDpbLimit.m_maxLatencyPictures = sps->getMaxLatencyIncrease( highestTId ) + sps->getNumReorderPics( highestTId ) - 1;
+      maxDpbLimit.m_maxLatencyPictures = sps->getMaxLatencyIncreasePlus1( highestTId ) + sps->getNumReorderPics( highestTId ) - 1;
     }
     maxDpbLimit.m_numPicsInSubDpb[0] = sps->getMaxDecPicBuffering( highestTId );

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2063 +2063 @@
   for ( Int i = 0; i < MAX_TLAYER; i++ )
   {
-    m_uiMaxLatencyIncrease[i] = 0;
+    m_uiMaxLatencyIncreasePlus1[i] = 0;
     m_uiMaxDecPicBuffering[i] = 1;
     m_numReorderPics[i]       = 0;

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

@@ -1424 +1424 @@
   TComScalingList  m_scalingList;
   UInt             m_uiMaxDecPicBuffering[MAX_TLAYER];
-  UInt             m_uiMaxLatencyIncrease[MAX_TLAYER];  // Really max latency increase plus 1 (value 0 expresses no limit)
+  UInt             m_uiMaxLatencyIncreasePlus1[MAX_TLAYER];
 
   Bool             m_useStrongIntraSmoothing;
@@ -1569 +1569 @@
   UInt                   getMaxDecPicBuffering(UInt tlayer) const                                        { return m_uiMaxDecPicBuffering[tlayer];                               }
   Void                   setMaxDecPicBuffering( UInt ui, UInt tlayer )                                   { assert(tlayer < MAX_TLAYER); m_uiMaxDecPicBuffering[tlayer] = ui;    }
-  UInt                   getMaxLatencyIncrease(UInt tlayer) const                                        { return m_uiMaxLatencyIncrease[tlayer];                               }
-  Void                   setMaxLatencyIncrease( UInt ui , UInt tlayer)                                   { m_uiMaxLatencyIncrease[tlayer] = ui;                                 }
+  UInt                   getMaxLatencyIncreasePlus1(UInt tlayer) const                                   { return m_uiMaxLatencyIncreasePlus1[tlayer];                          }
+  Void                   setMaxLatencyIncreasePlus1( UInt ui , UInt tlayer)                              { m_uiMaxLatencyIncreasePlus1[tlayer] = ui;                            }
 
   Void                   setUseStrongIntraSmoothing(Bool bVal)                                           { m_useStrongIntraSmoothing = bVal;                                    }

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"                      ));

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

@@ -641 +641 @@
     WRITE_UVLC( pcSPS->getMaxDecPicBuffering(i) - 1,       "sps_max_dec_pic_buffering_minus1[i]" );
     WRITE_UVLC( pcSPS->getNumReorderPics(i),               "sps_max_num_reorder_pics[i]" );
-    WRITE_UVLC( pcSPS->getMaxLatencyIncrease(i),           "sps_max_latency_increase_plus1[i]" );
+    WRITE_UVLC( pcSPS->getMaxLatencyIncreasePlus1(i),      "sps_max_latency_increase_plus1[i]" );
     if (!subLayerOrderingInfoPresentFlag)
     {