Changeset 1163 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.h

Timestamp:

16 Mar 2015, 12:40:05 (9 years ago)

Author:

tech

Message:

Merged branch 13.1-dev1-Samsung2@1162

File:

• branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.h (modified) (6 diffs)

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -1574 +1574 @@
       m_qtPredFlag            [d] = false; 
       m_interSdcFlag          [d] = false; 
-      m_intraSingleFlag       [d] = false;   
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+      m_depthIntraSkipFlag    [d] = false;   
+#else
+      m_intraSingleFlag       [d] = false; 
+#endif
     }
   }
@@ -1617 +1621 @@
   Bool getInterSdcFlag( Int d ) { return m_interSdcFlag[d]; } 
 
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  Void setDepthIntraSkipFlag( Int d, Bool flag ) { m_depthIntraSkipFlag[d] = flag; } 
+  Bool getDepthIntraSkipFlag( Int d ) { return m_depthIntraSkipFlag[d]; } 
+#else
   Void setIntraSingleFlag( Int d, Bool flag ) { m_intraSingleFlag[d] = flag; } 
   Bool getIntraSingleFlag( Int d ) { return m_intraSingleFlag[d]; } 
+#endif
 
 private:
@@ -1635 +1644 @@
   Bool        m_qtPredFlag            [2];
   Bool        m_interSdcFlag          [2];
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  Bool        m_depthIntraSkipFlag    [2];  
+#else
   Bool        m_intraSingleFlag       [2];  
+#endif
 };
 
@@ -2377 +2390 @@
 #endif
 #endif
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  Bool      m_bApplyDIS;
+#else
 #if H_3D_SINGLE_DEPTH
   Bool      m_bApplySingleDepthMode;
+#endif
 #endif
 #if H_3D_IC
@@ -2398 +2415 @@
   Bool m_qtPredFlag           ;
   Bool m_interSdcFlag         ;
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  Bool m_depthIntraSkipFlag   ;
+#else
   Bool m_intraSingleFlag      ;
-
+#endif
   Int  m_mpiSubPbSize         ; 
   Int  m_subPbSize            ; 
@@ -2822 +2842 @@
   Bool getQtPredFlag             ( ) { return m_qtPredFlag             ; };
   Bool getInterSdcFlag           ( ) { return m_interSdcFlag           ; };
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  Bool getDepthIntraSkipFlag     ( ) { return m_depthIntraSkipFlag     ; };
+#else
   Bool getIntraSingleFlag        ( ) { return m_intraSingleFlag        ; };
+#endif
 
   Int  getMpiSubPbSize           ( ) { return m_mpiSubPbSize           ; };