Ignore:
Timestamp:
29 Jul 2015, 12:12:44 (9 years ago)
Author:
tech
Message:

Further fixes and alignments.

Location:
branches/HTM-14.1-update-dev1/source/Lib/TLibCommon
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/CommonDef.h

    r1287 r1305  
    391391#define STD_CAM_PARAMETERS_PRECISION 5        ///< quarter luma sample accuarcy for derived disparities (as default)
    392392
    393 #endif // end of H_3D
     393#endif // end of NH_3D
    394394//! \}
    395395

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.cpp

    r1304 r1305  
    36473647      !bARPFlag &&
    36483648#endif
    3649 #if H_3D
     3649#if H_3D || NH_3D_FIX_VSP
    36503650      (nPSW + nPSH > 12) &&
    36513651#endif
    … …  
    56275627    if(!m_pcSlice->getIsDepth())
    56285628    {
    5629 #if H_3D_DBBP
     5629#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    56305630      if (!getDBBPFlag(0))
    56315631#else
    … …  
    58035803      iCurrPosY  += ( iHeight >> 1 );
    58045804    }
    5805 #if H_3D_DBBP
     5805#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    58065806    for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++)
    58075807#else
    … …  
    58785878    }
    58795879#if NH_3D_SPIVMP
    5880 #if H_3D_DBBP
     5880#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    58815881    for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++)
    58825882#else

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.h

    r1285 r1305  
    5050#include "TComPattern.h"
    5151
    52 #if H_3D
    53 #include <algorithm>
    54 #include <vector>
    55 #endif
    56 
    5752//! \ingroup TLibCommon
    5853//! \{
    … …  
    504499#endif
    505500
    506 #if H_3D
    507   Void          getDispforDepth  ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp);
    508   Bool          getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm );
    509 #endif
    510501#if NH_3D_NBDV_REF
    511502  Pel           getMcpFromDM(TComPicYuv* pcBaseViewDepthPicYuv, TComMv* mv, Int iBlkX, Int iBlkY, Int iWidth, Int iHeight, Int* aiShiftLUT );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPic.cpp

    r1279 r1305  
    6262, m_layerId                               (0)
    6363, m_viewId                                (0)
    64 #if H_3D
     64#if NH_3D
    6565, m_viewIndex                             (0)
    6666, m_isDepth                               (false)

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPicYuv.cpp

    r1279 r1305  
    324324#endif
    325325
    326 #if H_3D
    327 Void TComPicYuv::setLumaTo( Pel pVal )
    328 {
    329   xSetPels( getLumaAddr(), getStride(), getWidth(), getHeight(), pVal );
    330 }
    331 #endif
    332326#if NH_3D_VSO
    333327Void TComPicYuv::setChromaTo( Pel pVal )

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPrediction.cpp

    r1287 r1305  
    584584    pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]);
    585585  }
    586 #if H_3D_ARP // check this!
     586#if H_3D_ARP || NH_3D_ALIGN_SPIVMP_RP // check this!
    587587  if( pcCU->getARPW( uiPartAddr ) != 0 )
    588588  {

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRom.cpp

    r1285 r1305  
    551551Bool g_decTraceMvFromMerge   = false;
    552552Bool g_decTracePicOutput     = false;
    553 Bool g_stopAtPos             = false;
     553Bool g_stopAtPos             = true;
    554554Bool g_outputPos             = false;   
    555555Bool g_traceCameraParameters = false;
    … …  
    686686  }
    687687  Bool stopFlag = false;
    688   if ( g_stopAtPos && poc == 16 && layerId == 5 )
     688  if ( g_stopAtPos && poc == 0 && layerId == 2 )
    689689  {
    690690    Bool stopAtCU = true;
    691691    if ( stopAtCU )        // Stop at CU with specific size
    692692    {   
    693       stopFlag = ( cuPelX  == 224 ) && ( cuPelY  == 128 ) && ( cuWidth == 16 ) && ( cuHeight == 16 );
     693      stopFlag = ( cuPelX  == 416 ) && ( cuPelY  == 632 ) && ( cuWidth == 8 ) && ( cuHeight == 8 );
    694694    }
    695695    else

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.cpp

    r1287 r1305  
    22342234  }
    22352235}
    2236 #endif // H_3D
     2236#endif // NH_3D
    22372237
    22382238
    … …  
    25032503    auxId         .push_back( getAuxId       ( i ) );     
    25042504    viewId        .push_back( getViewId      ( getLayerIdInNuh( i ) ) );
    2505 #if H_3D 
     2505#if NH_3D 
    25062506    depthId.push_back( getDepthId( i ) );
    25072507#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.h

    r1287 r1305  
    30943094  Bool                        inferPocMsbValPresentFlag();
    30953095#endif
    3096 #if H_3D
    3097   Int                         getDefaultRefViewIdx()                                 { return m_iDefaultRefViewIdx;                                  }
    3098   Void                        setDefaultRefViewIdx(Int iViewIdx)                     { m_iDefaultRefViewIdx = iViewIdx;                              }
    3099 
    3100   Bool                        getDefaultRefViewIdxAvailableFlag()                    { return m_bDefaultRefViewIdxAvailableFlag;                     }
    3101   Void                        setDefaultRefViewIdxAvailableFlag(Bool bViewIdx)       { m_bDefaultRefViewIdxAvailableFlag = bViewIdx;                 }
    3102   Void                        setDefaultRefView( );
    3103 #endif
    31043096protected:
    31053097  TComPic*                    xGetRefPic        (TComList<TComPic*>& rcListPic, Int poc);

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

    r1304 r1305  
    6666/////////////////////////////////////////////////////////////////////////////////////////
    6767#if NH_MV
     68#define NH_3D_DLT_FIX                     1 // Fixes numbers of parsed DLTs
     69#define H_MV_VER141_DEC_COMP_FLAG         1 // Makes decoding of this version compatible to HTM-14.1 by re-introducing HTM-14.1 bugs.
     70#define NH_3D_ALIGN_SPIVMP_DBBP           1 // Further alignment of DBBP and SBP motion
     71#define NH_3D_ALIGN_SPIVMP_RP             1 // Alignment of DBBP and RP
     72#define NH_3D_FIX_VSP                     1
     73
    6874#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
    6975#define H_MV_ENC_DEC_TRAC_FIX             1  // by SHARP
    … …  
    11491155};
    11501156//! \}
    1151 #if H_3D
    1152 #define !!! REMOVE THIS !!! Log2( n ) ( log((double)n) / log(2.0) ) // Ed.(GT): This is very very bad and should be fixed to used integer arithmetics ( see gCeilLog2 ) moreover it should not be defined in the tool macro section!
    1153 #endif
    1154 #endif
     1157#endif
Note: See TracChangeset for help on using the changeset viewer.