Changeset 81 in 3DVCSoftware for trunk/source/App

Timestamp:

21 Jun 2012, 21:01:20 (13 years ago)

Author:

tech

Message:

Bug fixes:

• Residual Prediction
• VPS
• VSO
• Renderer

Location:

trunk/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
• TAppRenderer/TAppRendererTop.cpp (modified) (12 diffs)

trunk/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
   }
 }

trunk/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -70 +70 @@
     pcVideoInput->open( m_pchVideoInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
     pcDepthInput->open( m_pchDepthInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
-
+#if HHI_FIX
+    pcVideoInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
+    pcDepthInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
+#endif
     m_apcTVideoIOYuvVideoInput.push_back( pcVideoInput );
     m_apcTVideoIOYuvDepthInput.push_back( pcDepthInput );
@@ -184 +187 @@
   {
 
+#if HHI_FIX
+    if ( iFrame >= m_iFrameSkip ) 
+    {
+#endif
     // read in depth and video
     for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
@@ -203 +210 @@
     }
 
+#if HHI_FIX
+    }
+    else
+#else
     if ( iFrame < m_iFrameSkip ) // Skip Frames
+#endif
+    
     {
       std::cout << "Skipping Frame " << iFrame << std::endl;
@@ -549 +562 @@
     while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
     {
+
+#if HHI_FIX
+      if ( iFrame >= m_iFrameSkip )
+      {      
+#endif
       // read in depth and video
       for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
@@ -558 +576 @@
         bAnyEOS |= m_apcTVideoIOYuvDepthInput[iBaseViewIdx]->isEof();
       }
-
+#if HHI_FIX
+      }
+      else
+#else
       if ( iFrame < m_iFrameSkip )
+#endif
       {
+#if HHI_FIX
+        iFrame++;
+#endif
         continue;
       }
@@ -573 +598 @@
       }
 
+#if HHI_FIX
+      m_cCameraData.update( (UInt) ( iFrame - m_iFrameSkip ));
+#endif
+
       for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
       {
+#if HHI_FIX
+#else
         m_cCameraData.update( (UInt)iFrame );
+#endif
 
         // setup virtual views
@@ -755 +787 @@
   while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
   {
+
+#if HHI_FIX
+    if ( iFrame >= m_iFrameSkip )
+    {      
+#endif
     // read in depth and video
     for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
@@ -771 +808 @@
     }
 
+#if HHI_FIX
+    }
+    else
+#else
     if ( iFrame < m_iFrameSkip ) // Skip Frames
+#endif
     {
       iFrame++;
@@ -777 +819 @@
     }
 
+#if HHI_FIX
+    m_cCameraData.update( (UInt) (iFrame - m_iFrameSkip ));
+#else
     m_cCameraData.update( (UInt)iFrame );
+#endif
 
     for(Int iSynthViewIdx=0; iSynthViewIdx < m_iNumberOfOutputViews; iSynthViewIdx++ )
@@ -925 +971 @@
   while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
   {
-    // set shift LUT
-
+
+#if HHI_FIX
+    if ( iFrame >= m_iFrameSkip )
+    {      
+#endif
     // read in depth and video
     for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
@@ -944 +993 @@
     }
 
+#if HHI_FIX
+    }
+    else
+#else
     if ( iFrame < m_iFrameSkip ) // Skip Frames
+#endif
     {
       std::cout << "Skipping Frame " << iFrame << std::endl;
@@ -952 +1006 @@
     }
 
+#if HHI_FIX
+    m_cCameraData.update( (UInt) ( iFrame - m_iFrameSkip ) );
+#else
     m_cCameraData.update( (UInt)iFrame );
+#endif
 
     for(Int iViewIdx=1; iViewIdx < m_iNumberOfInputViews; iViewIdx++ )