Changeset 525 in 3DVCSoftware

Timestamp:

7 Jul 2013, 16:26:28 (11 years ago)

Author:

mitsubishi-htm

Message:

-intermediate version. cleaned the code from H_3D_VSP_FIX

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

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

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

@@ -2791 +2791 @@
     if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
     {
-#if H_3D_VSP_FIX
-      Bool bVspRef[2] = {false, false}; // TODO: Find a better variable name   -Dong
-#endif
       abCandIsInter[iCount] = true;      
       puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
@@ -2810 +2807 @@
 #if H_3D_CLEANUPS //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
-#if H_3D_VSP_FIX
-        if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
-        {
-          bVspRef[0] = true;
-          for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_0 ); i++ )
-          {
-            if (m_pcSlice->getRefPOC( REF_PIC_LIST_0, i ) == m_pcSlice->getPOC())
-            {
-              pcMvFieldNeighbours[ iCount<<1 ].setMvField(cMvPred, i);
-              bVspRef[0] = false;
-              break;
-            }
-          }
-        }
-#endif
 #else
         if (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0)
@@ -2856 +2838 @@
 #if H_3D_CLEANUPS //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
-#if H_3D_VSP_FIX
-          if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
-          {
-            bVspRef[1] = true;
-            for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_1 ); i++ )
-            {
-              if (m_pcSlice->getRefPOC( REF_PIC_LIST_1, i ) == m_pcSlice->getPOC())
-              {
-                pcMvFieldNeighbours[ (iCount<<1)+1 ].setMvField(cMvPred, i);
-                bVspRef[1] = false;
-                break;
-              }
-            }
-          }
-#endif
 #else
           if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0)
@@ -2891 +2858 @@
       {
 #endif
-#if H_3D_VSP_FIX
-      assert( !bVspRef[0] || (!bVspRef[1] && m_pcSlice->isInterB()) );
-      {
-#endif
 #if H_3D_NBDV
-        pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
-        pcMvFieldNeighbours[(iCount<<1)+1].getMv().setIDVFlag (false);
-#endif
-        if ( mrgCandIdx == iCount )
-        {
-          return;
-        }
-        iCount ++;
-#if H_3D_VSP_FIX
-      }
-#endif
+      pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
+      pcMvFieldNeighbours[(iCount<<1)+1].getMv().setIDVFlag (false);
+#endif
+      if ( mrgCandIdx == iCount )
+      {
+        return;
+      }
+      iCount ++;
 #if !H_3D_CLEANUPS
       }

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

@@ -120 +120 @@
 #define H_3D_VSP_CONSTRAINED              0
 #endif
-#define H_3D_VSP_FIX                      1   // Temporary, to be removed soon
 #endif