Changeset 288 in 3DVCSoftware for branches/HTM-5.1-dev0-MERL-Mediatek-Fix


Ignore:
Timestamp:
18 Feb 2013, 16:20:54 (11 years ago)
Author:
tech
Message:

Merged fix provided by Mediatek (FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152).
Enabled MERL_VSP_C0152.

Location:
branches/HTM-5.1-dev0-MERL-Mediatek-Fix/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev0-MERL-Mediatek-Fix/source/Lib/TLibCommon/TComDataCU.cpp

    r280 r288  
    37883788  deriveLeftRightTopIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
    37893789  deriveLeftBottomIdxGeneral( cCurPS, uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
    3790 
     3790#if !FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
    37913791#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
    37923792  if( m_pcSlice->getIsDepth())
     
    38223822        }
    38233823      }
     3824#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
     3825      xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
     3826#endif
    38243827#if SIMP_MRG_PRUN
    38253828      if ( mrgCandIdx == iCount )
     
    38313834    }
    38323835  }
     3836#endif
    38333837#endif
    38343838
     
    38933897#endif
    38943898  }
     3899#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
     3900#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     3901  if( m_pcSlice->getIsDepth())
     3902  {
     3903    UInt uiPartIdxCenter;
     3904    xDeriveCenterIdx( cCurPS, uiPUIdx, uiPartIdxCenter );   
     3905    TComDataCU *pcTextureCU = m_pcSlice->getTexturePic()->getCU( getAddr() );
     3906    if ( pcTextureCU && !pcTextureCU->isIntra( uiPartIdxCenter ) )
     3907    {
     3908      abCandIsInter[iCount] = true;     
     3909      puhInterDirNeighbours[iCount] = pcTextureCU->getInterDir( uiPartIdxCenter );
     3910      if( ( puhInterDirNeighbours[iCount] & 1 ) == 1 )
     3911      {
     3912        pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_0, pcMvFieldNeighbours[iCount<<1] );
     3913        TComMv cMvPred = pcMvFieldNeighbours[iCount<<1].getMv();
     3914        const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
     3915        cMvPred+=cAdd;
     3916        cMvPred>>=2;
     3917        clipMv(cMvPred);
     3918        pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
     3919      }
     3920      if ( getSlice()->isInterB() )
     3921      {
     3922        if( ( puhInterDirNeighbours[iCount] & 2 ) == 2 )
     3923        {
     3924          pcTextureCU->getMvField( pcTextureCU, uiPartIdxCenter, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
     3925          TComMv cMvPred = pcMvFieldNeighbours[(iCount<<1)+1].getMv();
     3926          const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
     3927          cMvPred+=cAdd;
     3928          cMvPred>>=2;
     3929          clipMv(cMvPred);
     3930          pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
     3931        }
     3932      }
     3933#if FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152
     3934      xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
     3935#endif
     3936#if SIMP_MRG_PRUN
     3937      if ( mrgCandIdx == iCount )
     3938      {
     3939        return;
     3940      }
     3941#endif
     3942      iCount ++;
     3943    }
     3944  }
     3945#endif
     3946#endif
    38953947#if QC_MRG_CANS_B0048
    38963948  Int iPdmDir[2] = {0, 0};
  • branches/HTM-5.1-dev0-MERL-Mediatek-Fix/source/Lib/TLibCommon/TypeDef.h

    r284 r288  
    4141//! \ingroup TLibCommon
    4242//! \{
     43
     44#define FIX_TEXTURE_MERGING_CANDIDATE_VSP_C0137_C0152 1
    4345#define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
    4446#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures
     
    5456
    5557// C TRACK 3
    56 #define MERL_VSP_C0152                                0 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
     58#define MERL_VSP_C0152                                1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
    5759#define MTK_SAIT_TEMPORAL_FIRST_ORDER_C0141_C0097     1   // JCT3V-C0141/C0097
    5860#define MTK_SIMPLIFY_DVTC_C0135                       1   // JCT3V-C0135
Note: See TracChangeset for help on using the changeset viewer.