Changeset 201 in 3DVCSoftware for branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

4 Dec 2012, 23:29:29 (13 years ago)

Author:

nokia

Message:

1. Recommended coding style changes
2. Disabling Compile flags:

#define QC_IV_AS_LT_B0046 0
#define QC_TMVP_IDX_MOD_B0046 0
#define QC_REM_IDV_B0046 0
#define FIX_DEL_NULLPTR 0

File:

• branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -364 +364 @@
 
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       TComPic * pcTexturePic; 
       if(m_pcEncTop->getIsDepth() == 1)
@@ -492 +492 @@
 
 #if SAIT_VSO_EST_A0033
+#ifdef FLEX_CODING_ORDER_M23723    
 {
-   Bool flag_rec;
-   flag_rec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
-    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flag_rec ) );
-    m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+  Bool flagRec;
+  flagRec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
+  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flagRec ) );
+  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
 }
+#else
+  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
+  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+#endif
 #endif
 #if LGE_WVSO_A0119