Changeset 1362 in 3DVCSoftware


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

Align macros

Location:
branches/HTM-15.2-dev
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-15.2-dev/compat/msvc/stdint.h

    r2 r1362  
    11#pragma once
     2#ifndef _MSC_VER
     3#error local C99 type definition should only be used in Visual C++ before 2010
     4#endif
     5#if _MSC_VER > 1500
     6#error local C99 type definition should only be used in Visual C++ before 2010
     7#endif
    28
    39/* a minimal set of C99 types for use with MSVC */

  • branches/HTM-15.2-dev/doc/Doxyfile

    r1313 r1362  
    3939# control system is used.
    4040
    41 PROJECT_NUMBER         = HM-16.6
     41PROJECT_NUMBER         = HM-16.7
    4242
    4343# Using the PROJECT_BRIEF tag one can provide an optional one line description
    … …  
    23732373# This tag requires that the tag HAVE_DOT is set to YES.
    23742374
    2375 DOT_GRAPH_MAX_NODES    = 60
     2375DOT_GRAPH_MAX_NODES    = 100
    23762376
    23772377# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs

  • branches/HTM-15.2-dev/doc/software-manual.tex

    r1313 r1362  
    44
    55\usepackage{hyperref}
    6 \hypersetup{colorlinks=true}
     6\hypersetup{colorlinks=true,
     7            linkcolor=black,      % color of internal links (change box color with linkbordercolor)
     8            citecolor=black,      % color of links to bibliography
     9            filecolor=black,      % color of file links
     10            urlcolor=blue}
    711\usepackage{color,soul}
    812
    … …  
    187191\begin{abstract}
    188192This document is a user manual describing usage of reference software
    189 for the HEVC project. It applies to version 16.6
     193for the HEVC project. It applies to version 16.7
    190194of the software.
    191195\end{abstract}
    … …  
    241245% Environment          & Location of project file \\
    242246\hline
    243 MS Visual Studio 8   & build/HM_vc8.sln \\
    244 MS Visual Studio 9   & build/HM_vc9.sln \\
    245 MS Visual Studio 10  & build/HM_vc10.sln \\
    246 Xcode                & HM.xcodeproj \\
    247 Linux                & build/linux/makefile \\
     247MS Visual Studio 2008 (VC9)   & build/HM_vc9.sln \\
     248MS Visual Studio 2010 (VC10)  & build/HM_vc2010.sln \\
     249MS Visual Studio 2012 (VC11)  & build/HM_vc2012.sln \\
     250MS Visual Studio 2013 (VC12)  & build/HM_vc2013.sln \\
     251Xcode                         & HM.xcodeproj \\
     252Eclipse                       & .project .cproject \\
     253make/gcc (e.g. Linux)         & build/linux/makefile \\
    248254\hline
    249255\end{tabular}
    … …  
    483489
    484490\setlength{\algomargin}{2em}
    485 \begin{algorithm}[h]
     491\begin{algorithm}[ht]
    486492\SetKwData{deltaRIdx}{deltaRIdx}
    487493\SetKwData{deltaRPS}{deltaRPS}
    … …  
    793799\\
    794800
     801\Option{AccessUnitDelimiter} &
     802%\ShortOption{\None} &
     803\Default{0} &
     804Add Access Unit Delimiter NAL units between all Access Units.
     805\\
     806
    795807\end{OptionTableNoShorthand}
    796808
    … …  
    10041016\begin{tabular}{cp{0.45\textwidth}}
    10051017 0 & Full search method \\
    1006  1 & Fast search method \\
    1007  2 & Previous motion vector fast search method \\
     1018 1 & Fast search method - TZSearch\\
     1019 2 & Predictive motion vector fast search method \\
     1020 3 & Extended TZSearch method \\
    10081021\end{tabular}
    10091022\\
    … …  
    10941107$\lambda$, for use in the rate-distortion optimised cost calculation
    10951108when encoding temporal layer~$N$.
     1109If LambdaModifierI is specified, then LambdaModifierI will be used for intra pictures.
    10961110\par
    10971111$N$ may be in the range 0 (inclusive) to 7 (exclusive).
    10981112\\
    10991113
     1114\Option{LambdaModifierI (-LMI)} &
     1115%\ShortOption{-LMI} &
     1116\Default{} &
     1117Specifies one or more of the LambdaModifiers to use intra pictures at each of the temporal layers.
     1118If not present, then the LambdaModifier$N$ settings are used instead. If the list of values
     1119(comma or space separated) does not include enough values for each of the temporal layers,
     1120the last value is repeated as required.
     1121\\
     1122
     1123\Option{IQPFactor (-IQF)} &
     1124%\ShortOption{-IQF} &
     1125\Default{-1} &
     1126Specifies the QP factor to be used for intra pictures during the lambda computation.
     1127(The values specified in the GOP structure are only used for inter pictures).
     1128If negative (default), the following equation is used to derive the value:
     1129\par
     1130$IQP_{factor}=0.57*(1.0-Max(0.5, Min(0.0, 0.05*s)))$
     1131\par
     1132where $s = Int(isField ? (GS-1)/2 : GS-1)$ and
     1133$GS$ is the gop size.
     1134\\
     1135
    11001136\Option{ECU} &
    11011137%\ShortOption{\None} &
    … …  
    11181154\Option{FEN} &
    11191155%\ShortOption{\None} &
    1120 \Default{false} &
    1121 Enables or disables the use of fast encoder mode.  When enabled,
    1122 the following occurs:
    1123 \begin{itemize}
    1124 \item In the SAD computation for blocks having size larger than 8, only
    1125       the lines of even rows in the block are considered.
    1126 \item The number of iterations used in the bi-directional motion vector
    1127       refinement in the motion estimation process is reduced from 4 to 1.
    1128 \end{itemize}
     1156\Default{0} &
     1157Controls the use of different fast encoder coding tools.  The following
     1158tools are supported in different combinations:
     1159\par
     1160\begin{tabular}{cp{0.45\textwidth}}
     1161 a & In the SAD computation for blocks having size larger than 8, only
     1162     the lines of even rows in the block are considered. \\
     1163 b & The number of iterations used in the bi-directional motion vector
     1164     refinement in the motion estimation process is reduced from 4 to 1. \\
     1165\end{tabular}
     1166Depending on the value of the parameter, the following combinations are
     1167supported:
     1168\par
     1169\begin{tabular}{cp{0.45\textwidth}}
     1170 0 & Disable all modes \\
     1171 1 & Use both a \& b tools\\
     1172 2 & Use only tool b \\
     1173 3 & Use only tool a \\
     1174\end{tabular}
    11291175\\
    11301176
    … …  
    15961642\\
    15971643
     1644\Option{WPMethod (-wpM)} &
     1645%\ShortOption{\-wpM} &
     1646\Default{0} &
     1647Sets the Weighted Prediction method to be used.
     1648\par
     1649\begin{tabular}{cp{0.45\textwidth}}
     1650  0 & Image DC based method with joint color component decision. \\
     1651  1 & Image DC based method with separate color component decision. \\
     1652  2 & DC + Histogram refinement method (no clipping). \\
     1653  3 & DC + Histogram refinement method (with clipping). \\
     1654  4 & DC + Dual Histogram refinement method (with clipping). \\
     1655\end{tabular}
     1656\\
     1657
     1658
    15981659\Option{Log2ParallelMergeLevel} &
    15991660%\ShortOption{\None} &
    … …  
    17031764\Default{false} &
    17041765Rate control: force intra QP to be equal to initial QP or not.
     1766\\
     1767
     1768\Option{RCCpbSaturation} &
     1769%\ShortOption{\None} &
     1770\Default{false} &
     1771Rate control: enable target bits saturation to avoid CPB overflow and underflow or not.
     1772\\
     1773
     1774\Option{RCCpbSize} &
     1775%\ShortOption{\None} &
     1776\Default{0} &
     1777Rate control: CPB size, in bps.
     1778\\
     1779
     1780\Option{RCInitialCpbFullness} &
     1781%\ShortOption{\None} &
     1782\Default{0.9} &
     1783Rate control: ratio of initial CPB fullness per CPB size. (InitalCpbFullness/CpbSize)
     1784RCInitialCpbFullness should be smaller than or equal to 1.
    17051785\\
    17061786\end{OptionTableNoShorthand}
    … …  
    19782058  140 & Chroma resampling filter hint            & Table \ref{tab:chroma-resampling-filter-hint} \\
    19792059  141 & Knee function information                & Table \ref{tab:sei-knee-function} \\
    1980   142 & Colour remapping information             & (Not handled)\\
     2060  142 & Colour remapping information             & Table \ref{tab:sei-colour-remapping}\\
    19812061  143 & Deinterlaced field identification        & (Not handled)\\
    19822062\end{SEIListTable}
    … …  
    24692549
    24702550\begin{OptionTableNoShorthand}{Chroma resampling filter hint SEI message encoder parameters}{tab:chroma-resampling-filter-hint}
    2471 \Option{SEIChromaSamplingFilterHint} &
     2551\Option{SEIChromaResamplingFilterHint} &
    24722552\Default{false} &
    24732553When true (non-zero), generates example chroma sampling filter hint SEI messages.
    24742554\\
    2475 \Option{SEIChromaSamplingHorizontalFilterType} &
     2555\Option{SEIChromaResamplingHorizontalFilterType} &
    24762556\Default{2} &
    24772557Defines the index of the chroma sampling horizontal filter:
    … …  
    24832563\end{tabular}
    24842564\\
    2485 \Option{SEIChromaSamplingVerticalFilterType} &
     2565\Option{SEIChromaResamplingVerticalFilterType} &
    24862566\Default{2} &
    24872567Defines the index of the chroma sampling vertical filter:
    … …  
    25492629100 250 450
    25502630\end{tabular}
     2631\\
     2632\end{OptionTableNoShorthand}
     2633
     2634
     2635\begin{OptionTableNoShorthand}{Colour remapping SEI message encoder parameters}{tab:sei-colour-remapping}
     2636\Option{SEIColourRemappingInfoFileRoot (-cri)} &
     2637\Default{\NotSet} &
     2638Specifies the prefix of input Colour Remapping Information file. Prefix is completed by ``_x.txt'' where x is the  POC number.
     2639The contents of the file are a list of the SEI message's syntax element names (in decoding order) immediately followed by a `:' and then the associated value.
     2640An example file can be found in cfg/misc/example_colour_remapping_sei_encoder_0.txt.
    25512641\\
    25522642\end{OptionTableNoShorthand}
    … …  
    27312821\\
    27322822
     2823\Option{SEIColourRemappingInfoFilename} &
     2824%\ShortOption{\None} &
     2825\Default{\NotSet} &
     2826Specifies that the colour remapping SEI message should be applied to the output video, with the output written to this file.
     2827If no value is specified, the SEI message is ignored and no mapping is applied.
     2828\\
     2829
    27332830\Option{RespectDefDispWindow (-w)} &
    27342831%\ShortOption{-w} &

  • branches/HTM-15.2-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1360 r1362  
    723723  Bool do_help = false;
    724724
    725 #if !NH_MV
    726   string cfg_InputFile;
    727 #endif
    728   string cfg_BitstreamFile;
    729 #if !NH_MV
    730   string cfg_ReconFile;
    731 #endif
    732725#if NH_MV
    733726  vector<Int>   cfg_dimensionLength;
    … …  
    742735#endif
    743736#endif
    744   string cfg_dQPFile;
    745   string cfg_ScalingListFile;
    746737
    747738  Int tmpChromaFormat;

  • branches/HTM-15.2-dev/source/App/TAppEncoder/TAppEncCfg.h

    r1360 r1362  
    136136#endif
    137137#endif
     138  // Lambda modifiers
    138139  Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
    139140  std::vector<Double> m_adIntraLambdaModifier;                ///< Lambda modifier for Intra pictures, one for each temporal layer. If size>temporalLayer, then use [temporalLayer], else if size>0, use [size()-1], else use m_adLambdaModifier.

  • branches/HTM-15.2-dev/source/Lib/TAppCommon/program_options_lite.h

    r1356 r1362  
    3737#include <map>
    3838#include  "../TLibCommon/CommonDef.h"
    39 
    4039#if NH_MV
    4140#include <vector>

  • 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.