Changeset 1319 in 3DVCSoftware

Timestamp:

4 Sep 2015, 23:00:43 (9 years ago)

Author:

tech

Message:

NH_MV_FIX_TICKET_106

Location:

branches/HTM-15.0-dev0/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-15.0-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -2030 +2030 @@
         }
 
-
         if (nonOutputLayerPictures.size() != 0 )
         {
@@ -2152 +2151 @@
       m_curAu.setPicLatencyCount( 0 );
 
-
       if ( m_auOutputFlag )
       {

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

@@ -562 +562 @@
       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 NH_MV_FIX_TICKET_106
+#if NH_MV
+      Int layerIdL0 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_0, pcCU->getCUMvField(REF_PIC_LIST_0)->getRefIdx(PartAddr))->getLayerId();
+      Int layerIdL1 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_1, pcCU->getCUMvField(REF_PIC_LIST_1)->getRefIdx(PartAddr))->getLayerId();
+#endif
+#if NH_MV
+      if(RefPOCL0 == RefPOCL1 && layerIdL0 == layerIdL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr))
+#elif NH_3D_ARP
+      if(!pcCU->getARPW(PartAddr) && RefPOCL0 == RefPOCL1 && layerIdL0 == layerIdL1 && 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
+#else
 #if NH_3D_ARP
       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
 #endif
       {

branches/HTM-15.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -64 +64 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
+#define NH_MV_FIX_TICKET_106                      1 // Identical motion check. 
 #define NH_MV_FIX_NO_REF_PICS_CHECK               1 // !!SPEC!! 
 #define NH_MV_FIX_INIT_NUM_ACTIVE_REF_LAYER_PICS  1 // Derivation of NumActiveRefLayerPIcs. !!SPEC!!