Changeset 1038 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon


Ignore:
Timestamp:
1 Aug 2014, 10:01:00 (11 years ago)
Author:
sharpjp-htm
Message:

Fix tickets #75 Bi-pred restriction bug in VSP
Fix tickets #79 Unused VSP code

Location:
branches/HTM-11.2-dev0/source/Lib/TLibCommon
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r1037 r1038  
    39213921Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours
    39223922#endif
    3923 #if H_3D_VSP
     3923#if H_3D_VSP && !FIX_TICKET_79
    39243924      , InheritedVSPDisInfo*  inheritedVSPDisInfo
    39253925#endif
    … …  
    39513951  //////////////////////////////////
    39523952  DisInfo cDisInfo = getDvInfo(uiAbsPartIdx);
     3953#if !FIX_TICKET_79
    39533954  for(Int i = 0; i < MRG_MAX_NUM_CANDS_MEM; i++)
    39543955  {
    39553956    inheritedVSPDisInfo[i].m_acDvInfo = cDisInfo;   // To prevent run-time error, this code must be executed always for merging process.
    39563957  }
     3958#endif
    39573959  m_cDefaultDisInfo = cDisInfo;
    39583960

  • branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.h

    r1034 r1038  
    670670  Void          getInterMergeCandidates ( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours
    671671#endif
    672 #if H_3D_VSP
     672#if H_3D_VSP && !FIX_TICKET_79
    673673                                            , InheritedVSPDisInfo*  inheritedVSPDisInfo
    674674#endif

  • branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComMotionInfo.h

    r976 r1038  
    7979} IDVInfo;
    8080#endif
    81 #if H_3D_VSP
     81#if H_3D_VSP && !FIX_TICKET_79
    8282typedef struct _InheritedVSPDisCand
    8383{

  • branches/HTM-11.2-dev0/source/Lib/TLibCommon/TypeDef.h

    r1037 r1038  
    284284
    285285// Fixes
     286#define FIX_TICKET_79                     1    // Unused VSP code
     287#define FIX_TICKET_75                     1    // Bi-pred restriction bug in VSP
    286288#define FIX_TICKET_68                     1    // MV clipping bug in the sub-PU MPI default MV generation
    287289#define FIX_TICKET_71                     1    // IC parameters is meaningless in HTM when no training samples are available
Note: See TracChangeset for help on using the changeset viewer.