Changeset 374 in 3DVCSoftware

Timestamp:

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

Author:

sharpjp-htm

Message:

D0060: Removal of IC's parsing dependency

Location:

branches/HTM-6.2-dev1-Sharp

Files:

• CommonTestConditionsResults/JCT3V-D0060 On vs Off(r361).xlsm (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)
• source/Lib/TLibCommon/TComSlice.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncCu.cpp (modified) (3 diffs)
• source/Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3003 +3003 @@
   UInt iNumbPart;
 
+#if SHARP_ILLUCOMP_PARSE_D0060
+  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
+  {
+    return false;
+  }
+  if (getSlice()->getIcSkipParseFlag())
+  {
+    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
+    {
+      return false;
+    }
+  }
+  if (getMergeFlag(uiAbsPartIdx))
+  {
+    return true;
+  }
+#endif
+#if HHI_MPI
   if(!getSlice()->getIsDepth())
   {
+#endif
     Int iWidth, iHeight;
 
@@ -3025 +3044 @@
       }
     }
+#if HHI_MPI
   }
   else
@@ -3046 +3066 @@
     }
   }
+#endif
 
   return false;
@@ -3056 +3077 @@
   Int iWidth, iHeight;
 
+#if SHARP_ILLUCOMP_PARSE_D0060
+  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
+  {
+    return false;
+  }
+  if (getSlice()->getIcSkipParseFlag())
+  {
+    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
+    {
+      return false;
+    }
+  }
+  if (getMergeFlag(uiAbsPartIdx))
+  {
+    return true;
+  }
+#endif
   UInt uiPartMode = getPartitionSize(uiAbsPartIdx);
 

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.cpp

@@ -113 +113 @@
 #if LGE_ILLUCOMP_B0045
 , m_bApplyIC                      ( false )
+#if SHARP_ILLUCOMP_PARSE_D0060
+, m_icSkipParseFlag               ( false )
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115
@@ -827 +830 @@
 
   m_bLMvdL1Zero = pSrc->m_bLMvdL1Zero;
+#if LGE_ILLUCOMP_B0045
+  m_bApplyIC = pSrc->m_bApplyIC;
+#if SHARP_ILLUCOMP_PARSE_D0060
+  m_icSkipParseFlag = pSrc->m_icSkipParseFlag;
+#endif
+#endif
 }
 

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComSlice.h

@@ -1106 +1106 @@
 #if LGE_ILLUCOMP_B0045
   Bool        m_bApplyIC;
+#if SHARP_ILLUCOMP_PARSE_D0060
+  Bool        m_icSkipParseFlag;
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115|QC_MVHEVC_B0046
@@ -1401 +1404 @@
   Bool      getApplyIC            ()  { return m_bApplyIC; }
   Void      xSetApplyIC           ();
+#if SHARP_ILLUCOMP_PARSE_D0060
+  Void      setIcSkipParseFlag( Bool b ) { m_icSkipParseFlag = b; }
+  Bool      getIcSkipParseFlag() { return m_icSkipParseFlag; }
+#endif
 #endif
 #if QC_TMVP_MRG_REFIDX_C0047

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TypeDef.h

@@ -143 +143 @@
 #endif
 #endif
+
+#define SHARP_ILLUCOMP_PARSE_D0060        1   // JCT3V-D0060 Removal of IC's parsing dependency
 
 ///// ***** INTERVIEW SKIP *********

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1665 +1665 @@
     }
     rpcSlice->setApplyIC(uiCodeTmp);
+#if SHARP_ILLUCOMP_PARSE_D0060
+    if (rpcSlice->getApplyIC())
+    {
+      READ_FLAG (uiCodeTmp, "ic_skip_mergeidx0");
+      rpcSlice->setIcSkipParseFlag(uiCodeTmp);
+    }
+#endif
   }
 #endif

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