Changeset 201 in 3DVCSoftware for branches/HTM-5.0-Nokia/source/App/TAppEncoder

Timestamp:

4 Dec 2012, 23:29:29 (12 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

Location:

branches/HTM-5.0-Nokia/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (5 diffs)

branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -112 +112 @@
     free (m_pchBitstreamFile) ;
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   if (m_pchMVCJointCodingOrder != NULL)
   {
@@ -212 +212 @@
   string cfg_ScalingListFile;
 
- #if FLEX_CODING_ORDER
+ #if FLEX_CODING_ORDER_M23723
   string cfg_JointCodingOrdering;
 #endif
@@ -260 +260 @@
   ("NumberOfViews",         m_iNumberOfViews,    0, "Number of views")
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   ("FCO",               m_b3DVFlexOrder,   false, "flexible coding order flag" )
   ("FCOCodingOrder",   cfg_JointCodingOrdering,  string(""), "The coding order for joint texture-depth coding")
@@ -553 +553 @@
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
   
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   m_pchMVCJointCodingOrder= cfg_JointCodingOrdering.empty()?NULL:strdup(cfg_JointCodingOrdering.c_str());
   // If flexible order is enabled and if depth comes before the texture for a view, disable VSO
@@ -1826 +1826 @@
   printf("TMVP:%d ", (m_enableTMVP[1] ? 1 : 0) );
 #endif
+
+#if FLEX_CODING_ORDER_M23723
+  printf("FCO:%d ",   (m_b3DVFlexOrder ? 1: 0));
+
+  if(m_b3DVFlexOrder)
+  {
+    printf("CodingOrder: %s ", m_pchMVCJointCodingOrder);
+  }
+#endif
+
 #if HHI_VSO
   printf("VSO:%d ", m_bUseVSO             );

branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.h

@@ -89 +89 @@
   Bool      m_bUsingDepthMaps;
   
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
   char*  m_pchMVCJointCodingOrder;      ///<  texture-depth coding order
   Bool    m_b3DVFlexOrder;    ///<  flexible coding order flag

branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncTop.cpp

@@ -401 +401 @@
     {
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       // Detect whether depth comes before than texture for this view
       Bool isDepthFirst = false;
@@ -708 +708 @@
 #endif
 
-#if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
+#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
     m_acTEncDepthTopList[iViewIdx]->setUseDMM34( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseDMM );
 #endif
@@ -717 +717 @@
 
 #if HHI_MPI
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
     m_acTEncDepthTopList[iViewIdx]->setUseMVI( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseMVI );
 #else
@@ -1041 +1041 @@
 #endif
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       if (m_b3DVFlexOrder)
       {
@@ -1122 +1122 @@
       }
  
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       }
 #endif