Changeset 534 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder

Timestamp:

13 Jul 2013, 10:26:41 (11 years ago)

Author:

tech

Message:

MergeMerged tags/HTM-DEV-1.0.

File:

• branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)

branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

@@ -150 +150 @@
   Bool recon_opened = false; // reconstruction file not yet opened. (must be performed after SPS is seen)
 #else
+#if H_3D
   Int  pocCurrPic        = -MAX_INT;     
   Int  pocLastPic        = -MAX_INT;   
+#endif
 
   Int  layerIdCurrPic    = 0; 
@@ -187 +189 @@
     Bool newSliceDiffPoc   = false;
     Bool newSliceDiffLayer = false;
+#if H_3D
     Bool allLayersDecoded  = false;     
+#endif
 #endif
     if (nalUnit.empty())
@@ -222 +226 @@
         {
           layerIdCurrPic = nalu.m_layerId; 
+#if H_3D
           pocCurrPic     = m_tDecTop[decIdx]->getCurrPoc(); 
+#endif
           decIdxCurrPic  = decIdx; 
           firstSlice     = false; 
@@ -230 +236 @@
         { 
           layerIdCurrPic    = nalu.m_layerId; 
-          
+#if H_3D          
           pocLastPic        = pocCurrPic; 
           pocCurrPic        = m_tDecTop[decIdx]->getCurrPoc(); 
-          
+#endif          
           decIdxLastPic     = decIdxCurrPic; 
           decIdxCurrPic     = decIdx; 
-
+#if H_3D
           allLayersDecoded = ( pocCurrPic != pocLastPic );
+#endif
         }