Changeset 469 in SHVCSoftware

Timestamp:

14 Nov 2013, 21:28:44 (11 years ago)

Author:

interdigital

Message:

remove macros FINAL_RPL_CHANGE_N0082, EXTERNAL_USEDBYCURR_N0082 and TEMP_SCALABILITY_FIX and related code

Location:

branches/SHM-4.0-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (2 diffs)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -69 +69 @@
   Int m_numRefIdc;
   Int m_refIdc[MAX_NUM_REF_PICS+1];
-#if EXTERNAL_USEDBYCURR_N0082
-  Int m_UseExtusedByCurrPic;
-  Int m_ExtusedByCurrPic[MAX_NUM_REF_PICS];
-#endif
   GOPEntry()
   : m_POC(-1)
@@ -87 +83 @@
   , m_deltaRPS(0)
   , m_numRefIdc(0)
-#if EXTERNAL_USEDBYCURR_N0082
-  , m_UseExtusedByCurrPic(0)
-#endif
   {
     ::memset( m_referencePics, 0, sizeof(m_referencePics) );
     ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) );
     ::memset( m_refIdc,        0, sizeof(m_refIdc) );
-#if EXTERNAL_USEDBYCURR_N0082
-    ::memset( m_usedByCurrPic, 0, sizeof(m_ExtusedByCurrPic) );
-#endif
   }
 };

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -481 +481 @@
 
   pcPic->setTLayer( m_pcCfg->getGOPEntry(iGOPid).m_temporalId );
-#if TEMP_SCALABILITY_FIX
-  if((eSliceType==I_SLICE) || (rpcSlice->getPOC() == 0))
-#else
+
   if(eSliceType==I_SLICE)
-#endif
   {
     pcPic->setTLayer(0);

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1191 +1191 @@
   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);