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/TLibEncoder/WeightPredAnalysis.h

    r56 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 *
     
    3232 */
    3333
    34 /** \file     WeightedPredAnalysis.h
    35     \brief    encoder class
     34/** \file     WeightPredAnalysis.h
     35    \brief    weighted prediction encoder class
    3636*/
    3737#ifndef __WEIGHTPREDANALYSIS__
     
    4545{
    4646  Bool m_weighted_pred_flag;
    47   Int  m_weighted_bipred_idc;
     47  Bool  m_weighted_bipred_flag;
    4848  wpScalingParam  m_wp[2][MAX_NUM_REF][3];
    4949
     
    5656  Int64   xCalcDCValue(Pel *pPel, Int iWidth, Int iHeight, Int iStride);
    5757  Int64   xCalcACValue(Pel *pPel, Int iWidth, Int iHeight, Int iStride, Int64 iDC);
    58   Int64   xCalcSADvalueWP(Pel *pOrgPel, Pel *pRefPel, Int iWidth, Int iHeight, Int iOrgStride, Int iRefStride, Int iDenom, Int iWeight, Int iOffset);
     58  Int64   xCalcSADvalueWP(Int bitDepth, Pel *pOrgPel, Pel *pRefPel, Int iWidth, Int iHeight, Int iOrgStride, Int iRefStride, Int iDenom, Int iWeight, Int iOffset);
    5959  Bool    xSelectWP(TComSlice *slice, wpScalingParam weightPredTable[2][MAX_NUM_REF][3], Int iDenom);
     60  Bool    xUpdatingWPParameters(TComSlice *slice, wpScalingParam weightPredTable[2][MAX_NUM_REF][3], Int log2Denom);
    6061
    6162public:
     
    6667  Bool  xCalcACDCParamSlice(TComSlice *slice);
    6768  Bool  xEstimateWPParamSlice(TComSlice *slice);
    68 
    69   Void  xStoreWPparam(Bool weighted_pred_flag, Int weighted_bipred_idc);
     69  Void  xStoreWPparam(Bool weighted_pred_flag, Bool weighted_bipred_flag);
    7070  Void  xRestoreWPparam(TComSlice *slice);
    7171  Void  xCheckWPEnable(TComSlice *slice);
Note: See TracChangeset for help on using the changeset viewer.