Ignore:
Timestamp:
1 Sep 2013, 22:47:26 (11 years ago)
Author:
tech
Message:

Merged DEV-2.0-dev0@604.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComInterpolationFilter.h

    r443 r608  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2012, ITU/ISO/IEC
     6 * Copyright (c) 2010-2013, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    4444//! \ingroup TLibCommon
    4545//! \{
    46 #if QC_ARP_D0177
     46
     47#if H_3D_ARP
    4748#define NTAPS_LUMA_ARP    2 ///< Number of taps for luma
    4849#define NTAPS_CHROMA_ARP  2 ///< Number of taps for chroma
     
    6263  static const Short m_lumaFilter[4][NTAPS_LUMA];     ///< Luma filter taps
    6364  static const Short m_chromaFilter[8][NTAPS_CHROMA]; ///< Chroma filter taps
    64 #if QC_ARP_D0177
    65   static const Short m_lumaFilterARP  [4][NTAPS_LUMA_ARP];     ///< Luma filter taps
    66   static const Short m_chromaFilterARP[8][NTAPS_CHROMA_ARP]; ///< Chroma filter taps
     65#if H_3D_ARP
     66  static const Short m_lumaFilterARP  [4][NTAPS_LUMA_ARP];     ///< Luma filter taps for ARP
     67  static const Short m_chromaFilterARP[8][NTAPS_CHROMA_ARP];   ///< Chroma filter taps for ARP
    6768#endif
     69  static Void filterCopy(Int bitDepth, const Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Bool isFirst, Bool isLast);
     70 
     71  template<Int N, Bool isVertical, Bool isFirst, Bool isLast>
     72  static Void filter(Int bitDepth, Pel const *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Short const *coeff);
    6873
    69   static Void filterCopy(const Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Bool isFirst, Bool isLast);
    70  
    71   template<int N, bool isVertical, bool isFirst, bool isLast>
    72   static Void filter(Pel const *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Short const *coeff);
    73 
    74   template<int N>
    75   static Void filterHor(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height,               Bool isLast, Short const *coeff);
    76   template<int N>
    77   static Void filterVer(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Bool isFirst, Bool isLast, Short const *coeff);
     74  template<Int N>
     75  static Void filterHor(Int bitDepth, Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height,               Bool isLast, Short const *coeff);
     76  template<Int N>
     77  static Void filterVer(Int bitDepth, Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Bool isFirst, Bool isLast, Short const *coeff);
    7878
    7979public:
     
    8181  ~TComInterpolationFilter() {}
    8282
    83   Void filterHorLuma  (Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast
    84 #if QC_ARP_D0177
    85     ,
    86     Bool filterType = 0
     83  Void filterHorLuma  (Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast
     84#if H_3D_ARP
     85    , Bool filterType = false
    8786#endif
    8887    );
    8988  Void filterVerLuma  (Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast
    90 #if QC_ARP_D0177
    91     ,
    92     Bool filterType = 0
     89#if H_3D_ARP
     90    , Bool filterType = false
    9391#endif
    9492    );
    95   Void filterHorChroma(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast
    96 #if QC_ARP_D0177
    97     ,
    98     Bool filterType = 0
     93  Void filterHorChroma(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast
     94#if H_3D_ARP
     95    , Bool filterType = false
    9996#endif
    10097    );
    101   Void filterVerChroma(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast
    102 #if QC_ARP_D0177
    103     ,
    104     Bool filterType = 0
     98  Void filterVerChroma(Pel *src, Int srcStride, Short *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast
     99#if H_3D_ARP
     100    , Bool filterType = false
    105101#endif
    106102    );
Note: See TracChangeset for help on using the changeset viewer.