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

Timestamp:

14 Jul 2015, 01:49:50 (10 years ago)

Author:

seregin

Message:

port rev 4247

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)

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

@@ -92 +92 @@
   MAIN_444_10_INTRA = 2310,
   MAIN_444_12_INTRA = 2312,
-  MAIN_444_16_INTRA = 2316,
-
+  MAIN_444_16_INTRA = 2316
 };
 
@@ -226 +225 @@
   }
   in>>entry.m_interRPSPrediction;
-#if AUTO_INTER_RPS
   if (entry.m_interRPSPrediction==1)
   {
@@ -240 +238 @@
     in>>entry.m_deltaRPS;
   }
-#else
-  if (entry.m_interRPSPrediction)
-  {
-    in>>entry.m_deltaRPS;
-    in>>entry.m_numRefIdc;
-    for ( Int i = 0; i < entry.m_numRefIdc; i++ )
-    {
-      in>>entry.m_refIdc[i];
-    }
-  }
-#endif
   return in;
 }
@@ -2646 +2633 @@
       fclose(fpt);
     }
-  }  
+  }
 #endif
 
@@ -3375 +3362 @@
   memset( m_extraRPSs, 0, sizeof( m_extraRPSs ) );
 #else
-  m_extraRPSs=0;                                     
+  m_extraRPSs=0;                                    
 #endif