Changeset 1196 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.h

Timestamp:

4 May 2015, 17:47:40 (9 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

File:

• trunk/source/App/TAppEncoder/TAppEncCfg.h (modified) (3 diffs)

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -289 +289 @@
   Int       m_iSearchRange;                                   ///< ME search range
   Int       m_bipredSearchRange;                              ///< ME search range for bipred refinement
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Bool      m_bUseDisparitySearchRangeRestriction;            ///< restrict vertical search range for inter-view prediction
   Int       m_iVerticalDisparitySearchRange;                  ///< ME vertical search range for inter-view prediction
@@ -488 +488 @@
   Bool                   m_qtPredFlag;
   Bool                   m_interSdcFlag;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool                   m_depthIntraSkipFlag; 
-#else
-  Bool                   m_intraSingleFlag;
-#endif
 #endif
   // internal member functions
@@ -543 +539 @@
     Int iSpace = max(1, ENC_CFG_CONSOUT_SPACE - (Int) description.length() ); 
     
-    for ( Int i = 0; i < iSpace; i++ ) 
+    for ( Int i = 0; i < iSpace; i++ )
+    {
       description.append( " " ); 
+    }
       
     description.append( ":" ); 
     printf( "%s", description.c_str() ); 
 
-    for(Int i=0;i<rpcVector.size();i++)                
+    for(Int i=0;i<rpcVector.size();i++)
+    {
       xPrintVectorElem( rpcVector[i] );
+    }
 
     printf("\n");