Changeset 345 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

17 Aug 2013, 06:27:19 (11 years ago)

Author:

seregin

Message:

merge SHM-3.0-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncTop.cpp (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -886 +886 @@
   for( Int i = 0; i < getGOPSize()+m_extraRPSs; i++) 
   {
+#if FINAL_RPL_CHANGE_N0082
+    GOPEntry ge = m_ppcTEncTop[m_cSPS.getLayerId()]->getGOPEntry(i);
+#else
     GOPEntry ge = getGOPEntry(i);
+#endif
     rps = rpsList->getReferencePictureSet(i);
     rps->setNumberOfPictures(ge.m_numRefPics);
@@ -1204 +1208 @@
   if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 )
   {
-#if ZERO_NUM_DIRECT_LAYERS
     return (TEncTop *)getLayerEnc( 0 );
-#else
-    return NULL;
-#endif
   }