Changeset 921 in 3DVCSoftware

Timestamp:

16 Apr 2014, 11:34:33 (10 years ago)

Author:

mediatek-htm

Message:

Integration of H0094

Location:

branches/HTM-10.2-dev2-MediaTek

Files:

• checklist/MTK_H0091+H0094.doc (added)
• checklist/SEC_H0103.doc (modified) (previous)
• checklist/SEC_H0104.doc (modified) (previous)
• checklist/SEC_H0105.doc (modified) (previous)
• source/Lib/TLibCommon/ContextTables.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (2 diffs)
• source/Lib/TLibDecoder/TDecSbac.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncEntropy.cpp (modified) (2 diffs)
• source/Lib/TLibEncoder/TEncSbac.cpp (modified) (1 diff)

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibCommon/ContextTables.h

@@ -430 +430 @@
 
 #if H_3D_DBBP
+#if MTK_DBBP_SIGNALING_H0094
 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
 {
-  { CNU },
-  { CNU },
-  { CNU },
-};
-#endif
-
-#endif
+  { 161 },
+  { 161 },
+  { 161 },
+};
+#else
+static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
+{
+  { CNU },
+  { CNU },
+  { CNU },
+};
+#endif
+#endif
+
+#endif

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibCommon/TypeDef.h

@@ -301 +301 @@
 #define RWTH_DBBP_NO_SPU_H0057                 1
 #define SEC_DBBP_FILTERING_H0104               1
+#define MTK_DBBP_SIGNALING_H0094               1    
 #endif
 

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -139 +139 @@
   
 #if H_3D_DBBP
+
+#if MTK_DBBP_SIGNALING_H0094
+  if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) )
+#else
   if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && pcCU->getPartitionSize(uiAbsPartIdx) == RWTH_DBBP_PACK_MODE )
+#endif
   {
     decodeDBBPFlag(pcCU, uiAbsPartIdx, uiDepth);
@@ -145 +150 @@
     if( pcCU->getDBBPFlag(uiAbsPartIdx) )
     {
+#if !MTK_DBBP_SIGNALING_H0094
       AOF( pcCU->getPartitionSize(uiAbsPartIdx) == RWTH_DBBP_PACK_MODE );
-      
+#endif
+
       // get collocated depth block
       UInt uiDepthStride = 0;

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -2141 +2141 @@
 Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
+#if !MTK_DBBP_SIGNALING_H0094
   PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
+#endif
   AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) );
   AOF( !pcCU->getSlice()->getIsDepth() );
+#if !MTK_DBBP_SIGNALING_H0094
   AOF( ePartSize == RWTH_DBBP_PACK_MODE );
+#endif
   
   UInt uiSymbol = 0;

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -246 +246 @@
   
 #if H_3D_DBBP
+
+#if MTK_DBBP_SIGNALING_H0094
+  if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) )
+#else
   if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && pcCU->getPartitionSize(uiAbsPartIdx) == RWTH_DBBP_PACK_MODE )
+#endif
   {
     encodeDBBPFlag(pcCU, uiAbsPartIdx, bRD);
@@ -252 +257 @@
     if( pcCU->getDBBPFlag(uiAbsPartIdx) )
     {
+#if !MTK_DBBP_SIGNALING_H0094
       AOF( pcCU->getPartitionSize(uiAbsPartIdx) == RWTH_DBBP_PACK_MODE );
+#endif
       // restore virtual partition size for DBBP blocks
       pcCU->setPartSizeSubParts(eVirtualPartSize, uiAbsPartIdx, uiDepth);

branches/HTM-10.2-dev2-MediaTek/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -2356 +2356 @@
 Void TEncSbac::codeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
+#if !MTK_DBBP_SIGNALING_H0094
   PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
   AOF( ePartSize == RWTH_DBBP_PACK_MODE );
+#endif
   AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) );
   AOF( !pcCU->getSlice()->getIsDepth() );