Changeset 684 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder

Timestamp:

16 Apr 2014, 02:23:24 (11 years ago)

Author:

seregin

Message:

code formatting

Location:

branches/SHM-6-dev/source/Lib/TLibDecoder

Files:

• TDecEntropy.h (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecEntropy.h

@@ -145 +145 @@
   Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
 #endif
-  Void    decodePPS                   ( TComPPS* pcPPS 
+
 #if Q0048_CGS_3D_ASYMLUT
-    , TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID
+  Void    decodePPS                   ( TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT, Int nLayerID )    { m_pcEntropyDecoderIf->parsePPS(pcPPS, pc3DAsymLUT , nLayerID );                     }
+#else
+  Void    decodePPS                   ( TComPPS* pcPPS )    { m_pcEntropyDecoderIf->parsePPS(pcPPS );  }
 #endif
-    )    { m_pcEntropyDecoderIf->parsePPS(pcPPS
-#if Q0048_CGS_3D_ASYMLUT
-    , pc3DAsymLUT , nLayerID
-#endif
-    );                    }
   Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager)  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager);         }
 

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1553 +1553 @@
         {
           if(!m_pColorMappedPic)
+          {
             initAsymLut(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0));
+          }
           m_c3DAsymLUTPPS.colorMapping( pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(),  m_pColorMappedPic );
           pBaseColRec = m_pColorMappedPic;
@@ -1561 +1563 @@
         if( pcPic->isSpatialEnhLayer(refLayerIdc) )
         {    
-/*#if O0098_SCALED_REF_LAYER_ID
-          Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc));
-#else
-          Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
-#endif*/
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT