Changeset 80 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source

Timestamp:

18 Jun 2012, 21:39:59 (12 years ago)

Author:

vidyo

Message:

decoder bug fix - fixing crash when decoding view-only (no depth coding) bitstreams

Location:

branches/HTM-3.0-Vidyo/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/HTM-3.0-Vidyo/source/App/TAppDecoder/TAppDecTop.cpp

@@ -439 +439 @@
     m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
     Char buffer[4];
+#if VIDYO_VPS_INTEGRATION
+    sprintf(buffer,"_%i", viewId );
+#else
     sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconFile.size()-1) / 2 );
+#endif
     Char* nextFilename = NULL;
+#if VIDYO_VPS_INTEGRATION
+    if( isDepth)
+#else
     if( (m_tVideoIOYuvReconFile.size() % 2) == 0 )
+#endif
     {
       Char* pchTempFilename = NULL;
@@ -452 +460 @@
       xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
     }
+#if !VIDYO_VPS_INTEGRATION
     if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
+#endif
     {
       m_tVideoIOYuvReconFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement );
@@ -465 +475 @@
   {
     m_tDecTop.push_back(new TDecTop);
+#if !VIDYO_VPS_INTEGRATION
     if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
     {
+#endif
       m_tDecTop.back()->create();
       m_tDecTop.back()->init( this, newNumberOfViewDepth == 1);
@@ -473 +485 @@
       m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
       m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
-    }
+#if !VIDYO_VPS_INTEGRATION
+    }
+#endif
   }
 }

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncTop.cpp

@@ -351 +351 @@
   m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
 #else
-  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
+  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
 #endif
 #endif