Changeset 374 in 3DVCSoftware for branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder

Timestamp:

5 May 2013, 12:09:11 (11 years ago)

Author:

sharpjp-htm

Message:

D0060: Removal of IC's parsing dependency

Location:

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCu.cpp (modified) (3 diffs)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -790 +790 @@
       WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "applying IC flag" );
     }
+#if SHARP_ILLUCOMP_PARSE_D0060
+    if (pcSlice->getApplyIC())
+    {
+      WRITE_FLAG( pcSlice->getIcSkipParseFlag() ? 1 : 0, "ic_skip_mergeidx0" );
+    }
+#endif
   }
 #endif

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncCu.cpp

@@ -665 +665 @@
 
 #if LGE_ILLUCOMP_B0045
+#if SHARP_ILLUCOMP_PARSE_D0060
+    bICEnabled = false;
+#else
     bICEnabled = rpcBestCU->getICFlag(0);
+#endif
 #endif
 
@@ -720 +724 @@
           Bool bResPredFlag  = ( uiResPrdId > 0 );
 #if LGE_ILLUCOMP_B0045
+#if SHARP_ILLUCOMP_PARSE_D0060
+          {
+            Bool bICFlag = false;
+            rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
+#else
           for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)
           {
             Bool bICFlag = (uiICId ? true : false);
             rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
+#endif
 #endif
 #endif
@@ -1875 +1885 @@
     {
       TComYuv* pcPredYuvTemp = NULL;
+#if SHARP_ILLUCOMP_PARSE_D0060
+      if (rpcTempCU->getSlice()->getApplyIC() && rpcTempCU->getSlice()->getIcSkipParseFlag())
+      {
+        if (bICFlag && uiMergeCand == 0) 
+        {
+          continue;
+        }
+      }
+#endif
 #if LOSSLESS_CODING
       UInt iteration;

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -778 +778 @@
   {
     pcSlice ->xSetApplyIC();
+#if SHARP_ILLUCOMP_PARSE_D0060
+    if (pcSlice->getApplyIC())
+    {
+      pcSlice->setIcSkipParseFlag(rpcPic->getCurrSlice()->getPOC() % m_pcCfg->getIntraPeriod() != 0);
+    }
+#endif
   }
 #endif