Changeset 41 in 3DVCSoftware for branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

26 Mar 2012, 09:03:21 (13 years ago)

Author:

poznan-univ

Message:

Adjustment for FlexCO, and high-level syntax improvement.

File:

• branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (11 diffs)

branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -110 +110 @@
     free (m_pchBitstreamFile) ;
 
+#if FLEX_CODING_ORDER
+  if (m_pchMVCJointCodingOrder != NULL)
+  {
+    free(m_pchMVCJointCodingOrder) ;
+  }
+#endif
+
   for(Int i = 0; i< m_pchDepthReconFileList.size(); i++ )
   {
@@ -153 +160 @@
   string cfg_ReconFile;
   string cfg_dQPFile;
+
+#if FLEX_CODING_ORDER
+  string cfg_JointCodingOrdering;
+#endif
+
   po::Options opts;
   opts.addOptions()
@@ -191 +203 @@
   ("NumberOfViews",         m_iNumberOfViews,    0, "Number of views")
 
+#if FLEX_CODING_ORDER
+  ("3DVFlexOrder",          m_b3DVFlexOrder,   false, "flexible coding order flag" )
+  ("3DVCodingOrder",            cfg_JointCodingOrdering,  string(""), "The coding order for joint texture-depth coding")
+#endif
 
   /* Unit definition parameters */
@@ -367 +383 @@
 #endif
 #if POZNAN_NONLINEAR_DEPTH
-  ("DepthPower,-dpow",    m_fDepthPower,      (Double)1.0, "Depth power value (for non-linear processing)")
+  ("NonlinearDepth",           m_bUseNonlinearDepth,    true, "usage of non-linear depth representation")    
+  ("NonlinearDepthModel",      m_aiNonlinearDepthModel, std::vector<Int>(0,0), "Nodes for definition of non-linear depth representation")    
+#if POZNAN_NONLINEAR_DEPTH_THRESHOLD
+  ("NonlinearDepthThreshold",  m_iNonlinearDepthThreshold, 100, "Threshold for usage of Nonlinear depth representation")    
+#endif
 #endif
 
@@ -398 +418 @@
   m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
+
+#if FLEX_CODING_ORDER && HHI_VSO
+  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
+  Bool depthComesFirst = false;
+  if ( m_b3DVFlexOrder )
+  {
+    for(Int iViewIdx=0; iViewIdx<m_iNumberOfViews; iViewIdx++)
+    {
+      for ( Int ii=1; ii<12; ii+=2 )
+      {
+        Int iViewIdxCfg = (Int)(m_pchMVCJointCodingOrder[ii]-'0');
+        if ( iViewIdxCfg == iViewIdx )
+        {
+          if ( m_pchMVCJointCodingOrder[ii-1]=='D' ) // depth comes first for this view
+          {
+            depthComesFirst = true;
+            break;
+          }
+          else
+          {
+            assert(m_pchMVCJointCodingOrder[ii-1]=='T');
+          }
+        }
+      }
+    }
+  }
+  if (depthComesFirst)
+  {
+    m_bUseVSO = false;          
+  }
+#endif
 
 
@@ -458 +510 @@
 
 #if POZNAN_NONLINEAR_DEPTH
-if (m_fDepthPower<=0) 
-  {
-    Float fDepthQP = m_adQP[ m_adQP.size()  < 2 ? 0 : 1];
-    m_fDepthPower = (fDepthQP-30) *0.25/20.0 + 1.25;
-    if (m_fDepthPower<=1.0) m_fDepthPower = 1.0;
-    // QP = 30 = 1.25
-    // QP = 50 = 1.5
-    if (m_fDepthPower>=1.66) m_fDepthPower = 1.66;
-  };
-
-#if POZNAN_NONLINEAR_DEPTH_SEND_AS_BYTE
-  m_fDepthPower = dequantizeDepthPower(quantizeDepthPower((Float)m_fDepthPower));
-#endif
-
+#if POZNAN_NONLINEAR_DEPTH_THRESHOLD
+  if(m_bUseNonlinearDepth && m_iNonlinearDepthThreshold>0)
+  {
+    FILE *base_depth_file;
+    unsigned char *depth_buf;
+    int histogram[256];
+    int i, size;
+    float weighted_avg;
+    base_depth_file = fopen(m_pchDepthInputFileList[0], "rb");
+    if (base_depth_file)
+    {
+      size = m_iSourceWidth*m_iSourceHeight;
+      depth_buf = (unsigned char *)malloc(size);
+      fread(depth_buf, 1, size, base_depth_file);
+      fclose(base_depth_file);
+      memset(histogram, 0, sizeof(histogram));
+      for (i=0; i<size;++i) histogram[depth_buf[i]]++;
+      weighted_avg = 0;
+      for (i=0; i<256; ++i) weighted_avg += i*histogram[i];
+      weighted_avg /= size;
+
+      if (weighted_avg<m_iNonlinearDepthThreshold)
+      {
+        m_bUseNonlinearDepth = 0;
+        printf ("\nWeighted average of depth histogram:%f < %d, turning NonlinearDepthRepresentation OFF\n", weighted_avg, m_iNonlinearDepthThreshold);
+      }
+    }
+  }
+#endif
+
+  if(m_bUseNonlinearDepth)
+  {
+    m_cNonlinearDepthModel.m_iNum = (Int)m_aiNonlinearDepthModel.size();
+    m_cNonlinearDepthModel.m_aiPoints[0]=0;
+    for (int i=0; i<m_cNonlinearDepthModel.m_iNum; ++i)
+      m_cNonlinearDepthModel.m_aiPoints[i+1] = m_aiNonlinearDepthModel[i];
+
+    m_cNonlinearDepthModel.m_aiPoints[m_cNonlinearDepthModel.m_iNum+1]=0;
+    m_cNonlinearDepthModel.Init();
+  }
 #endif
 
@@ -555 +633 @@
                                       LOG2_DISP_PREC_LUT 
 #if POZNAN_NONLINEAR_DEPTH                                      
-                                      ,m_fDepthPower
+                                      ,(m_bUseNonlinearDepth ? &m_cNonlinearDepthModel : NULL)
 #endif
                                       );
@@ -572 +650 @@
                                       LOG2_DISP_PREC_LUT 
 #if POZNAN_NONLINEAR_DEPTH                                      
-                                      ,m_fDepthPower
+                                      ,(m_bUseNonlinearDepth ? &m_cNonlinearDepthModel : NULL)
 #endif                                      
                                       );
@@ -589 +667 @@
     LOG2_DISP_PREC_LUT 
 #if POZNAN_NONLINEAR_DEPTH                                      
-    ,m_fDepthPower
+    ,(m_bUseNonlinearDepth ? &m_cNonlinearDepthModel : NULL)
 #endif    
     );
@@ -605 +683 @@
     LOG2_DISP_PREC_LUT 
 #if POZNAN_NONLINEAR_DEPTH                                      
-    ,m_fDepthPower
+    ,(m_bUseNonlinearDepth ? &m_cNonlinearDepthModel : NULL)
 #endif    
     );
@@ -1064 +1142 @@
 #endif
 #if POZNAN_NONLINEAR_DEPTH
-  printf("DepthPower:%f ", m_fDepthPower);
+  printf("NLDR:%d ", m_bUseNonlinearDepth ? 1 : 0);
 #endif
   printf("\n");