Changeset 382 in 3DVCSoftware for branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon

Timestamp:

7 May 2013, 10:29:53 (12 years ago)

Author:

zhang

Message:

JCT3V-D0195 and Results for D0183/D0195

Location:

branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon

Files:

• ContextTables.h (modified) (3 diffs)
• TComDataCU.cpp (modified) (2 diffs)
• TComDataCU.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon/ContextTables.h

@@ -128 +128 @@
 
 #if RWTH_SDC_DLT_B0036
+#if PKU_QC_DEPTH_INTRA_UNI_D0195
+#define DEPTH_MODE_NUM_FLAG_CTX          8
+#define DMM_DELTA_NUM_FLAG_CTX           1
+#else
 #define SDC_NUM_FLAG_CTX                 3
+#endif
 #define SDC_NUM_RESIDUAL_FLAG_CTX        1
 #define SDC_NUM_SIGN_FLAG_CTX            1
@@ -523 +528 @@
 
 #if RWTH_SDC_DLT_B0036
+#if PKU_QC_DEPTH_INTRA_UNI_D0195
+static const UChar INIT_DEPTHMODE_FLAG[3][DEPTH_MODE_NUM_FLAG_CTX]=
+{
+  {0,  0,  64,   0, CNU,   0, CNU, 0},
+  {0, 64,   0, CNU,   0, CNU,   0, 0},
+  {64, 0, CNU,   0, CNU,   0,   0, 0}
+};
+static const UChar INIT_DMMDELTA_FLAG[3][DMM_DELTA_NUM_FLAG_CTX]=
+{
+  {0},
+  {0},
+  {64}
+};
+#else
 static const Short INIT_SDC_FLAG[3][SDC_NUM_FLAG_CTX][2] =
 {
@@ -535 +554 @@
   }
 };
+#endif
 
 static const Short INIT_SDC_RESIDUAL_FLAG[3][3*SDC_NUM_RESIDUAL_FLAG_CTX][2] =

branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2907 +2907 @@
 }
 
+#if !PKU_QC_DEPTH_INTRA_UNI_D0195
 UInt TComDataCU::getCtxSDCFlag( UInt uiAbsPartIdx )
 {
@@ -2923 +2924 @@
   return uiCtx;
 }
+#endif
 
 Bool TComDataCU::getSDCAvailable( UInt uiAbsPartIdx )

branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon/TComDataCU.h

@@ -808 +808 @@
   Void          setSDCFlagSubParts  ( Bool bSDCFlag, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth );
   
-  UInt          getCtxSDCFlag              ( UInt uiAbsPartIdx );
+#if !PKU_QC_DEPTH_INTRA_UNI_D0195
+  UInt          getCtxSDCFlag               ( UInt uiAbsPartIdx );
+#endif
   
   Bool          getSDCAvailable             ( UInt uiAbsPartIdx );

branches/HTM-6.2-dev3-Qualcomm/source/Lib/TLibCommon/TypeDef.h

@@ -76 +76 @@
 #define FIX_SDC_ENC_RD_WVSO_D0163         1   // JCT3V-D0163: fix for SDC encoder rd-cost (VSO -> WVSO)
 
+#define PKU_QC_DEPTH_INTRA_UNI_D0195      1   // JCT3V-D0195: unified syntax table for depth intra coding tools
 ///// ***** TMVP/AMVP *********
 #define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only