Changeset 81 in 3DVCSoftware for trunk/source/App


Ignore:
Timestamp:
21 Jun 2012, 21:01:20 (12 years ago)
Author:
tech
Message:

Bug fixes:

  • Residual Prediction
  • VPS
  • VSO
  • Renderer
Location:
trunk/source/App
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppDecoder/TAppDecTop.cpp

    r77 r81  
    439439    m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
    440440    Char buffer[4];
     441#if VIDYO_VPS_INTEGRATION
     442    sprintf(buffer,"_%i", viewId );
     443#else
    441444    sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconFile.size()-1) / 2 );
     445#endif
    442446    Char* nextFilename = NULL;
     447#if VIDYO_VPS_INTEGRATION
     448    if( isDepth)
     449#else
    443450    if( (m_tVideoIOYuvReconFile.size() % 2) == 0 )
     451#endif
    444452    {
    445453      Char* pchTempFilename = NULL;
     
    452460      xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
    453461    }
     462#if !VIDYO_VPS_INTEGRATION
    454463    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
     464#endif
    455465    {
    456466      m_tVideoIOYuvReconFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement );
     
    465475  {
    466476    m_tDecTop.push_back(new TDecTop);
     477#if !VIDYO_VPS_INTEGRATION
    467478    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
    468479    {
     480#endif
    469481      m_tDecTop.back()->create();
    470482      m_tDecTop.back()->init( this, newNumberOfViewDepth == 1);
     
    473485      m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
    474486      m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
    475     }
     487#if !VIDYO_VPS_INTEGRATION
     488    }
     489#endif
    476490  }
    477491}
  • trunk/source/App/TAppRenderer/TAppRendererTop.cpp

    r56 r81  
    7070    pcVideoInput->open( m_pchVideoInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
    7171    pcDepthInput->open( m_pchDepthInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
    72 
     72#if HHI_FIX
     73    pcVideoInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
     74    pcDepthInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
     75#endif
    7376    m_apcTVideoIOYuvVideoInput.push_back( pcVideoInput );
    7477    m_apcTVideoIOYuvDepthInput.push_back( pcDepthInput );
     
    184187  {
    185188
     189#if HHI_FIX
     190    if ( iFrame >= m_iFrameSkip )
     191    {
     192#endif
    186193    // read in depth and video
    187194    for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
     
    203210    }
    204211
     212#if HHI_FIX
     213    }
     214    else
     215#else
    205216    if ( iFrame < m_iFrameSkip ) // Skip Frames
     217#endif
     218   
    206219    {
    207220      std::cout << "Skipping Frame " << iFrame << std::endl;
     
    549562    while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
    550563    {
     564
     565#if HHI_FIX
     566      if ( iFrame >= m_iFrameSkip )
     567      {     
     568#endif
    551569      // read in depth and video
    552570      for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
     
    558576        bAnyEOS |= m_apcTVideoIOYuvDepthInput[iBaseViewIdx]->isEof();
    559577      }
    560 
     578#if HHI_FIX
     579      }
     580      else
     581#else
    561582      if ( iFrame < m_iFrameSkip )
     583#endif
    562584      {
     585#if HHI_FIX
     586        iFrame++;
     587#endif
    563588        continue;
    564589      }
     
    573598      }
    574599
     600#if HHI_FIX
     601      m_cCameraData.update( (UInt) ( iFrame - m_iFrameSkip ));
     602#endif
     603
    575604      for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
    576605      {
     606#if HHI_FIX
     607#else
    577608        m_cCameraData.update( (UInt)iFrame );
     609#endif
    578610
    579611        // setup virtual views
     
    755787  while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
    756788  {
     789
     790#if HHI_FIX
     791    if ( iFrame >= m_iFrameSkip )
     792    {     
     793#endif
    757794    // read in depth and video
    758795    for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
     
    771808    }
    772809
     810#if HHI_FIX
     811    }
     812    else
     813#else
    773814    if ( iFrame < m_iFrameSkip ) // Skip Frames
     815#endif
    774816    {
    775817      iFrame++;
     
    777819    }
    778820
     821#if HHI_FIX
     822    m_cCameraData.update( (UInt) (iFrame - m_iFrameSkip ));
     823#else
    779824    m_cCameraData.update( (UInt)iFrame );
     825#endif
    780826
    781827    for(Int iSynthViewIdx=0; iSynthViewIdx < m_iNumberOfOutputViews; iSynthViewIdx++ )
     
    925971  while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
    926972  {
    927     // set shift LUT
    928 
     973
     974#if HHI_FIX
     975    if ( iFrame >= m_iFrameSkip )
     976    {     
     977#endif
    929978    // read in depth and video
    930979    for(Int iBaseViewIdx=0; iBaseViewIdx < m_iNumberOfInputViews; iBaseViewIdx++ )
     
    944993    }
    945994
     995#if HHI_FIX
     996    }
     997    else
     998#else
    946999    if ( iFrame < m_iFrameSkip ) // Skip Frames
     1000#endif
    9471001    {
    9481002      std::cout << "Skipping Frame " << iFrame << std::endl;
     
    9521006    }
    9531007
     1008#if HHI_FIX
     1009    m_cCameraData.update( (UInt) ( iFrame - m_iFrameSkip ) );
     1010#else
    9541011    m_cCameraData.update( (UInt)iFrame );
     1012#endif
    9551013
    9561014    for(Int iViewIdx=1; iViewIdx < m_iNumberOfInputViews; iViewIdx++ )
Note: See TracChangeset for help on using the changeset viewer.