Changeset 1362 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibCommon


Ignore:
Timestamp:
28 Oct 2015, 19:15:08 (9 years ago)
Author:
tech
Message:

Align macros

Location:
branches/HTM-15.2-dev/source/Lib/TLibCommon
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/CommonDef.h

    r1360 r1362  
    5454//
    5555#endif // _MSC_VER > 1000
    56 
    57 
    5856#include "TypeDef.h"
    5957#ifdef _MSC_VER

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/SEI.cpp

    r1360 r1362  
    3232 */
    3333
    34 /** \file     #SEI.cpp
     34/** \file     SEI.cpp
    3535    \brief    helper functions for SEI handling
    3636*/

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/SEI.h

    r1360 r1362  
    678678
    679679};
    680 
    681680#if NH_MV_SEI
    682681#if NH_MV_LAYERS_NOT_PRESENT_SEI
    … …  
    13771376#endif
    13781377#endif
    1379 
    1380 #endif
     1378#endif
     1379
    13811380//! \}

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r1360 r1362  
    11211121
    11221122// Copy inter prediction info from the biggest CU
    1123 Void TComDataCU::copyInterPredInfoFrom    ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList
    11241123#if NH_3D_NBDV
    1125   , Bool bNBDV
    1126 #endif
    1127 )
     1124Void TComDataCU::copyInterPredInfoFrom    ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList   , Bool bNBDV )
     1125#else
     1126Void TComDataCU::copyInterPredInfoFrom    ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList )
     1127#endif
    11281128{
    11291129  m_pcPic              = pcCU->getPic();
    … …  
    43724372      }
    43734373    }
    4374     if ( ctuRsAddr >= 0 && xGetColMVP( eRefPicList, ctuRsAddr, absPartAddr, cColMv, refIdx_Col
    43754374#if NH_3D_TMVP
    4376       , 0
    4377 #endif
    4378       ) )
     4375        if ( ctuRsAddr >= 0 && xGetColMVP( eRefPicList, ctuRsAddr, absPartAddr, cColMv, refIdx_Col  , 0 ) )
     4376#else
     4377    if ( ctuRsAddr >= 0 && xGetColMVP( eRefPicList, ctuRsAddr, absPartAddr, cColMv, refIdx_Col ) )
     4378#endif
    43794379    {
    43804380      pInfo->m_acMvCand[pInfo->iN++] = cColMv;
    … …  
    43844384      UInt uiPartIdxCenter;
    43854385      xDeriveCenterIdx( partIdx, uiPartIdxCenter );
    4386       if (xGetColMVP( eRefPicList, getCtuRsAddr(), uiPartIdxCenter,  cColMv, refIdx_Col
    43874386#if NH_3D_TMVP
    4388         , 0
    4389 #endif
    4390         ))
     4387      if (xGetColMVP( eRefPicList, getCtuRsAddr(), uiPartIdxCenter,  cColMv, refIdx_Col , 0 ))
     4388#else
     4389      if (xGetColMVP( eRefPicList, getCtuRsAddr(), uiPartIdxCenter,  cColMv, refIdx_Col ))
     4390#endif
    43914391      {
    43924392        pInfo->m_acMvCand[pInfo->iN++] = cColMv;

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComDataCU.h

    r1360 r1362  
    239239
    240240  /// compute scaling factor from POC difference
    241 
    242241#if !NH_3D_ARP
    243242  static Int    xGetDistScaleFactor           ( Int iCurrPOC, Int iCurrRefPOC, Int iColPOC, Int iColRefPOC );
    … …  
    277276
    278277  Void          copySubCU             ( TComDataCU* pcCU, UInt uiPartUnitIdx );
    279   Void          copyInterPredInfoFrom ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList
    280278#if NH_3D_NBDV
    281   , Bool bNBDV = false
    282 #endif
    283 );
     279    Void          copyInterPredInfoFrom ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList, Bool bNBDV = false );
     280#else
     281  Void          copyInterPredInfoFrom ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList );
     282#endif
    284283  Void          copyPartFrom          ( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth );
    285284

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComInterpolationFilter.cpp

    r1313 r1362  
    360360 * \param  bitDepth   Bit depth
    361361 */
    362 Void TComInterpolationFilter::filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    363 #if NH_3D_ARP
    364     , Bool filterType
    365 #endif
    366 )
     362#if NH_3D_ARP
     363Void TComInterpolationFilter::filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isLast, const ChromaFormat fmt, const Int bitDepth, Bool filterType )
     364#else
     365Void TComInterpolationFilter::filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isLast, const ChromaFormat fmt, const Int bitDepth )
     366#endif
     367
    367368{
    368369  if ( frac == 0 )
    … …  
    423424 * \param  bitDepth   Bit depth
    424425 */
    425 Void TComInterpolationFilter::filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    426 #if NH_3D_ARP
    427     , Bool filterType
    428 #endif
    429 )
     426#if NH_3D_ARP
     427Void TComInterpolationFilter::filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth, Bool filterType )
     428#else
     429Void TComInterpolationFilter::filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth )
     430#endif
    430431{
    431432  if ( frac == 0 )

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComInterpolationFilter.h

    r1313 r1362  
    8282  ~TComInterpolationFilter() {}
    8383
    84   Void filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast, const ChromaFormat fmt, const Int bitDepth
    8584#if NH_3D_ARP
    86     , Bool filterType = false
     85  Void filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast, const ChromaFormat fmt, const Int bitDepth , Bool filterType = false );
     86#else
     87  Void filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast, const ChromaFormat fmt, const Int bitDepth );
    8788#endif
    88 );
     89
    8990  Void filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    9091#if NH_3D_ARP

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComMv.h

    r1360 r1362  
    100100  Void  setHor    ( Short i )                   { m_iHor = i;                               }
    101101  Void  setVer    ( Short i )                   { m_iVer = i;                               }
    102   Void  setZero   ()                            { m_iHor = m_iVer = 0;
    103  #if NH_3D_NBDV
    104    m_bIDV = false; m_iIDVHor = m_iIDVVer = 0;
    105    m_iIDVVId = 0;
    106 #endif
    107  }
    108 #if NH_3D_NBDV
     102#if NH_3D_NBDV
     103  Void  setZero   ()                            { m_iHor = m_iVer = 0; m_bIDV = false; m_iIDVHor = m_iIDVVer = 0; m_iIDVVId = 0;  }
    109104  Void   setIDVHor  (Short i)                    {m_iIDVHor = i;}
    110105  Void   setIDVVer  (Short i)                    {m_iIDVVer = i;}
    111106  Void   setIDVFlag (Bool b )                    {m_bIDV    = b;}
    112107  Void   setIDVVId  (Short i)                    {m_iIDVVId = i;}
     108#else
     109  Void  setZero   ()                            { m_iHor = m_iVer = 0;  }
    113110#endif
    114111  // ------------------------------------------------------------------------------------------------------------------
    … …  
    145142  }
    146143
    147 #if NH_3D || !ME_ENABLE_ROUNDING_OF_MVS
     144#if NH_3D
     145#if ME_ENABLE_ROUNDING_OF_MVS
     146
     147  const TComMv& operator>>= (const Int i)
     148  {
     149    m_iHor >>= i;
     150    m_iVer >>= i;
     151    return  *this;
     152  }
     153#endif
     154#endif
     155#if !ME_ENABLE_ROUNDING_OF_MVS
    148156  const TComMv& operator>>= (const Int i)
    149157  {

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComPicYuv.cpp

    r1360 r1362  
    108108  // initialize pointers for unused components to NULL
    109109  for(UInt comp=getNumberValidComponents();comp<MAX_NUM_COMPONENT; comp++)
    110     {
    111     }
     110  {
     111    m_apiPicBuf[comp] = NULL;
     112    m_piPicOrg[comp]  = NULL;
     113  }
    112114
    113115  for(Int chan=0; chan<MAX_NUM_CHANNEL_TYPE; chan++)

  • branches/HTM-15.2-dev/source/Lib/TLibCommon/TComPrediction.cpp

    r1360 r1362  
    18271827
    18281828
     1829#if NH_3D
    18291830Void TComPrediction::xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth
    18301831#if NH_3D_ARP
    … …  
    18351836#endif
    18361837)
     1838#else
     1839Void TComPrediction::xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth )
     1840#endif
    18371841{
    18381842#if NH_MV
    … …  
    18701874  if ( yFrac == 0 )
    18711875  {
     1876#if NH_3D
     1877    m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi
    18721878#if NH_3D_IC
    1873     m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi || bICFlag, chFmt, bitDepth
    1874 #else
    1875     m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi, chFmt, bitDepth
    1876 #endif
     1879     || bICFlag
     1880#endif
     1881    , chFmt, bitDepth
    18771882#if NH_3D_ARP
    18781883    , filterType
    18791884#endif
    18801885);
     1886#else
     1887    m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi, chFmt, bitDepth );
     1888#endif
    18811889  }
    18821890  else if ( xFrac == 0 )
    18831891  {
     1892#if NH_3D
     1893  m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi
    18841894#if NH_3D_IC
    1885     m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag, chFmt, bitDepth
    1886 #else
    1887     m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi, chFmt, bitDepth
    1888 #endif
     1895    || bICFlag
     1896#endif
     1897    , chFmt, bitDepth
    18891898#if NH_3D_ARP
    18901899    , filterType
    18911900#endif
    18921901);
     1902#else
     1903    m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi, chFmt, bitDepth );
     1904
     1905#endif
    18931906  }
    18941907  else
Note: See TracChangeset for help on using the changeset viewer.