Changeset 590 in 3DVCSoftware for branches/HTM-DEV-2.0-dev1-Samsung


Ignore:
Timestamp:
26 Aug 2013, 01:51:42 (11 years ago)
Author:
samsung-htm
Message:

Integration of JCT3V-E0142

Location:
branches/HTM-DEV-2.0-dev1-Samsung
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-2.0-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

    r587 r590  
    51715171
    51725172    ///*** Derive bottom right neighbour position ***
     5173#if !SEC_SIMPLIFIED_NBDV_E0142
    51735174    Int iLCUIdxRBNb  = -1;   
    51745175    Int iPartIdxRBNb = -1;
    51755176    xDeriveRightBottomNbIdx(iLCUIdxRBNb, iPartIdxRBNb );
     5177#endif
    51765178
    51775179    ///*** Search temporal candidate pictures for disparity vector ***
     
    51925194      }
    51935195
     5196#if !SEC_SIMPLIFIED_NBDV_E0142
    51945197      // Check BR and Center       
    51955198      for(Int curPosition = 0; curPosition < 2; curPosition++)
    51965199      {
     5200#endif
    51975201        Bool bCheck = false;
     5202#if !SEC_SIMPLIFIED_NBDV_E0142
    51985203        if ( curPosition == 0 && iLCUIdxRBNb >= 0 )
    51995204#if MTK_NBDV_TN_FIX_E0172
     
    52045209
    52055210        if (curPosition == 1 )
     5211#endif
    52065212#if MTK_NBDV_TN_FIX_E0172
    52075213          bCheck = xGetColDisMV( curCandPic, eCurRefPicList, curCandPicRefIdx, uiLCUIdx,   uiPartIdxCenter,  cColMv, iTargetViewIdx, iTStartViewIdx );
     
    52275233          return true;
    52285234        }
     5235#if !SEC_SIMPLIFIED_NBDV_E0142
    52295236      }
     5237#endif
    52305238    }
    52315239  }
     
    52585266  }
    52595267
     5268#if !SEC_SIMPLIFIED_NBDV_E0142
    52605269  //// ******* Get disparity from above right block ******* /////
    52615270  pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true);
     
    52985307      return true;
    52995308  }
     5309#endif
    53005310
    53015311  //// ******* Search MCP blocks ******* /////
  • branches/HTM-DEV-2.0-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

    r587 r590  
    113113#if H_3D_NBDV_REF
    114114#define NTT_DoNBDV_VECTOR_CLIP_E0141      1   // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
     115#define SEC_SIMPLIFIED_NBDV_E0142         1   // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
    115116#endif
    116117#endif
     
    169170////   ****** Neighbouring block-based Disparity Vector  *********
    170171#if H_3D_NBDV
     172#if SEC_SIMPLIFIED_NBDV_E0142
     173#define DVFROM_LEFT                       0
     174#define DVFROM_ABOVE                      1
     175#define IDV_CANDS                         2
     176#else
    171177#define DVFROM_LEFTBELOW                  0
    172178#define DVFROM_LEFT                       1
     
    175181#define DVFROM_ABOVELEFT                  4
    176182#define IDV_CANDS                         5
     183#endif
    177184#endif
    178185////   **** Inter-view motion prediction for merge        *********
Note: See TracChangeset for help on using the changeset viewer.