Changeset 1147 in 3DVCSoftware for branches/HTM-13.1-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.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/TComDataCU.cpp (modified) (10 diffs)

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

@@ -891 +891 @@
   memset( m_puhCbf[2],          0, iSizeInUchar );
   memset( m_puhDepth,     uiDepth, iSizeInUchar );
-#if H_3D_NBDV
+#if H_3D_NBDV && !SEC_ARP_REM_ENC_RESTRICT_K0035
   m_pDvInfo->bDV = false;
 #endif
@@ -5940 +5940 @@
 #endif
 #if H_3D_IV_MERGE
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+Void TComDataCU::getDispforDepth (UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDisp)
+#else
 Bool TComDataCU::getDispforDepth (UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDisp)
+#endif
 {
 
@@ -5956 +5960 @@
       pDisp->m_acNBDV = cMv;
       pDisp->m_aVIdxCan = iViewIdx;
-
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
       return true;
-  }
+#endif
+  }
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
   return false;
+#endif
 }
 #endif
@@ -6038 +6045 @@
 //TBD#2: set of DvMCP values need to be done as part of inter-view motion prediction process. Remove this comment once merge related integration is done
 //To be checked: Parallel Merge features for NBDV, related to DV_DERIVATION_PARALLEL_B0096 and LGE_IVMP_PARALLEL_MERGE_B0136 are not integrated. The need of these features due to the adoption of CU-based NBDV is not clear. We need confirmation on this, especially by proponents
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+Void TComDataCU::getDisMvpCandNBDV( DisInfo* pDInfo
+#else
 Bool TComDataCU::getDisMvpCandNBDV( DisInfo* pDInfo
+#endif
 #if H_3D_NBDV_REF
 , Bool bDepthRefine
@@ -6046 +6057 @@
   //// ******* Init variables ******* /////
   // Init disparity struct for results
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
   pDInfo->bDV = false;   
+#endif
   pDInfo->m_aVIdxCan = -1;
 
@@ -6141 +6154 @@
         pDInfo->m_acDoNBDV  = cColMv;
 #endif //H_3D_NBDV_REF
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+        return;
+#else
         return true;
+#endif
       }
     }
@@ -6158 +6175 @@
 #endif
     ) )
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+    return;
+#else
     return true;
+#endif
 
   //// ******* Get disparity from above block ******* /////
@@ -6170 +6191 @@
 #endif
       ) )
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+      return;
+#else
       return true;
+#endif
   }
 
@@ -6216 +6241 @@
           pDInfo->m_acDoNBDV = cDispVec;
 #endif
+#if SEC_ARP_REM_ENC_RESTRICT_K0035
+          return;
+#else
           return true;
+#endif
         }
       }
@@ -6252 +6281 @@
       pDInfo->m_acDoNBDV = defaultDV;
 #endif
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
       return true;
-  }
+#endif
+  }
+#if !SEC_ARP_REM_ENC_RESTRICT_K0035
   return false; 
+#endif
 }