Changeset 630 in 3DVCSoftware for branches


Ignore:
Timestamp:
23 Sep 2013, 09:04:03 (11 years ago)
Author:
chang
Message:

Fixed macro news to H_3D_FCO_E0163 with document number.

Location:
branches/HTM-8.2-dev0-MediaTek/source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-8.2-dev0-MediaTek/source/App/TAppEncoder/TAppEncCfg.cpp

    r629 r630  
    13721372     xConfirmPara( allEqual , "Each layer shall have a different position in scalability space." );
    13731373
    1374 #if !H_3D_FCO
     1374#if !H_3D_FCO_E0163
    13751375     if ( numDiff  == 1 )
    13761376     {

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

    r629 r630  
    35693569    UInt uiPartIdxCenter;
    35703570    xDeriveCenterIdx( uiPUIdx, uiPartIdxCenter );   
    3571 #if H_3D_FCO
     3571#if H_3D_FCO_E0163
    35723572    TComPic * pcTexturePic = m_pcSlice->getTexturePic();
    35733573    TComDataCU *pcTextureCU = 0;
    … …  
    35783578#endif
    35793579 
    3580 #if H_3D_FCO
     3580#if H_3D_FCO_E0163
    35813581    if ( pcTextureCU && pcTexturePic->getReconMark() && !pcTextureCU->isIntra( uiPartIdxCenter ) )
    35823582#else
    … …  
    55745574#if H_3D_NBDV_REF
    55755575          TComPic* picDepth = NULL;   
    5576 #if H_3D_FCO_VSP_DONBDV
     5576#if H_3D_FCO_VSP_DONBDV_E0163
    55775577          picDepth  = getSlice()->getIvPic(true, getSlice()->getViewIndex() );
    55785578          if ( picDepth->getPicYuvRec() != NULL  ) 
    … …  
    56875687          pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
    56885688#if H_3D_NBDV_REF
    5689 #if H_3D_FCO_VSP_DONBDV
     5689#if H_3D_FCO_VSP_DONBDV_E0163
    56905690          TComPic* picDepth  = NULL;
    56915691
    … …  
    57485748#if H_3D_NBDV_REF
    57495749    TComPic* picDepth = NULL;
    5750 #if H_3D_FCO_VSP_DONBDV
     5750#if H_3D_FCO_VSP_DONBDV_E0163
    57515751    picDepth  = getSlice()->getIvPic(true, getSlice()->getViewIndex() );
    57525752    if ( picDepth->getPicYuvRec() != NULL ) 
    … …  
    58665866          TComPic* picDepth = NULL;
    58675867          assert(getSlice()->getRefPic(eRefPicList, refId)->getPOC() == getSlice()->getPOC());         
    5868 #if H_3D_FCO_VSP_DONBDV
     5868#if H_3D_FCO_VSP_DONBDV_E0163
    58695869          picDepth  = getSlice()->getIvPic(true, getSlice()->getViewIndex() );
    58705870          if ( picDepth->getPicYuvRec() != NULL ) 

  • branches/HTM-8.2-dev0-MediaTek/source/Lib/TLibCommon/TComPic.cpp

    r629 r630  
    119119
    120120  /* initialize the texture to depth reference status */
    121 #if H_3D_FCO
     121#if H_3D_FCO_E0163
    122122  for (int j=0; j<2; j++)
    123123  {
    … …  
    733733  TComSlice* pcCurrSlice = getSlice(getCurrSliceIdx());
    734734  TComPic* pcTextPic = pcCurrSlice->getTexturePic();
    735 #if H_3D_FCO
     735#if H_3D_FCO_E0163
    736736  if ( pcTextPic )
    737737  {
    … …  
    759759
    760760  }
    761 #if H_3D_FCO
     761#if H_3D_FCO_E0163
    762762  }
    763763#endif

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

    r629 r630  
    731731  // Get depth reference
    732732  Int       depthRefViewIdx = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
    733 #if H_3D_FCO_VSP_DONBDV
     733#if H_3D_FCO_VSP_DONBDV_E0163
    734734  TComPic* pRefPicBaseDepth = 0;
    735735  Bool     bIsCurrDepthCoded = false;
    … …  
    766766  pcCU->clipMv(cDv);
    767767
    768 #if H_3D_FCO_VSP_DONBDV
     768#if H_3D_FCO_VSP_DONBDV_E0163
    769769  if ( bIsCurrDepthCoded )
    770770  {

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

    r629 r630  
    139139                                              // FIX_SDC_ENC_RD_WVSO_D0163
    140140                                              // MTK_SAMPLE_BASED_SDC_D0110
    141 #define H_3D_FCO                          1   // Flexible coding order for 3D
     141#define H_3D_FCO_E0163                          1   // Flexible coding order for 3D
    142142
    143143
    … …  
    188188#endif
    189189
    190 #if H_3D_FCO
    191 #define H_3D_FCO_VSP_DONBDV               0   // Adaptive depth reference for flexible coding order
    192 #else
    193 #define H_3D_FCO_VSP_DONBDV               0   // Adaptive depth reference for flexible coding order
     190#if H_3D_FCO_E0163
     191#define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
     192#else
     193#define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
    194194#endif
    195195

  • branches/HTM-8.2-dev0-MediaTek/source/Lib/TLibDecoder/TDecTop.cpp

    r629 r630  
    979979    pcSlice->setIvPicLists( m_ivPicLists );         
    980980#if H_3D_IV_MERGE
    981 #if H_3D_FCO
     981#if H_3D_FCO_E0163
    982982    //assert( !getIsDepth() );
    983983#else

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

    r629 r630  
    913913
    914914    // SAIT_VSO_EST_A0033
    915 #if H_3D_FCO
     915#if H_3D_FCO_E0163
    916916    Bool flagRec;
    917917    flagRec =  ((m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), false, pcSlice->getPOC(), true) == NULL) ? false: true);

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

    r629 r630  
    28662866        for( UInt dmmType = 0; dmmType < DMM_NUM_TYPE; dmmType++ )
    28672867        {
    2868 #if H_3D_FCO
     2868#if H_3D_FCO_E0163
    28692869            TComPic* picTexture  = pcCU->getSlice()->getIvPic(false, pcCU->getSlice()->getViewIndex() );
    28702870            if ( !picTexture->getReconMark() && (DMM3_IDX == dmmType || DMM4_IDX == dmmType ) )
Note: See TracChangeset for help on using the changeset viewer.