Changeset 924 in 3DVCSoftware

Timestamp:

17 Apr 2014, 13:54:45 (11 years ago)

Author:

lg

Message:

JCT3V-H0119/JCT3V-H0135

Location:

branches/HTM-10.2-dev3-LGE/source/Lib

Files:

• TLibCommon/ContextTables.h (modified) (3 diffs)
• TLibCommon/TComDataCU.cpp (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecSbac.cpp (modified) (1 diff)
• TLibEncoder/TEncSbac.cpp (modified) (1 diff)

branches/HTM-10.2-dev3-LGE/source/Lib/TLibCommon/ContextTables.h

@@ -110 +110 @@
 #define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
 #endif
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+#define NUM_ANGLE_FLAG_CTX            1
+#else
 #define NUM_ANGLE_FLAG_CTX            3
+#endif
 #endif
 
@@ -368 +372 @@
 };
 
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+static const UChar 
+INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
+{
+  { 154 },
+  { 141 },
+  { 155 },
+};
+#else
 static const UChar 
 INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
@@ -375 +388 @@
   { 155, 170, 157 },
 };
+#endif
 
 static const UChar 

branches/HTM-10.2-dev3-LGE/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2383 +2383 @@
 UInt TComDataCU::getCtxAngleFlag( UInt uiAbsPartIdx )
 {
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+  return 0;
+#else
   TComDataCU* pcTempCU;
   UInt        uiTempPartIdx;
@@ -2396 +2399 @@
 
   return uiCtx;
+#endif
 }
 #endif

branches/HTM-10.2-dev3-LGE/source/Lib/TLibCommon/TypeDef.h

@@ -273 +273 @@
 #define H_3D_DIM_DLT                      1   // Depth Lookup Table
 
+#define LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135  1 // Use only one context for CABAC of dim_not_present_flag
 #define QC_SIMP_DELTADC_CODING_H0131      1   // Simplify detaDC entropy coding 
 #if H_3D_DIM_DLT

branches/HTM-10.2-dev3-LGE/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -1135 +1135 @@
   if( ( pcCU->getSlice()->getSPS()->getMaxCUWidth() >> pcCU->getDepth( absPartIdx ) ) < 64 ) //DMM and HEVC intra modes are both allowed
   {
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+    m_pcTDecBinIf->decodeBin( uiSymbol, m_cAngleFlagSCModel.get( 0, 0, 0 ) );
+#else
     m_pcTDecBinIf->decodeBin( uiSymbol, m_cAngleFlagSCModel.get( 0, 0, pcCU->getCtxAngleFlag( absPartIdx ) ) );
+#endif
   }
   else

branches/HTM-10.2-dev3-LGE/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -1243 +1243 @@
   if( ( pcCU->getSlice()->getSPS()->getMaxCUWidth() >> pcCU->getDepth( absPartIdx ) ) < 64 ) //DMM and HEVC intra modes are both allowed
   {
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+    m_pcBinIf->encodeBin( isDimMode( dir ) ? 0 : 1, m_cAngleFlagSCModel.get( 0, 0, 0 ) );
+#else
     m_pcBinIf->encodeBin( isDimMode( dir ) ? 0 : 1, m_cAngleFlagSCModel.get( 0, 0, pcCU->getCtxAngleFlag( absPartIdx ) ) );
+#endif
   }
   if( isDimMode( dir ) )