Changeset 710 in 3DVCSoftware for branches/HTM-8.2-dev0/source/Lib/TLibEncoder

Timestamp:

21 Nov 2013, 11:01:25 (11 years ago)

Author:

tech

Message:

Merged DEV1 ( branch HTM-8.2-dev1-Sharp2@707 )

Location:

branches/HTM-8.2-dev0/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (5 diffs)
• TEncGOP.cpp (modified) (1 diff)

branches/HTM-8.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1905 +1905 @@
           rpcTempCU->getCUMvField( REF_PIC_LIST_0 )->setAllMvField( cMvFieldNeighbours[0 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
           rpcTempCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
-#if H_3D_ARP
+#if H_3D_ARP && !QC_MTK_INTERVIEW_ARP_F0123_F0108
           if( nARPW )
           {
@@ -2115 +2115 @@
     m_pcPredSearch->motionCompensation( rpcTempCU , m_ppcPredYuvTemp[uhDepth] );
 
+#if !QC_MTK_INTERVIEW_ARP_F0123_F0108
     if(rpcTempCU->getPartitionSize(0)==SIZE_2Nx2N)
     {
@@ -2132 +2133 @@
       }
     }
+#endif
   }
   else
@@ -2152 +2154 @@
      m_ppcWeightedTempCU[uhDepth]->copyPartFrom( rpcTempCU , 0 , uhDepth );
 
+#if !QC_MTK_INTERVIEW_ARP_F0123_F0108
      Bool bSignalflag[2] = { true, true };
      for(UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx ++ )
@@ -2166 +2169 @@
        rpcTempCU->setARPWSubParts( 0 , 0 , uhDepth );
      }
+#endif
    }
   }

branches/HTM-8.2-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -724 +724 @@
 #if H_3D_ARP
     //GT: This seems to be broken when layerId in vps is not equal to layerId in nuh
+#if SHARP_ARP_REF_CHECK_F0105
+    pcSlice->setARPStepNum(m_ivPicLists);
+#else
     pcSlice->setARPStepNum();
+#endif
     if(pcSlice->getARPStepNum() > 1)
     {