Changeset 564 in 3DVCSoftware for branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

12 Aug 2013, 06:58:37 (11 years ago)

Author:

mediatek-htm

Message:

Integration of JCT3V-E0170 for motion data storage reduction.
The MACRO is "MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170".

By Yi-Wen Chen (yiwen.chen@…)

File:

• branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3083 +3083 @@
       abCandIsInter[iCount] = true;      
       puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+      pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
+      if (pcMvFieldNeighbours[iCount<<1].getRefIdx()>=0)
+#else
       if( ( puhInterDirNeighbours[iCount] & 1 ) == 1 )
-      {
+#endif
+      {
+#if !MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
         pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
+#endif
         TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
 
@@ -3102 +3109 @@
       if ( getSlice()->isInterB() )
       {
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+        pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
+        if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()>=0)
+#else
         if( ( puhInterDirNeighbours[iCount] & 2 ) == 2 )
+#endif
         {
+#if !MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
           pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
+#endif
           TComMv cMvPred = pcMvFieldNeighbours[(iCount<<1)+1].getMv();
 #if H_3D_IC
@@ -3115 +3129 @@
         }
       }
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+      puhInterDirNeighbours[iCount] = (pcMvFieldNeighbours[iCount<<1].getRefIdx()>=0)?1:0;
+      puhInterDirNeighbours[iCount] += (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()>=0)?2:0;
+#endif
 #if H_3D_NBDV
       pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
@@ -4381 +4399 @@
                                         + ( iPartWidth/m_pcPic->getMinCUWidth()  )/2];
 }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+Void TComDataCU::compressMV(int scale)
+#else
 Void TComDataCU::compressMV()
-{
+#endif
+{
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+  Int scaleFactor = (4 / scale ) * AMVP_DECIMATION_FACTOR / m_unitSize;
+#else
   Int scaleFactor = 4 * AMVP_DECIMATION_FACTOR / m_unitSize;
+#endif
   if (scaleFactor > 0)
   {