Changeset 291 in 3DVCSoftware

Timestamp:

19 Feb 2013, 15:44:23 (12 years ago)

Author:

tech

Message:

Integrated fix for harmonization of C0137/C0152 from Rev. 288.
(FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152)

Location:

branches/HTM-5.1-dev0/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (4 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3878 +3878 @@
   deriveLeftRightTopIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
   deriveLeftBottomIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
-
+#if !FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   if( m_pcSlice->getIsDepth())
@@ -3912 +3912 @@
         }
       }
+#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
+      xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
+#endif
 #if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
@@ -3921 +3924 @@
     }
   }
+#endif
 #endif
 
@@ -3972 +3976 @@
 #endif
   }
+#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
+#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
+  if( m_pcSlice->getIsDepth())
+  {
+    UInt uiPartIdxCenter;
+    xDeriveCenterIdx( cCurPS, uiPUIdx, uiPartIdxCenter );    
+    TComDataCU *pcTextureCU = m_pcSlice->getTexturePic()->getCU( getAddr() );
+    if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
+    {
+      abCandIsInter[iCount] = true;      
+      puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
+      if( ( puhInterDirNeighbours[iCount] & 1 ) == 1 )
+      {
+        pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
+        TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
+        const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
+        cMvPred+=cAdd;
+        cMvPred>>=2;
+        clipMv(cMvPred);
+        pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
+      }
+      if ( getSlice()->isInterB() )
+      {
+        if( ( puhInterDirNeighbours[iCount] & 2 ) == 2 )
+        {
+          pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
+          TComMv cMvPred = pcMvFieldNeighbours[(iCount<<1)+1].getMv();
+          const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
+          cMvPred+=cAdd;
+          cMvPred>>=2;
+          clipMv(cMvPred);
+          pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
+        }
+      }
+#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
+      xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
+#endif
+#if SIMP_MRG_PRUN
+      if ( mrgCandIdx == iCount )
+      {
+        return;
+      }
+#endif
+      iCount ++;
+    }
+  }
+#endif
+#endif
 #if QC_MRG_CANS_B0048
   Int iPdmDir[2] = {0, 0};

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

@@ -179 +179 @@
 
 ///// ***** VSP *********
-#define MERL_VSP_C0152                    0 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
+#define MERL_VSP_C0152                    1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
+#define FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152 1 
 #if MERL_VSP_C0152