Ignore:
Timestamp:
11 May 2012, 21:20:17 (12 years ago)
Author:
hschwarz
Message:

updated trunk (move to HM6.1)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/WeightPredAnalysis.h

    r5 r56  
    22 * License, included below. This software may be subject to other third party
    33 * and contributor rights, including patent rights, and no such rights are
    4  * granted under this license.
     4 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2011, ISO/IEC
     6 * Copyright (c) 2010-2012, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    1515 *    this list of conditions and the following disclaimer in the documentation
    1616 *    and/or other materials provided with the distribution.
    17  *  * Neither the name of the ISO/IEC nor the names of its contributors may
     17 *  * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
    1818 *    be used to endorse or promote products derived from this software without
    1919 *    specific prior written permission.
     
    3232 */
    3333
    34 
    35 
    3634/** \file     WeightedPredAnalysis.h
    3735    \brief    encoder class
     
    4240#include "../TLibCommon/TypeDef.h"
    4341#include "../TLibCommon/TComSlice.h"
     42#include "TEncCavlc.h"
    4443
    45 #ifdef WEIGHT_PRED
    46 
    47 #ifdef MSYS_LINUX
    48   typedef long long LInt;
    49 #else
    50   typedef __int64 LInt;
    51 #endif
    52 
    53 class  WeightPredAnalysis {
    54 
     44class  WeightPredAnalysis
     45{
     46  Bool m_weighted_pred_flag;
     47  Int  m_weighted_bipred_idc;
    5548  wpScalingParam  m_wp[2][MAX_NUM_REF][3];
    5649
     
    6356  Int64   xCalcDCValue(Pel *pPel, Int iWidth, Int iHeight, Int iStride);
    6457  Int64   xCalcACValue(Pel *pPel, Int iWidth, Int iHeight, Int iStride, Int64 iDC);
    65   Int64   xCalcDCValueUV(Pel *pPel, Int iWidth, Int iHeight, Int iStride);
    66   Int64   xCalcACValueUV(Pel *pPel, Int iWidth, Int iHeight, Int iStride, Int64 iDC);
    6758  Int64   xCalcSADvalueWP(Pel *pOrgPel, Pel *pRefPel, Int iWidth, Int iHeight, Int iOrgStride, Int iRefStride, Int iDenom, Int iWeight, Int iOffset);
    68   Int64   xCalcSADvalueWPUV(Pel *pOrgPel, Pel *pRefPel, Int iWidth, Int iHeight, Int iOrgStride, Int iRefStride, Int iDenom, Int iWeight, Int iOffset);
    69   Bool    xSelectWP(TComSlice *slice, wpScalingParam    weightPredTable[2][MAX_NUM_REF][3], Int iDenom);
     59  Bool    xSelectWP(TComSlice *slice, wpScalingParam weightPredTable[2][MAX_NUM_REF][3], Int iDenom);
    7060
    7161public:
     62
    7263  WeightPredAnalysis();
    7364
     
    7566  Bool  xCalcACDCParamSlice(TComSlice *slice);
    7667  Bool  xEstimateWPParamSlice(TComSlice *slice);
     68
     69  Void  xStoreWPparam(Bool weighted_pred_flag, Int weighted_bipred_idc);
     70  Void  xRestoreWPparam(TComSlice *slice);
     71  Void  xCheckWPEnable(TComSlice *slice);
    7772};
    7873
    79 #endif  // WEIGHT_PRED
    80 
    81 #endif  // __WEIGHTPREDANALYSIS__
     74#endif // __WEIGHTPREDANALYSIS__
    8275
    8376
Note: See TracChangeset for help on using the changeset viewer.