Changeset 50 in 3DVCSoftware for branches/0.3-nokia/source/App

Timestamp:

4 Apr 2012, 16:55:35 (13 years ago)

Author:

nokia

Message:

FCO bug-fix to 3DV-HTM version 0.4: decoder crushed with texture-only coding.

Location:

branches/0.3-nokia/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)

branches/0.3-nokia/source/App/TAppDecoder/TAppDecTop.cpp

@@ -272 +272 @@
 
       }
-      if (bCountDepthViewIdx == false )
+      if (m_bUsingDepth && bCountDepthViewIdx == false )
       {
         bCountDepthViewIdx = true;
@@ -298 +298 @@
         }
 
-        if (iViewIdx >= m_acTDecTopList.size() || iDepthViewIdx >= m_acTDecDepthTopList.size())
+        if (iViewIdx >= m_acTDecTopList.size() || (m_bUsingDepth && iDepthViewIdx >= m_acTDecDepthTopList.size()))
         {
           bFirstDepth = false;

branches/0.3-nokia/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -203 +203 @@
 
 #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
+  ("FCO",               m_b3DVFlexOrder,   false, "flexible coding order flag" )
+  ("CodingOrder",               cfg_JointCodingOrdering,  string(""), "The coding order for joint texture-depth coding")
+#endif
+
   /* Unit definition parameters */
   ("MaxCUWidth",          m_uiMaxCUWidth,  64u)
@@ -394 +394 @@
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
 
-#if FLEX_CODING_ORDER && HHI_VSO
+
+#if FLEX_CODING_ORDER
   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
+
+#if HHI_VSO && DISABLE_FCO_FOR_VSO
   Bool depthComesFirst = false;
   if ( m_b3DVFlexOrder )
@@ -425 +428 @@
   }
 #endif
-
+#endif
 
 // GT FIX

branches/0.3-nokia/source/App/TAppEncoder/TAppEncTop.cpp

@@ -145 +145 @@
 #endif
 
+#if BITSTREAM_EXTRACTION
+    m_acTEncTopList[iViewIdx]->setLayerId                      ( ( (UInt)iViewIdx ) << 1 );
+#endif
     m_acTEncTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
     m_acTEncTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
@@ -337 +340 @@
 #endif
 
+#if BITSTREAM_EXTRACTION
+      m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( ( ( (UInt)iViewIdx ) << 1 ) + 1 );
+#endif
       m_acTEncDepthTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
       m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );