Changeset 525 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

    r524 r525  
    27912791    if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
    27922792    {
    2793 #if H_3D_VSP_FIX
    2794       Bool bVspRef[2] = {false, false}; // TODO: Find a better variable name   -Dong
    2795 #endif
    27962793      abCandIsInter[iCount] = true;     
    27972794      puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
     
    28102807#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
    28112808        pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
    2812 #if H_3D_VSP_FIX
    2813         if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
    2814         {
    2815           bVspRef[0] = true;
    2816           for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_0 ); i++ )
    2817           {
    2818             if (m_pcSlice->getRefPOC( REF_PIC_LIST_0, i ) == m_pcSlice->getPOC())
    2819             {
    2820               pcMvFieldNeighbours[ iCount<<1 ].setMvField(cMvPred, i);
    2821               bVspRef[0] = false;
    2822               break;
    2823             }
    2824           }
    2825         }
    2826 #endif
    28272809#else
    28282810        if (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0)
     
    28562838#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
    28572839          pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
    2858 #if H_3D_VSP_FIX
    2859           if ( pcTextureCU->getVSPFlag( uiPartIdxCenter ) != 0 ) // Texture coded using VSP mode
    2860           {
    2861             bVspRef[1] = true;
    2862             for ( Int i = 0; i < m_pcSlice->getNumRefIdx( REF_PIC_LIST_1 ); i++ )
    2863             {
    2864               if (m_pcSlice->getRefPOC( REF_PIC_LIST_1, i ) == m_pcSlice->getPOC())
    2865               {
    2866                 pcMvFieldNeighbours[ (iCount<<1)+1 ].setMvField(cMvPred, i);
    2867                 bVspRef[1] = false;
    2868                 break;
    2869               }
    2870             }
    2871           }
    2872 #endif
    28732840#else
    28742841          if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0)
     
    28912858      {
    28922859#endif
    2893 #if H_3D_VSP_FIX
    2894       assert( !bVspRef[0] || (!bVspRef[1] && m_pcSlice->isInterB()) );
    2895       {
    2896 #endif
    28972860#if H_3D_NBDV
    2898         pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
    2899         pcMvFieldNeighbours[(iCount<<1)+1].getMv().setIDVFlag (false);
    2900 #endif
    2901         if ( mrgCandIdx == iCount )
    2902         {
    2903           return;
    2904         }
    2905         iCount ++;
    2906 #if H_3D_VSP_FIX
    2907       }
    2908 #endif
     2861      pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
     2862      pcMvFieldNeighbours[(iCount<<1)+1].getMv().setIDVFlag (false);
     2863#endif
     2864      if ( mrgCandIdx == iCount )
     2865      {
     2866        return;
     2867      }
     2868      iCount ++;
    29092869#if !H_3D_CLEANUPS
    29102870      }
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r522 r525  
    120120#define H_3D_VSP_CONSTRAINED              0
    121121#endif
    122 #define H_3D_VSP_FIX                      1   // Temporary, to be removed soon
    123122#endif
    124123
Note: See TracChangeset for help on using the changeset viewer.