Changeset 564 in 3DVCSoftware

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@…)

Location:

branches/HTM-DEV-2.0-dev2-MediaTek

Files:

• checklist/MTK_E0170.doc (added)
• codingresults/E173+E0168+E0170_vs_E0173+E0168.xls (added)
• source/App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)
• source/Lib/TLibCommon/TComDataCU.h (modified) (1 diff)
• source/Lib/TLibCommon/TComPic.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TComPic.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecGop.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/HTM-DEV-2.0-dev2-MediaTek/source/App/TAppDecoder/TAppDecTop.cpp

@@ -311 +311 @@
         TComPic* picLastCoded = m_ivPicLists.getPic( m_tDecTop[dI]->getLayerId(), pocLastPic );
         assert( picLastCoded != NULL );        
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+        picLastCoded->compressMotion(1);
+#else
         picLastCoded->compressMotion();         
+#endif
       }
     }

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)
   {

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

@@ -591 +591 @@
   Void          getMvPredAbove        ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldB.getMv(); }
   Void          getMvPredAboveRight   ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldC.getMv(); }
-  
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+  Void          compressMV            (int scale);
+#else            
   Void          compressMV            ();
-  
+#endif  
   // -------------------------------------------------------------------------------------------------------------------
   // utility functions for neighbouring information

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

@@ -146 +146 @@
   deleteSEIs(m_SEIs);
 }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+Void TComPic::compressMotion(int scale)
+#else
 Void TComPic::compressMotion()
+#endif
 {
   TComPicSym* pPicSym = getPicSym(); 
@@ -153 +156 @@
   {
     TComDataCU* pcCU = pPicSym->getCU(uiCUAddr);
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+    pcCU->compressMV(scale); 
+#else
     pcCU->compressMV(); 
+#endif
   } 
 }

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TComPic.h

@@ -179 +179 @@
   Void          setNumReorderPics(Int i, UInt tlayer) { m_numReorderPics[tlayer] = i;    }
   Int           getNumReorderPics(UInt tlayer)        { return m_numReorderPics[tlayer]; }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+  Void          compressMotion(int scale); 
+#else   
   Void          compressMotion(); 
+#endif
   UInt          getCurrSliceIdx()            { return m_uiCurrSliceIdx;                }
   Void          setCurrSliceIdx(UInt i)      { m_uiCurrSliceIdx = i;                   }

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TypeDef.h

@@ -99 +99 @@
 #define MTK_FAST_TEXTURE_ENCODING_E0173   1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
 #define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
+#define MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170            1   // Progressive MV Compression, JCT3V-E0170
 
 #if H_3D_NBDV

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibDecoder/TDecGop.cpp

@@ -214 +214 @@
     rpcPic->destroyNonDBFilterInfo();
   }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+  rpcPic->compressMotion(2); 
+#endif
 #if !H_3D
   rpcPic->compressMotion(); 

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1768 +1768 @@
         pcPic->destroyNonDBFilterInfo();
       }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+      pcPic->compressMotion(2); 
+#endif
 #if !H_3D
       pcPic->compressMotion(); 

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibEncoder/TEncTop.cpp

@@ -392 +392 @@
   if( picLastCoded )
   {
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+    picLastCoded->compressMotion(1); 
+#else
     picLastCoded->compressMotion(); 
+#endif
   }
 #endif