Changeset 1310 in 3DVCSoftware

Timestamp:

11 Aug 2015, 16:14:34 (9 years ago)

Author:

tech

Message:

Fixes:

NH_MV_FIX_TICKET_105 layer_set_idx_for_ols_minus1 length
NH_3D_FIX_TICKET_98 Writing of depth intra skip flag
NH_MV_FIX_TICKET_100 Extra slice header bits

Location:

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

Files:

• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncEntropy.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.h

@@ -1119 +1119 @@
   Void    setLayerSetIdxForOlsMinus1( Int outLayerSetIdx, Int val )             { m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]  = val; } 
   Int     getLayerSetIdxForOlsMinus1( Int outLayerSetIdx )           const      { return m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]; } 
+#if NH_MV_FIX_TICKET_105
+  Int     getLayerSetIdxForOlsMinus1Len( Int outLayerSetIdx )        const      { return gCeilLog2( getNumLayerSets() - 1 ); } 
+#else
   Int     getLayerSetIdxForOlsMinus1Len( Int outLayerSetIdx )        const      { return gCeilLog2( getNumLayerSets() ); } 
+#endif
 
   Void    setOutputLayerFlag( Int outLayerSetIdx, Int i, Bool flag )            { m_outputLayerFlag[ outLayerSetIdx ][ i ] = flag; } 

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -66 +66 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
+
+#define NH_MV_FIX_TICKET_105              1 // layer_set_idx_for_ols_minus1 length
+#define NH_3D_FIX_TICKET_98               1 // Writing of depth intra skip flag
+#define NH_MV_FIX_TICKET_100              1 // Extra slice header bits
+
+
 #define NH_3D_DIS_FIX                     1
 #define NH_3D_ENC_DEPTH_FIX               1 // Fix Intra TU coding. 

branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -119 +119 @@
 Void TEncEntropy::encodeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
+#if NH_3D_FIX_TICKET_98  
+  if( !pcCU->getSlice()->getDepthIntraSkipFlag() )
+#else
   if ( !pcCU->getSlice()->getIsDepth() )
+#endif
   {
     return;

branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1056 +1056 @@
   m_cPPS.setOutputFlagPresentFlag( false );
 #if NH_MV
+#if NH_MV_FIX_TICKET_100
+  m_cPPS.setNumExtraSliceHeaderBits( 2 ); 
+#else
   m_cPPS.setNumExtraSliceHeaderBits( 3 ); 
+#endif
 #endif
   m_cPPS.setSignHideFlag(getSignHideFlag());