Changeset 780 in 3DVCSoftware

Timestamp:

20 Jan 2014, 04:17:49 (10 years ago)

Author:

qualcomm

Message:

integration of JCT3V-G0127/JCT3V-G0098 by Qualcomm

Location:

branches/HTM-9.3-dev1-Qualcomm

Files:

• checklist/Qualcomm_JCT3V-G0119.doc (modified) (previous)
• checklist/Qualcomm_JCT3V-G0127.doc (added)
• codingresults/G0127_vs_G0119.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (7 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-9.3-dev1-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4351 +4351 @@
   //////// INTER VIEW MOTION COMP(IvMC) /////////
   ///////////////////////////////////////////////
-
+#if QC_DEPTH_MERGE_SIMP_G0127
+  if( getSlice()->getIsDepth() )
+  {
+    ivCandDir[1] = ivCandDir[2] = ivCandDir[3] = 0;
+  }
+#endif
   if( ivCandDir[0] )
   {
@@ -4588 +4593 @@
   //////// INTER VIEW DISP COMP (IvDC) ////////
   /////////////////////////////////////////////
-
+#if QC_DEPTH_MERGE_SIMP_G0127
+  if( ivCandDir[1] && iCount < getSlice()->getMaxNumMergeCand() && !getSlice()->getIsDepth() )
+#else
   if( ivCandDir[1] && iCount < getSlice()->getMaxNumMergeCand())
+#endif
   {
     assert(iCount < getSlice()->getMaxNumMergeCand());
@@ -4750 +4758 @@
   //////// SHIFTED IV (IvMCShift + IvDCShift) ////////
   ////////////////////////////////////////////////////
+#if QC_DEPTH_MERGE_SIMP_G0127
+  if(  ivMvPredFlag && iCount < getSlice()->getMaxNumMergeCand() && !getSlice()->getIsDepth() ) 
+#else
   if(  ivMvPredFlag && iCount < getSlice()->getMaxNumMergeCand() ) 
+#endif
   {
     if(xAddIvMRGCand( mrgCandIdx,  iCount, abCandIsInter, pcMvFieldNeighbours, puhInterDirNeighbours, ivCandDir, ivCandMv, ivCandRefIdx, posIvDC, vspFlag, iCount3DV, inheritedVSPDisInfo ) )
@@ -7300 +7312 @@
    iCurrPosY  += ( iHeight >> 1 );
  }
+#if QC_DEPTH_MERGE_SIMP_G0127
+ for(Int iLoopCan = ( 1 - m_pcSlice->getIsDepth() ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++) 
+#else
  for(Int iLoopCan = ( 1 - m_pcSlice->getIsDepth() ); iLoopCan < 2; iLoopCan ++) 
+#endif
 #else
   for(Int iLoopCan = 1; iLoopCan < 2; iLoopCan ++) 
@@ -7387 +7403 @@
 #if H_3D_SPIVMP
 #if QC_SPIVMP_MPI_G0119
+#if QC_DEPTH_MERGE_SIMP_G0127
+  for(Int iLoopCan = ( 1 - m_pcSlice->getIsDepth() ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++) 
+#else
   for(Int iLoopCan = ( 1 - m_pcSlice->getIsDepth() ); iLoopCan < 2; iLoopCan ++) 
+#endif
 #else
   for(Int iLoopCan = 1; iLoopCan < 2; iLoopCan ++)
@@ -7402 +7422 @@
   /////// IvDC + IvDCShift ///////
   ////////////////////////////////
-  
+#if QC_DEPTH_MERGE_SIMP_G0127
+  if( !getSlice()->getIsDepth() )
+  {
+#endif
   for( Int iRefListId = 0; iRefListId < 2 ; iRefListId++ )
   {
@@ -7436 +7459 @@
     availableMcDc[1 + (iLoopCan << 1)] = ( abPdmAvailable[2 + (iLoopCan<<2)] ? 1 : 0 ) + ( abPdmAvailable[3 + (iLoopCan<<2)] ? 2 : 0 );
   }
+#if QC_DEPTH_MERGE_SIMP_G0127
+  }
+#endif
   return false;
 }

branches/HTM-9.3-dev1-Qualcomm/source/Lib/TLibCommon/TypeDef.h

@@ -229 +229 @@
 #define QC_SPIVMP_MPI_G0119               1 // Sub-PU level MPI merge candidate
 #endif
+#define QC_DEPTH_MERGE_SIMP_G0127         1 // Remove DV candidate and shifting candidate for depth coding
 
 ///// ***** DEPTH INTRA MODES *********