Changeset 935 in 3DVCSoftware for branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

22 Apr 2014, 15:17:54 (10 years ago)

Author:

tech

Message:

Merged 10.2-dev1-MediaTek@934.

File:

• branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)

branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComPrediction.cpp

@@ -519 +519 @@
       Int RefPOCL0 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_0, pcCU->getCUMvField(REF_PIC_LIST_0)->getRefIdx(PartAddr))->getPOC();
       Int RefPOCL1 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_1, pcCU->getCUMvField(REF_PIC_LIST_1)->getRefIdx(PartAddr))->getPOC();
+#if MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085
+      if(!pcCU->getARPW(PartAddr) && RefPOCL0 == RefPOCL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr))
+#else
       if(RefPOCL0 == RefPOCL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr))
+#endif
       {
         return true;