Changeset 247 in 3DVCSoftware for branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

31 Jan 2013, 08:40:24 (12 years ago)

Author:

mediatek-htm

Message:

Integration of JCT3V-C0129 (Release of DV Constraint without control flag)
The MACRO is MTK_RELEASE_DV_CONSTRAINT

File:

• branches/HTM-5.1-dev3-Mediatek/source/Lib/TLibCommon/TComDataCU.cpp (modified) (9 diffs)

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

@@ -5608 +5608 @@
 #if QC_SIMPLE_NBDV_B0047
   const Int iNumofDvMCP = 7;
+#if MTK_RELEASE_DV_CONSTRAINT
+  Int   aiDvMcpDvCandX[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
+  Int   aiDvMcpDvCandY[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
+#else
   Int   aiDvMcpDvCand[2][iNumofDvMCP] = {{0,},    {0,}}; // dummy, 5 spatial + 1 temporal
+#endif
   Bool  abDvMcpFlag  [2][iNumofDvMCP] = {{false,},{false,}}; 
 #else
@@ -6007 +6012 @@
           if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
           {
+#if MTK_RELEASE_DV_CONSTRAINT
+            aiDvMcpDvCandX[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispX;
+            aiDvMcpDvCandY[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispY;
+#else
             aiDvMcpDvCand[iList][DVFROM_LEFT] = cTmpMvPred.m_iDvMcpDispX;
+#endif
             abDvMcpFlag  [iList][DVFROM_LEFT] = true; 
             bDvMcpIsFound = true;
@@ -6093 +6103 @@
           if( cTmpMvPred.m_bDvMcp  && bTmpIsSkipped )
           {
+#if MTK_RELEASE_DV_CONSTRAINT
+            aiDvMcpDvCandX[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispX;
+            aiDvMcpDvCandY[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispY;
+#else
             aiDvMcpDvCand[iList][DVFROM_ABOVE] = cTmpMvPred.m_iDvMcpDispX;
+#endif
             abDvMcpFlag  [iList][DVFROM_ABOVE] = true; 
             bDvMcpIsFound = true;
@@ -6173 +6188 @@
           if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
           {
+#if MTK_RELEASE_DV_CONSTRAINT
+            aiDvMcpDvCandX[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispX;
+            aiDvMcpDvCandY[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispY;
+#else
             aiDvMcpDvCand[iList][DVFROM_ABOVERIGHT] = cTmpMvPred.m_iDvMcpDispX;
+#endif
             abDvMcpFlag  [iList][DVFROM_ABOVERIGHT] = true; 
             bDvMcpIsFound = true;
@@ -6245 +6265 @@
           if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
           {
+#if MTK_RELEASE_DV_CONSTRAINT
+            aiDvMcpDvCandX[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispX;
+            aiDvMcpDvCandY[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispY;
+#else
             aiDvMcpDvCand[iList][DVFROM_LEFTBELOW] = cTmpMvPred.m_iDvMcpDispX;
+#endif
             abDvMcpFlag  [iList][DVFROM_LEFTBELOW] = true; 
             bDvMcpIsFound = true;
@@ -6327 +6352 @@
           if( cTmpMvPred.m_bDvMcp && bTmpIsSkipped )
           {
+#if MTK_RELEASE_DV_CONSTRAINT
+            aiDvMcpDvCandX[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispX;
+            aiDvMcpDvCandY[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispY;
+#else
             aiDvMcpDvCand[iList][DVFROM_ABOVELEFT] = cTmpMvPred.m_iDvMcpDispX;
+#endif
             abDvMcpFlag  [iList][DVFROM_ABOVELEFT] = true; 
             bDvMcpIsFound = true;
@@ -6678 +6708 @@
         if( abDvMcpFlag[iList][i]==true )
         {
+#if MTK_RELEASE_DV_CONSTRAINT
+          TComMv dv( aiDvMcpDvCandX[iList][ i ], aiDvMcpDvCandY[iList][ i ] );
+#else
           TComMv dv( aiDvMcpDvCand[iList][ i ], 0 );
+#endif
           clipMv( dv );
 #if !MERL_MTK_VSP_DVP_REFINE_C0152_C0131
@@ -8843 +8877 @@
   else
   {
+#if MTK_RELEASE_DV_CONSTRAINT
+    Bool bAvailable = pcResidualGenerator->getResidualSamples( this, uiPartIdx, pcYuv, cDisInfo.m_acMvCand[0] 
+#if QC_SIMPLIFIEDIVRP_M24938
+     , bRecon 
+#endif
+     );
+#else
     Bool bAvailable = pcResidualGenerator->getResidualSamples( this, uiPartIdx, pcYuv, cDisInfo.m_acMvCand[0].getHor() 
 #if QC_SIMPLIFIEDIVRP_M24938
@@ -8848 +8889 @@
 #endif
       );
+#endif
     m_pePartSize[0] = m_peSaved;
     return bAvailable;