Changeset 48 in 3DVCSoftware for branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

30 Mar 2012, 18:57:41 (13 years ago)

Author:

poznan-univ

Message:

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

File:

• branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp (modified) (7 diffs)

branches/0.3-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp

@@ -150 +150 @@
 #endif
 
+#if BITSTREAM_EXTRACTION
+    m_acTEncTopList[iViewIdx]->setLayerId                      ( ( (UInt)iViewIdx ) << 1 );
+#endif
     m_acTEncTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
     m_acTEncTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
@@ -359 +362 @@
 #endif
 
+#if BITSTREAM_EXTRACTION
+      m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( ( ( (UInt)iViewIdx ) << 1 ) + 1 );
+#endif
       m_acTEncDepthTopList[iViewIdx]->setViewId                       ( (UInt)iViewIdx );
       m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
       m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
+#if FLEX_CODING_ORDER
+      m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( m_cCameraData.getCamParsCodedPrecision  () );
+      m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( m_cCameraData.getVaryingCameraParameters() );
+      m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( m_cCameraData.getCodedScale             () );
+      m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( m_cCameraData.getCodedOffset            () );
+#else
       m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
       m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
       m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
       m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
+#endif
 #if DEPTH_MAP_GENERATION
       m_acTEncDepthTopList[iViewIdx]->setPredDepthMapGeneration       ( 0 );
@@ -794 +807 @@
           iViewIdx = (Int)(m_pchMVCJointCodingOrder[i]-'0');
           bThisViewContinueReadingPics = bContinueReadingPics[iViewIdx];
+#if POZNAN_SYNTH
+          if( m_uiUseCUSkip )
+          {
+            xStoreSynthPicsInBuffer(iViewIdx,false);
+          }
+#endif
 #if POZNAN_TEXTURE_TU_DELTA_QP_ACCORDING_TO_DEPTH
           // If no depth picture reconstruction for current view and current POC is available sythesize one
-          Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
+          //Int   iCurrPoc2         = m_acTEncTopList[ 0 ]->getNextFrameId();
           Bool  bCurrPicDepthRec = getPicFromView( iViewIdx, iCurrPoc, true ) != NULL && getPicFromView( iViewIdx, iCurrPoc, true )->getReconMark();
           if(m_bUseTexDqpAccordingToDepth && !bCurrPicDepthRec)
@@ -825 +844 @@
             iViewIdx = (Int)(m_pchMVCJointCodingOrder[i]-'0');
             bThisViewContinueReadingDepthPics = bContinueReadingDepthPics[iViewIdx];
+#if POZNAN_SYNTH
+            if( m_uiUseCUSkip )
+            {
+              xStoreSynthPicsInBuffer(iViewIdx,true);
+            }
+#endif
             m_acTEncDepthTopList[iViewIdx]->encode( bDepthEos[iViewIdx], m_cListPicYuvDepthRecMap[iViewIdx], pcBitstream, bThisViewContinueReadingDepthPics );
             bContinueReadingDepthPics[iViewIdx]=bThisViewContinueReadingDepthPics;
@@ -858 +883 @@
 #if FLEX_CODING_ORDER
       // If no depth picture reconstruction for current view and current POC is available sythesize one
-      Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
+      //Int   iCurrPoc         = m_acTEncTopList[ 0 ]->getNextFrameId();
       Bool  bCurrPicDepthRec = getPicFromView( iViewIdx, iCurrPoc, true ) != NULL && getPicFromView( iViewIdx, iCurrPoc, true )->getReconMark();
       if(m_bUseTexDqpAccordingToDepth && !bCurrPicDepthRec)
@@ -1390 +1415 @@
   }
   
-  Int iNumberOfReferenceViews = 0;
   Int  iNearestViewIdx = -1;
   Bool bRenderFromLeft;
@@ -1477 +1501 @@
 Void TAppEncTop::xStoreDepthSynthPicsInBuffer(Int iCoddedViewIdx)
 {
-  Int  iLeftViewIdx  = -1;
-  Int  iRightViewIdx = -1;
   Int  iNearestViewIdx = -1;
   Bool bRenderFromLeft;