Changeset 246 in 3DVCSoftware for branches/HTM-5.1-dev3-Mediatek/source/Lib

Timestamp:

31 Jan 2013, 07:39:49 (12 years ago)

Author:

mediatek-htm

Message:

Integration of JCT3V-C0135
The MACRO is MTK_SIMPLIFY_DVTC

Location:

branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon

Files:

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

branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5808 +5808 @@
     uiBRIdx = uiPartIdxLT;
     UInt uiAbsPartIdxTmp = g_auiZscanToRaster[uiPartIdxRB];
+#if MTK_SIMPLIFY_DVTC
+    if (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() )>= m_pcSlice->getSPS()->getPicWidthInLumaSamples() )
+    {
+      uiLCUnew = -1;
+    }
+    else if(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() )>= m_pcSlice->getSPS()->getPicHeightInLumaSamples() )
+    {
+      uiLCUnew = -1;
+    }
+    else
+#else
     if ( (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() ) < m_pcSlice->getSPS()->getPicWidthInLumaSamples() ) &&(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getSPS()->getPicHeightInLumaSamples() ))  // image boundary check
+#endif
     {
       if ( ( uiAbsPartIdxTmp % uiNumPartInCUWidth < uiNumPartInCUWidth - 1 ) &&           // is not at the last column of LCU 
@@ -5818 +5830 @@
       {
         uiBRIdx = g_auiRasterToZscan[ (uiAbsPartIdxTmp + uiNumPartInCUWidth + 1) % m_pcPic->getNumPartInCU() ];
+#if MTK_SIMPLIFY_DVTC
+        uiLCUnew = -1;
+#else
         uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU();
+#endif
       }
       else if ( uiAbsPartIdxTmp / uiNumPartInCUWidth < m_pcPic->getNumPartInHeight() - 1 ) // is not at the last row of LCU But is last column of LCU
@@ -5828 +5844 @@
       {
         uiBRIdx = 0;
+#if MTK_SIMPLIFY_DVTC
+        uiLCUnew = -1;
+#else
         uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU() + 1;
+#endif
       }
     }
@@ -5854 +5874 @@
       if( m_pcSlice->getViewId() == getSlice()->getRefPic( eRefPicList, lpRef)->getViewId() ) 
       {
+#if !MTK_SIMPLIFY_DVTC
         if (uiViewIdxCurr > 1)  
         {
+#endif
           if( (uiLCUnew >= 0 && xGetColDisMV( eRefPicList, lpRef, uiLCUnew, uiBRIdx, cColMv, iTargetViewIdx, iTStartViewIdx)) )
           {
@@ -5875 +5897 @@
             return ;
           }
+#if !MTK_SIMPLIFY_DVTC
         }
-
+#endif
         if(xGetColDisMV( eRefPicList, lpRef, uiLCUIdx, uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx ))
         {
@@ -5895 +5918 @@
           return ;
         }
+#if !MTK_SIMPLIFY_DVTC
         if(uiViewIdxCurr == 1)  
         {
@@ -5916 +5940 @@
           }
         }
+#endif
       }
     }
@@ -6502 +6527 @@
     uiBRIdx = uiPartIdxLT;
     UInt uiAbsPartIdxTmp = g_auiZscanToRaster[uiPartIdxRB];
+#if MTK_SIMPLIFY_DVTC
+    if (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() )>= m_pcSlice->getSPS()->getPicWidthInLumaSamples() )
+    {
+      uiLCUnew = -1;
+    }
+    else if(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() )>= m_pcSlice->getSPS()->getPicHeightInLumaSamples() )
+    {
+      uiLCUnew = -1;
+    }
+    else
+#else
     if ( (( m_pcPic->getCU(m_uiCUAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth() ) < m_pcSlice->getSPS()->getPicWidthInLumaSamples() ) &&(( m_pcPic->getCU(m_uiCUAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getSPS()->getPicHeightInLumaSamples() ))  // image boundary check
+#endif
     {
       if ( ( uiAbsPartIdxTmp % uiNumPartInCUWidth < uiNumPartInCUWidth - 1 ) &&           // is not at the last column of LCU 
@@ -6512 +6549 @@
       {
         uiBRIdx = g_auiRasterToZscan[ (uiAbsPartIdxTmp + uiNumPartInCUWidth + 1) % m_pcPic->getNumPartInCU() ];
+#if MTK_SIMPLIFY_DVTC
+        uiLCUnew = -1;
+#else
         uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU();
+#endif
       }
       else if ( uiAbsPartIdxTmp / uiNumPartInCUWidth < m_pcPic->getNumPartInHeight() - 1 ) // is not at the last row of LCU But is last column of LCU
@@ -6522 +6563 @@
       {
         uiBRIdx = 0;
+#if MTK_SIMPLIFY_DVTC
+        uiLCUnew = -1;
+#else
         uiLCUnew = uiLCUIdx + m_pcPic->getFrameWidthInCU() + 1;
+#endif
       }
     }
@@ -6548 +6593 @@
       if( m_pcSlice->getViewId() == getSlice()->getRefPic( eRefPicList, lpRef)->getViewId() ) 
       {
+#if !MTK_SIMPLIFY_DVTC
         if (uiViewIdxCurr > 1)  
         {
+#endif
           if( (uiLCUnew >= 0 && xGetColDisMV( eRefPicList, lpRef, uiLCUnew, uiBRIdx, cColMv, iTargetViewIdx, iTStartViewIdx)) )
           {
@@ -6569 +6616 @@
             return ;
           }
+#if !MTK_SIMPLIFY_DVTC
         }
-
+#endif
         if(xGetColDisMV( eRefPicList, lpRef, uiLCUIdx, uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx ))
         {
@@ -6589 +6637 @@
           return ;
         }
+#if !MTK_SIMPLIFY_DVTC
         if(uiViewIdxCurr == 1)  
         {
@@ -6610 +6659 @@
           }
         }
+#endif
       }
     }

branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TypeDef.h

@@ -144 +144 @@
 #define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
 #define MTK_SAIT_TEMPORAL_FIRST_ORDER     1   // JCT3V-C00141/C0097
+#define MTK_SIMPLIFY_DVTC                 1   // JCT3V-C00135
 ///// ***** MOTION PARAMETER INHERITANCE  *********
 #define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding