Changeset 1258 in 3DVCSoftware for branches/HTM-14.1-update-dev1-MediaTek/source/Lib/TLibCommon/TComDataCU.h

Timestamp:

16 Jun 2015, 04:13:09 (9 years ago)

Author:

mediatek-htm

Message:

The reactivation of depth intra skip mode (DIS), the MACRO is "NH_3D_DIS".

by Yi-Wen Chen (yiwen.chen@…)

File:

• branches/HTM-14.1-update-dev1-MediaTek/source/Lib/TLibCommon/TComDataCU.h (modified) (4 diffs)

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

@@ -116 +116 @@
 
   Bool*          m_skipFlag;           ///< array of skip flags
-#if H_3D
-  Bool*         m_bDISFlag;         
-  UInt*         m_uiDISType;
+#if NH_3D_DIS
+  Bool*          m_bDISFlag;         
+  UChar*         m_ucDISType;
 #endif
   Char*          m_pePartSize;         ///< array of partition sizes
@@ -334 +334 @@
   Void          setSkipFlag           ( UInt idx, Bool skip)     { m_skipFlag[idx] = skip;   }
   Void          setSkipFlagSubParts   ( Bool skip, UInt absPartIdx, UInt depth );
-#if H_3D
+#if NH_3D_DIS
   Bool*        getDISFlag            ()                         { return m_bDISFlag;          }
   Bool         getDISFlag            ( UInt idx)                { return m_bDISFlag[idx];     }
   Void         setDISFlag            ( UInt idx, Bool bDIS)     { m_bDISFlag[idx] = bDIS;   }
-  Void         setDISFlagSubParts    ( Bool bDIS, UInt absPartIdx, UInt depth );
-
-  UInt*        getDISType            ()                         { return m_uiDISType; }
-  UInt         getDISType            ( UInt idx)                { return m_uiDISType[idx];     }
-  Void         getDISType            ( UInt idx, UInt uiDISType)     { m_uiDISType[idx] = uiDISType;   }
-  Void         setDISTypeSubParts    ( UInt uiDISType, UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth );
+  Void         setDISFlagSubParts    ( Bool bDIS, UInt uiAbsPartIdx, UInt uiDepth );
+
+  UChar*       getDISType            ()                         { return m_ucDISType; }
+  UChar        getDISType            ( UInt idx)                { return m_ucDISType[idx];     }
+  Void         getDISType            ( UInt idx, UChar ucDISType)     { m_ucDISType[idx] = ucDISType;   }
+  Void         setDISTypeSubParts    ( UChar ucDISType, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
   Char*         getPredictionMode     ()                        { return m_pePredMode;        }
@@ -501 +501 @@
   Void          getDispforDepth  ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp);
   Bool          getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm );
-
-   Bool          getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index);
 #endif
 #if H_3D_NBDV_REF
@@ -508 +506 @@
   Void          estimateDVFromDM(Int refViewIdx, UInt uiPartIdx, TComPic* picDepth, UInt uiPartAddr, TComMv* cMvPred );
 #endif //H_3D_NBDV_REF
+#endif
+#if NH_3D_DIS
+   Bool          getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index);
 #endif
 #if  H_3D_FAST_TEXTURE_ENCODING