Changeset 193 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/App/TAppDecoder

Timestamp:

19 Nov 2012, 21:15:40 (12 years ago)

Author:

mitsubishi-htm

Message:

A second release, as planned

• Migrate to HTM 4.1
• Move VSP related switches to cfg file instead of #define in the source code
• A few bug fixes
• For VC project files, only VC9 file is updated

TODO

• Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting

Location:

branches/HTM-4.0.1-VSP-dev0/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecTop.cpp (modified) (5 diffs)
• TAppDecTop.h (modified) (1 diff)

branches/HTM-4.0.1-VSP-dev0/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -103 +103 @@
   if (!m_pchBitstreamFile)
   {
-    fprintf(stderr, "No input file specifed, aborting\n");
+    fprintf(stderr, "No input file specified, aborting\n");
     return false;
   }

branches/HTM-4.0.1-VSP-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -262 +262 @@
     }
   }
-#if DEBUGIMGOUT
-  for(Int viewDepthIdx=0; viewDepthIdx<m_tVideoIOYuvReconDbgFile.size() ; viewDepthIdx++)
-  {
-    if( m_tVideoIOYuvReconDbgFile[viewDepthIdx] )
-    {
-      m_tVideoIOYuvReconDbgFile[viewDepthIdx]->close();
-      delete m_tVideoIOYuvReconDbgFile[viewDepthIdx]; 
-      m_tVideoIOYuvReconDbgFile[viewDepthIdx] = NULL ;
-    }
-  }
-#endif
 
   for(Int viewDepthIdx=0; viewDepthIdx<m_tDecTop.size() ; viewDepthIdx++)
@@ -341 +330 @@
 #endif
       }
-#if DEBUGIMGOUT
-#if PIC_CROPPING
-      m_tVideoIOYuvReconDbgFile[viewDepthId]->write( pcPic->getPicYuvRecDbg(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
-#else
-      m_tVideoIOYuvReconDbgFile[viewDepthId]->write( pcPic->getPicYuvRecDbg(), pcPic->getSlice(0)->getSPS()->getPad() );
-#endif
-#endif   
       
       // update POC of display order
@@ -406 +388 @@
 #endif
       }
-#if DEBUGIMGOUT
-#if PIC_CROPPING
-      m_tVideoIOYuvReconDbgFile[viewDepthId]->write( pcPic->getPicYuvRecDbg(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
-#else
-      m_tVideoIOYuvReconDbgFile[viewDepthId]->write( pcPic->getPicYuvRecDbg(), pcPic->getSlice(0)->getSPS()->getPad() );
-#endif
-#endif
       
       // update POC of display order
@@ -501 +476 @@
   }
 #endif
-#if DEBUGIMGOUT
-  while( m_tVideoIOYuvReconDbgFile.size() < newNumberOfViewDepth)
-  {
-    m_tVideoIOYuvReconDbgFile.push_back(new TVideoIOYuv);
-    Char buffer[4];
-    sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconDbgFile.size()-1) / 2 );
-    Char* nextFilename = NULL;
-    if( (m_tVideoIOYuvReconDbgFile.size() % 2) == 0 )
-    {
-      Char* pchTempFilename = NULL;
-      xAppendToFileNameEnd( "DebugImg.yuv", "_depth", pchTempFilename);
-      xAppendToFileNameEnd( pchTempFilename, buffer, nextFilename);
-      free ( pchTempFilename );
-    }
-    else
-    {
-      xAppendToFileNameEnd( "DebugImg.yuv", buffer, nextFilename);
-    }
-    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconDbgFile.size() % 2) == 1 ) )
-    {
-      m_tVideoIOYuvReconDbgFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement );
-    }
-    free ( nextFilename );
-  }
-#endif
+
   while( m_pocLastDisplay.size() < newNumberOfViewDepth )
   {
@@ -587 +538 @@
 {
   //first view does not have VSP 
-#if VSP_TEXT_ONLY
-  if((iCodedViewIdx == 0)||(bDepth))
-#else
   if((iCodedViewIdx == 0))
-#endif
     return;
   pcPicVSP->getSlice(0)->setPOC( iCurPoc );
+  pcPicVSP->getSlice(0)->setViewId( iCodedViewIdx );
   Int iNeighborViewId = 0;
   Bool bRenderFromLeft;

branches/HTM-4.0.1-VSP-dev0/source/App/TAppDecoder/TAppDecTop.h

@@ -68 +68 @@
 
   std::vector<TVideoIOYuv*>       m_tVideoIOYuvReconFile;         ///< reconstruction YUV class
-#if DEBUGIMGOUT
-  std::vector<TVideoIOYuv*>       m_tVideoIOYuvReconDbgFile;      ///< debug YUV class
-#endif
 
   // for output control