Ignore:
Timestamp:
30 Mar 2012, 18:57:41 (12 years ago)
Author:
poznan-univ
Message:

some bug fix on high level syntax
fixed some compiler warning issues under windows and linux

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp

    r41 r48  
    150150#endif
    151151
     152#if BITSTREAM_EXTRACTION
     153    m_acTEncTopList[iViewIdx]->setLayerId                      ( ( (UInt)iViewIdx ) << 1 );
     154#endif
    152155    m_acTEncTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
    153156    m_acTEncTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
     
    359362#endif
    360363
     364#if BITSTREAM_EXTRACTION
     365      m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( ( ( (UInt)iViewIdx ) << 1 ) + 1 );
     366#endif
    361367      m_acTEncDepthTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
    362368      m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
    363369      m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
     370#if FLEX_CODING_ORDER
     371      m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( m_cCameraData.getCamParsCodedPrecision  () );
     372      m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( m_cCameraData.getVaryingCameraParameters() );
     373      m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( m_cCameraData.getCodedScale             () );
     374      m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( m_cCameraData.getCodedOffset            () );
     375#else
    364376      m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
    365377      m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
    366378      m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
    367379      m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
     380#endif
    368381#if DEPTH_MAP_GENERATION
    369382      m_acTEncDepthTopList[iViewIdx]->setPredDepthMapGeneration       ( 0 );
     
    794807          iViewIdx = (Int)(m_pchMVCJointCodingOrder[i]-'0');
    795808          bThisViewContinueReadingPics = bContinueReadingPics[iViewIdx];
     809#if POZNAN_SYNTH
     810          if( m_uiUseCUSkip )
     811          {
     812            xStoreSynthPicsInBuffer(iViewIdx,false);
     813          }
     814#endif
    796815#if POZNAN_TEXTURE_TU_DELTA_QP_ACCORDING_TO_DEPTH
    797816          // If no depth picture reconstruction for current view and current POC is available sythesize one
    798           Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
     817          //Int   iCurrPoc2         = m_acTEncTopList[ 0 ]->getNextFrameId();
    799818          Bool  bCurrPicDepthRec = getPicFromView( iViewIdx, iCurrPoc, true ) != NULL && getPicFromView( iViewIdx, iCurrPoc, true )->getReconMark();
    800819          if(m_bUseTexDqpAccordingToDepth && !bCurrPicDepthRec)
     
    825844            iViewIdx = (Int)(m_pchMVCJointCodingOrder[i]-'0');
    826845            bThisViewContinueReadingDepthPics = bContinueReadingDepthPics[iViewIdx];
     846#if POZNAN_SYNTH
     847            if( m_uiUseCUSkip )
     848            {
     849              xStoreSynthPicsInBuffer(iViewIdx,true);
     850            }
     851#endif
    827852            m_acTEncDepthTopList[iViewIdx]->encode( bDepthEos[iViewIdx], m_cListPicYuvDepthRecMap[iViewIdx], pcBitstream, bThisViewContinueReadingDepthPics );
    828853            bContinueReadingDepthPics[iViewIdx]=bThisViewContinueReadingDepthPics;
     
    858883#if FLEX_CODING_ORDER
    859884      // If no depth picture reconstruction for current view and current POC is available sythesize one
    860       Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
     885      //Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
    861886      Bool  bCurrPicDepthRec = getPicFromView( iViewIdx, iCurrPoc, true ) != NULL && getPicFromView( iViewIdx, iCurrPoc, true )->getReconMark();
    862887      if(m_bUseTexDqpAccordingToDepth && !bCurrPicDepthRec)
     
    13901415  }
    13911416 
    1392   Int iNumberOfReferenceViews = 0;
    13931417  Int  iNearestViewIdx = -1;
    13941418  Bool bRenderFromLeft;
     
    14771501Void TAppEncTop::xStoreDepthSynthPicsInBuffer(Int iCoddedViewIdx)
    14781502{
    1479   Int  iLeftViewIdx  = -1;
    1480   Int  iRightViewIdx = -1;
    14811503  Int  iNearestViewIdx = -1;
    14821504  Bool bRenderFromLeft;
Note: See TracChangeset for help on using the changeset viewer.