Changeset 1147 in 3DVCSoftware for branches/HTM-13.1-dev1-Samsung/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

25 Feb 2015, 12:11:05 (9 years ago)

Author:

samsung-htm

Message:

Integration of K0035: Removal of encoder restriction of ARP

File:

• branches/HTM-13.1-dev1-Samsung/source/Lib/TLibCommon/TComPrediction.cpp (modified) (3 diffs)

branches/HTM-13.1-dev1-Samsung/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1255 +1255 @@
 #if H_3D_NBDV
   DisInfo cDistparity;
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+  cDistparity.m_acNBDV = pcCU->getDvInfo(0).m_acNBDV;
+  cDistparity.m_aVIdxCan = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
+#else
   cDistparity.bDV           = pcCU->getDvInfo(uiPartAddr).bDV;
   if( cDistparity.bDV )
@@ -1262 +1266 @@
     cDistparity.m_aVIdxCan = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
   }
+#endif
 #else
   assert(0); // ARP can be applied only when a DV is available
 #endif
-
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+  UChar dW = pcCU->getARPW ( uiPartAddr );
+#else
   UChar dW = cDistparity.bDV ? pcCU->getARPW ( uiPartAddr ) : 0;
-
+#endif
+
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
   if( cDistparity.bDV ) 
+#endif
   {
     Int arpRefIdx = pcCU->getSlice()->getFirstTRefIdx(eRefPicList);
@@ -1320 +1330 @@
       pYuvB0->clear(); pYuvB1->clear();
     }
-
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
     assert ( cDistparity.bDV );
-    
+#endif    
     TComMv cNBDV = cDistparity.m_acNBDV;
     pcCU->clipMv( cNBDV );