Changeset 523 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib

Timestamp:

6 Jul 2013, 15:43:59 (11 years ago)

Author:

mitsubishi-htm

Message:

-intermediate version. fixing issues between VSP and interview motion prediction.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp (modified) (8 diffs)

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

@@ -2791 +2791 @@
     if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
     {
+#if H_3D_VSP_FIX
+      Bool bSet[2] = {false, false}; // TODO: Find a better variable name   -Dong
+#endif
       abCandIsInter[iCount] = true;      
       puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
@@ -2796 +2799 @@
       {
         pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
-        
         TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
 
@@ -2807 +2809 @@
         //pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
 #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
-#if !H_3D_VSP_FIX
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
-#else
+#if H_3D_VSP_FIX
         if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
         {
+          bSet[0] = true;
           for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_0 ); i++ )
           {
@@ -2817 +2819 @@
             {
               pcMvFieldNeighbours[ iCount<<1 ].setMvField(cMvPred, i);
+              bSet[0] = false;
               break;
             }
@@ -2852 +2855 @@
           //pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
 #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
-#if !H_3D_VSP_FIX
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
-#else
+#if H_3D_VSP_FIX
           if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
           {
+            bSet[1] = true;
             for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_1 ); i++ )
             {
@@ -2862 +2865 @@
               {
                 pcMvFieldNeighbours[ (iCount<<1)+1 ].setMvField(cMvPred, i);
+                bSet[1] = false;
                 break;
               }
@@ -2888 +2892 @@
 #endif
 #if H_3D_VSP_FIX
-      if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) == 0 ) // MERL Question: When texture coded using nonVSP mode????????
+      assert( !bSet[0] || (!bSet[1] && m_pcSlice->isInterB()) );
       {
 #endif
@@ -2902 +2906 @@
 #if H_3D_VSP_FIX
       }
-//      else
-//        assert(0);  // MERL Question: Should the assert be kept???
 #endif
 #if !H_3D_CLEANUPS