Changeset 478 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder

Timestamp:

18 Jun 2013, 17:25:49 (12 years ago)

Author:

tech

Message:

Minor clean ups.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecCu.cpp (modified) (1 diff)
• TDecGop.cpp (modified) (2 diffs)
• TDecGop.h (modified) (2 diffs)
• TDecTop.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -759 +759 @@
     }
 #endif // !H_MV
-
 #if H_3D_IV_MERGE
     READ_FLAG( uiCode, "base_view_flag" );

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCu.cpp

@@ -320 +320 @@
     m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
     m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
+#if H_3D_IV_MERGE
     m_ppcCU[uiDepth]->copyDVInfoFrom(pcCU, uiAbsPartIdx);
-#if H_3D_IV_MERGE
     TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
     UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.cpp

@@ -158 +158 @@
     m_LFCrossSliceBoundaryFlag.push_back( pcSlice->getLFCrossSliceBoundaryFlag());
   }
-
 #if H_3D_IV_MERGE
   if( uiStartCUAddr == 0 )
@@ -165 +164 @@
   }
 #endif
-
 #if H_3D_NBDV 
   if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.h

@@ -54 +54 @@
 #include "TLibCommon/TComDepthMapGenerator.h"
 #endif
-
 #include "TDecEntropy.h"
 #include "TDecSlice.h"
@@ -86 +85 @@
   TComDepthMapGenerator*  m_pcDepthMapGenerator;
 #endif
-
   TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp

@@ -409 +409 @@
   m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
   m_cEntropyDecoder.init(&m_cPrediction);
-
 #if H_3D_IV_MERGE
   m_tAppDecTop = pcTAppDecTop;
@@ -919 +918 @@
 
 #endif
-
 #if H_3D_IV_MERGE
     TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewIndex, pcSlice->getPOC(), false ) : NULL;