Changeset 711 in 3DVCSoftware for branches/HTM-8.2-dev0/source/Lib


Ignore:
Timestamp:
21 Nov 2013, 12:12:14 (11 years ago)
Author:
tech
Message:
  • Added missing parts in TComPrediction.h
  • Added missing macro in TEncCU.h
  • Reordered defines in TypeDef.h
Location:
branches/HTM-8.2-dev0/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComPrediction.h

    r655 r711  
    9393#if H_3D_ARP
    9494  Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL );
     95#if QC_MTK_INTERVIEW_ARP_F0123_F0108
     96  Void xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled = NULL );
     97#endif
    9598#endif
    9699  Void xPredInterUni            ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false          );
    … …  
    120123
    121124#if H_3D_VSP
     125#if MTK_F0109_LG_F0120_VSP_BLOCK
     126  Void xGetVirtualDepth           ( TComDataCU *cu, TComPicYuv *picRefDepth, TComMv *dv, UInt partAddr, Int width, Int height, TComYuv *yuvDepth, Int &vspSize, Int txtPerDepthX=1, Int txtPerDepthY=1 );
     127  Void xPredInterLumaBlkFromDM    ( TComDataCU *cu, TComPicYuv *picRef, TComYuv *yuvDepth, Int* shiftLUT, TComMv *mv, UInt partAddr, Int width, Int height, Bool isDepth, TComYuv *&pcYuvDst, Bool isBi, Int vspSize);
     128  Void xPredInterChromaBlkFromDM  ( TComDataCU *cu, TComPicYuv *picRef, TComYuv *yuvDepth, Int* shiftLUT, TComMv *mv, UInt partAddr, Int width, Int height, Bool isDepth, TComYuv *&pcYuvDst, Bool isBi, Int vspSize);
     129#else
    122130  Void xGetVirtualDepth           ( TComDataCU *cu, TComPicYuv *picRefDepth, TComMv *dv, UInt partAddr, Int width, Int height, TComYuv *yuvDepth, Int txtPerDepthX=1, Int txtPerDepthY=1 );
    123131  Void xPredInterLumaBlkFromDM    ( TComDataCU *cu, TComPicYuv *picRef, TComYuv *yuvDepth, Int* shiftLUT, TComMv *mv, UInt partAddr, Int width, Int height, Bool isDepth, TComYuv *&pcYuvDst, Bool isBi );
    124132  Void xPredInterChromaBlkFromDM  ( TComDataCU *cu, TComPicYuv *picRef, TComYuv *yuvDepth, Int* shiftLUT, TComMv *mv, UInt partAddr, Int width, Int height, Bool isDepth, TComYuv *&pcYuvDst, Bool isBi );
     133#endif
    125134#endif
    126135

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

    r710 r711  
    132132                                              // TEXTURE MERGING CANDIDATE     , JCT3V-C0137
    133133                                              // QC_INRIA_MTK_MRG_E0126
    134 #define SEC_MPI_ENABLING_MERGE_F0150      1   // MPI flag in VPS and enabling in Merge mode
     134
    135135
    136136#define H_3D_TMVP                         1   // QC_TMVP_C0047
    … …  
    175175#endif
    176176
    177 #define ETRIKHU_MERGE_REUSE_F0093         1   // Reuse HEVC merge candidate list construction for base candidates, JCT3V-F0093
    178 
    179 
    180 
    181177// Rate Control
    182178#define KWU_FIX_URQ                       1
    … …  
    212208#if H_3D_ARP
    213209#define H_3D_ARP_WFNR                     3
    214 #define QC_MTK_INTERVIEW_ARP_F0123_F0108  1 //JCT3V-F0123; JCT3V-F0108
    215 #define QC_MTK_INTERVIEW_ARP_F0123_F0108  1 //JCT3V-F0123; JCT3V-F0108
    216 #define SHARP_ARP_REF_CHECK_F0105         1 // ARP reference picture selection and DPB check
    217 #define LGE_ARP_CTX_F0161 1 //JCT3V-F0161
    218 #endif
    219 
    220 ///// ***** Inter-view motion merge candidate *********
    221 #if H_3D_IV_MERGE
    222 #define QC_DEPTH_IV_MRG_F0125             1   // JCT3V-F0125: Depth oriented Inter-view MV candidate
    223210#endif
    224211
    … …  
    235222///// ***** VIEW SYNTHESIS PREDICTION *********
    236223#if H_3D_VSP
    237 #define MTK_F0109_LG_F0120_VSP_BLOCK      1   // MTK_LG_SIMPLIFY_VSP_BLOCK_PARTITION_F0109_F0120 
    238 #define SHARP_VSP_BLOCK_IN_AMP_F0102      1   // VSP partitioning for AMP
    239224#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
    240225#if H_3D_VSP_BLOCKSIZE == 1
    … …  
    243228#define H_3D_VSP_CONSTRAINED              0
    244229#endif
    245 #define MTK_VSP_SIMPLIFICATION_F0111      1   // 1. Inherited VSP also use NBDV of current CU, 2. VSP cannot be inherited from above LCU rowss
    246 #define LGE_SHARP_VSP_INHERIT_F0104       1
    247230#endif
    248231
    … …  
    260243#define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
    261244#endif
     245
     246
     247/////////////////////////////////////////////////////////////////////////////////////////
     248///////////////////////////////////   HTM-9.0 Integrations //////////////////////////////
     249/////////////////////////////////////////////////////////////////////////////////////////
     250
     251#if H_3D
     252
     253#define FIX_MISSING_MACRO_R690                  1   // Missing macro in integration to revision 690
     254
     255#define SEC_MPI_ENABLING_MERGE_F0150            1   // MPI flag in VPS and enabling in Merge mode
     256#define ETRIKHU_MERGE_REUSE_F0093               1   // Reuse HEVC merge candidate list construction for base candidates, JCT3V-F0093
     257
     258#if H_3D_ARP
     259#define QC_MTK_INTERVIEW_ARP_F0123_F0108        1   //JCT3V-F0123; JCT3V-F0108
     260#define SHARP_ARP_REF_CHECK_F0105               1   // ARP reference picture selection and DPB check
     261#define LGE_ARP_CTX_F0161                       1   //JCT3V-F0161
     262#endif
     263
     264#if H_3D_IV_MERGE
     265#define QC_DEPTH_IV_MRG_F0125                   1   // JCT3V-F0125: Depth oriented Inter-view MV candidate
     266#endif
     267
     268#if H_3D_VSP
     269#define MTK_F0109_LG_F0120_VSP_BLOCK            1   // MTK_LG_SIMPLIFY_VSP_BLOCK_PARTITION_F0109_F0120 
     270#define SHARP_VSP_BLOCK_IN_AMP_F0102            1   // VSP partitioning for AMP
     271#define MTK_VSP_SIMPLIFICATION_F0111            1   // 1. Inherited VSP also use NBDV of current CU, 2. VSP cannot be inherited from above LCU rowss
     272#define LGE_SHARP_VSP_INHERIT_F0104             1
     273#endif
     274#endif
     275
    262276
    263277/////////////////////////////////////////////////////////////////////////////////////////

  • branches/HTM-8.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r710 r711  
    18471847  for( Int nARPW=nARPWMax; nARPW >= 0 ; nARPW-- )
    18481848  {
     1849#if FIX_MISSING_MACRO_R690
    18491850    memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS_MEM*sizeof(Int) );
     1851#else
     1852    memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS*sizeof(Int) );
     1853#endif
    18501854#if LGE_SHARP_VSP_INHERIT_F0104
    18511855    rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to LCU level
Note: See TracChangeset for help on using the changeset viewer.