Changeset 231 in 3DVCSoftware for branches/HTM-5.1-dev3-MERL/source/Lib/TLibCommon/TComLoopFilter.cpp

Timestamp:

26 Jan 2013, 19:36:53 (12 years ago)

Author:

mitsubishi-htm

Message:

-Integration of JCT3V-C0152 & JCT3V-C0131
-This check-in enable C0131 only

File:

• branches/HTM-5.1-dev3-MERL/source/Lib/TLibCommon/TComLoopFilter.cpp (modified) (3 diffs)

branches/HTM-5.1-dev3-MERL/source/Lib/TLibCommon/TComLoopFilter.cpp

@@ -439 +439 @@
   
   //-- Set BS for Intra MB : BS = 4 or 3
-  if ( pcCUP->isIntra(uiPartP) || pcCUQ->isIntra(uiPartQ) )
+  if ( pcCUP->isIntra(uiPartP) || pcCUQ->isIntra(uiPartQ) 
+#if MERL_VSP_C0152
+    || pcCUP->getVSPIndex(uiPartP) || pcCUQ->getVSPIndex(uiPartQ)
+#endif
+     )
   {
     uiBs = 2;
@@ -445 +449 @@
   
   //-- Set BS for not Intra MB : BS = 2 or 1 or 0
-  if ( !pcCUP->isIntra(uiPartP) && !pcCUQ->isIntra(uiPartQ) )
+  if ( !pcCUP->isIntra(uiPartP) && !pcCUQ->isIntra(uiPartQ) 
+#if MERL_VSP_C0152
+    && !pcCUP->getVSPIndex(uiPartP) && !pcCUQ->getVSPIndex(uiPartQ)
+#endif
+  )
   {
 #if NSQT_LFFIX
@@ -542 +550 @@
   }   // enf of "if( not Intra )"
   
+#if MERL_VSP_C0152
+  if ( pcCUP->getVSPIndex(uiPartP) || pcCUQ->getVSPIndex(uiPartQ))
+  {
+    uiBs = 0;
+  }
+#endif
+
   m_aapucBS[iDir][uiAbsPartIdx] = uiBs;
 }