Changeset 80 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source
- Timestamp:
- 18 Jun 2012, 21:39:59 (13 years ago)
- Location:
- branches/HTM-3.0-Vidyo/source
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-3.0-Vidyo/source/App/TAppDecoder/TAppDecTop.cpp
r71 r80 439 439 m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv); 440 440 Char buffer[4]; 441 #if VIDYO_VPS_INTEGRATION 442 sprintf(buffer,"_%i", viewId ); 443 #else 441 444 sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconFile.size()-1) / 2 ); 445 #endif 442 446 Char* nextFilename = NULL; 447 #if VIDYO_VPS_INTEGRATION 448 if( isDepth) 449 #else 443 450 if( (m_tVideoIOYuvReconFile.size() % 2) == 0 ) 451 #endif 444 452 { 445 453 Char* pchTempFilename = NULL; … … 452 460 xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename); 453 461 } 462 #if !VIDYO_VPS_INTEGRATION 454 463 if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) ) 464 #endif 455 465 { 456 466 m_tVideoIOYuvReconFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement ); … … 465 475 { 466 476 m_tDecTop.push_back(new TDecTop); 477 #if !VIDYO_VPS_INTEGRATION 467 478 if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) ) 468 479 { 480 #endif 469 481 m_tDecTop.back()->create(); 470 482 m_tDecTop.back()->init( this, newNumberOfViewDepth == 1); … … 473 485 m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled); 474 486 m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector ); 475 } 487 #if !VIDYO_VPS_INTEGRATION 488 } 489 #endif 476 490 } 477 491 } -
branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncTop.cpp
r71 r80 351 351 m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() ); 352 352 #else 353 m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->get VPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );353 m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() ); 354 354 #endif 355 355 #endif
Note: See TracChangeset for help on using the changeset viewer.