Changeset 1305 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder

Timestamp:

29 Jul 2015, 12:12:44 (9 years ago)

Author:

tech

Message:

Further fixes and alignments.

Location:

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecCu.cpp (modified) (1 diff)
• TDecSbac.h (modified) (1 diff)
• TDecSlice.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)
• TDecTop.h (modified) (1 diff)

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -507 +507 @@
   {
     READ_CODE(6, uiCode, "pps_depth_layers_minus1");
+#if H_MV_VER141_DEC_COMP_FLAG
+    pcDLT->setNumDepthViews( uiCode );
+#else
     pcDLT->setNumDepthViews( uiCode+1 );
+#endif
     
     READ_CODE(4, uiCode, "pps_bit_depth_for_depth_layers_minus8");
     pcDLT->setDepthViewBitDepth( (uiCode+8) );
     
+#if NH_3D_DLT_FIX
+    for( Int i = 0; i <= pcDLT->getNumDepthViews()-1; i++ )
+#else
     for( Int i = 0; i <= pcDLT->getNumDepthViews(); i++ )
+#endif
     {
       Int layerId = pcDLT->getDepthIdxToLayerId(i);

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.cpp

@@ -923 +923 @@
     }
     
-#if H_3D
+#if NH_3D
     AOF( pcCU->getARPW(uiPartAddr) == 0 );
     AOF( pcCU->getICFlag(uiPartAddr) == false );

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.h

@@ -79 +79 @@
   Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
   Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
-#if H_3D
-  Void  parsePPS                  ( TComPPS* /*pcPPS*/, TComVPS* /*pcVPS*/ ) {}
-#else
   Void  parsePPS                  ( TComPPS* /*pcPPS*/ ) {}
-#endif
   Void  parseSliceHeader          ( TComSlice* /*pcSlice*/, ParameterSetManager* /*parameterSetManager*/, const Int /*prevTid0POC*/) {}
   Void  parseTerminatingBit       ( UInt& ruiBit );

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -130 +130 @@
     }
   }
-#if  H_3D
+#if  NH_3D_DLT
   if( pcSlice->getPPS()->getDLT() != NULL )
   {
-      assert( pcSlice->getSPS()->getBitDepthY() == pcSlice->getPPS()->getDLT()->getDepthViewBitDepth() );
+      assert( pcSlice->getSPS()->getBitDepth( CHANNEL_TYPE_LUMA ) == pcSlice->getPPS()->getDLT()->getDepthViewBitDepth() );
   }
 #endif

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1314 +1314 @@
   pps->setLayerId( getLayerId() ); 
 #endif
-#if H_3D
-  // GT: Please don't add parsing dependency of SPS from VPS here again!!!
-#endif
 #if NH_3D_DLT
   // create mapping from depth layer indexes to layer ids

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.h

@@ -176 +176 @@
 };
 
-#endif //H_3D
+#endif //NH_3D
 /// decoder class
 class TDecTop