Changeset 1260 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
14 Jul 2015, 03:24:13 (10 years ago)
Author:
seregin
Message:

port rev 4257

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1259 r1260  
    14571457
    14581458/**
    1459  - write tiles and wavefront substreams sizes for the slice header.
    1460  .
    1461  \param pcSlice Where we find the substream size information.
     1459 * Write tiles and wavefront substreams sizes for the slice header (entry points).
     1460 *
     1461 * \param pSlice TComSlice structure that contains the substream size information.
    14621462 */
    14631463Void  TEncCavlc::codeTilesWPPEntryPoint( TComSlice* pSlice )
    … …  
    16551655// ====================================================================================================================
    16561656
    1657 /** code explicit wp tables
    1658  * \param TComSlice* pcSlice
    1659  * \returns Void
    1660  */
     1657//! Code weighted prediction tables
    16611658Void TEncCavlc::xCodePredWeightTable( TComSlice* pcSlice )
    16621659{
    … …  
    17811778/** code DPCM
    17821779 * \param scalingList quantization matrix information
    1783  * \param sizeIdc size index
    1784  * \param listIdc list index
     1780 * \param sizeId      size index
     1781 * \param listId      list index
    17851782 */
    17861783Void TEncCavlc::xCodeScalingList(const TComScalingList* scalingList, UInt sizeId, UInt listId)

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r1259 r1260  
    5555
    5656/**
    57  \param    uiTotalDepth  total number of allowable depth
     57 \param    uhTotalDepth  total number of allowable depth
    5858 \param    uiMaxWidth    largest CU width
    5959 \param    uiMaxHeight   largest CU height
     60 \param    chromaFormat  chroma format
    6061 */
    6162Void TEncCu::create(UChar uhTotalDepth, UInt uiMaxWidth, UInt uiMaxHeight, ChromaFormat chromaFormat)
    … …  
    231232// ====================================================================================================================
    232233
    233 /** \param  rpcCU pointer of CU data class
     234/**
     235 \param  pCtu pointer of CU data class
    234236 */
    235237Void TEncCu::compressCtu( TComDataCU* pCtu )
    … …  
    264266#endif
    265267}
    266 /** \param  pcCU  pointer of CU data class
     268/** \param  pCtu  pointer of CU data class
    267269 */
    268270Void TEncCu::encodeCtu ( TComDataCU* pCtu )
    … …  
    285287// Protected member functions
    286288// ====================================================================================================================
    287 /** Derive small set of test modes for AMP encoder speed-up
    288  *\param   rpcBestCU
    289  *\param   eParentPartSize
    290  *\param   bTestAMP_Hor
    291  *\param   bTestAMP_Ver
    292  *\param   bTestMergeAMP_Hor
    293  *\param   bTestMergeAMP_Ver
    294  *\returns Void
    295 */
     289//! Derive small set of test modes for AMP encoder speed-up
    296290#if AMP_ENC_SPEEDUP
    297291#if AMP_MRG
    … …  
    368362// ====================================================================================================================
    369363/** Compress a CU block recursively with enabling sub-CTU-level delta QP
    370  *\param   rpcBestCU
    371  *\param   rpcTempCU
    372  *\param   uiDepth
    373  *\returns Void
    374  *
    375  *- for loop of QP value to compress the current CU with all possible QP
     364 *  - for loop of QP value to compress the current CU with all possible QP
    376365*/
    377366#if AMP_ENC_SPEEDUP
    … …  
    12851274 * \param rpcBestCU
    12861275 * \param rpcTempCU
    1287  * \returns Void
     1276 * \param earlyDetectionSkipMode
    12881277 */
    12891278#if HIGHER_LAYER_IRAP_SKIP_FLAG
    … …  
    16001589 * \param rpcBestCU
    16011590 * \param rpcTempCU
    1602  * \returns Void
     1591 * \param uiDepth
    16031592 */
    16041593Void TEncCu::xCheckBestMode( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth DEBUG_STRING_FN_DECLARE(sParent) DEBUG_STRING_FN_DECLARE(sTest) DEBUG_STRING_PASS_INTO(Bool bAddSizeInfo) )
    … …  
    16941683
    16951684/** Function for filling the PCM buffer of a CU using its original sample array
    1696  * \param pcCU pointer to current CU
    1697  * \param pcOrgYuv pointer to original sample array
    1698  * \returns Void
     1685 * \param pCU pointer to current CU
     1686 * \param pOrgYuv pointer to original sample array
    16991687 */
    17001688Void TEncCu::xFillPCMBuffer     ( TComDataCU* pCU, TComYuv* pOrgYuv )
    … …  
    17551743}
    17561744
    1757 /** Collect ARL statistics from one CTU
    1758  * \param pcCU
    1759  */
     1745//! Collect ARL statistics from one CTU
    17601746Void TEncCu::xCtuCollectARLStats(TComDataCU* pCtu )
    17611747{
    1762   Double cSum[ LEVEL_RANGE + 1 ];     //: the sum of DCT coefficients corresponding to datatype and quantization output
    1763   UInt numSamples[ LEVEL_RANGE + 1 ]; //: the number of coefficients corresponding to datatype and quantization output
     1748  Double cSum[ LEVEL_RANGE + 1 ];     //: the sum of DCT coefficients corresponding to data type and quantization output
     1749  UInt numSamples[ LEVEL_RANGE + 1 ]; //: the number of coefficients corresponding to data type and quantization output
    17641750
    17651751  TCoeff* pCoeffY = pCtu->getCoeff(COMPONENT_Y);

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1259 r1260  
    126126}
    127127
    128 /** encode merge flag
    129  * \param pcCU
    130  * \param uiAbsPartIdx
    131  * \returns Void
    132  */
     128//! encode merge flag
    133129Void TEncEntropy::encodeMergeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
    134130{
    … …  
    137133}
    138134
    139 /** encode merge index
    140  * \param pcCU
    141  * \param uiAbsPartIdx
    142  * \param bRD
    143  * \returns Void
    144  */
     135//! encode merge index
    145136Void TEncEntropy::encodeMergeIndex( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    146137{
    … …  
    154145
    155146
    156 /** encode prediction mode
    157  * \param pcCU
    158  * \param uiAbsPartIdx
    159  * \param bRD
    160  * \returns Void
    161  */
     147//! encode prediction mode
    162148Void TEncEntropy::encodePredMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    163149{
    … …  
    175161}
    176162
    177 // Split mode
     163//! encode split flag
    178164Void TEncEntropy::encodeSplitFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD )
    179165{
    … …  
    186172}
    187173
    188 /** encode partition size
    189  * \param pcCU
    190  * \param uiAbsPartIdx
    191  * \param uiDepth
    192  * \param bRD
    193  * \returns Void
    194  */
     174//! encode partition size
    195175Void TEncEntropy::encodePartSize( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD )
    196176{
    … …  
    205185
    206186/** Encode I_PCM information.
    207  * \param pcCU pointer to CU
    208  * \param uiAbsPartIdx CU index
    209  * \param bRD flag indicating estimation or encoding
    210  * \returns Void
     187 * \param pcCU          pointer to CU
     188 * \param uiAbsPartIdx  CU index
     189 * \param bRD           flag indicating estimation or encoding
    211190 */
    212191Void TEncEntropy::encodeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    … …  
    429408
    430409
    431 // Intra direction for Luma
     410//! encode intra direction for luma
    432411Void TEncEntropy::encodeIntraDirModeLuma  ( TComDataCU* pcCU, UInt absPartIdx, Bool isMultiplePU )
    433412{
    … …  
    436415
    437416
    438 // Intra direction for Chroma
     417//! encode intra direction for chroma
    439418Void TEncEntropy::encodeIntraDirModeChroma( TComDataCU* pcCU, UInt uiAbsPartIdx )
    440419{
    … …  
    484463}
    485464
    486 /** encode motion information for every PU block
    487  * \param pcCU
    488  * \param uiAbsPartIdx
    489  * \param bRD
    490  * \returns Void
    491  */
     465//! encode motion information for every PU block
    492466Void TEncEntropy::encodePUWise( TComDataCU* pcCU, UInt uiAbsPartIdx )
    493467{
    … …  
    555529}
    556530
    557 /** encode reference frame index for a PU block
    558  * \param pcCU
    559  * \param uiAbsPartIdx
    560  * \param eRefList
    561  * \returns Void
    562  */
     531//! encode reference frame index for a PU block
    563532Void TEncEntropy::encodeRefFrmIdxPU( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
    564533{
    … …  
    578547}
    579548
    580 /** encode motion vector difference for a PU block
    581  * \param pcCU
    582  * \param uiAbsPartIdx
    583  * \param eRefList
    584  * \returns Void
    585  */
     549//! encode motion vector difference for a PU block
    586550Void TEncEntropy::encodeMvdPU( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
    587551{
    … …  
    644608}
    645609
    646 /** encode chroma qp adjustment
    647  * \returns Void
    648  */
     610//! encode chroma qp adjustment
    649611Void TEncEntropy::encodeChromaQpAdjustment( TComDataCU* cu, UInt absPartIdx, Bool inRd )
    650612{
    … …  
    659621// texture
    660622
    661 /** encode coefficients
    662  * \param pcCU
    663  * \param uiAbsPartIdx
    664  * \param uiDepth
    665  * \param uiWidth
    666  * \param uiHeight
    667  */
     623//! encode coefficients
    668624Void TEncEntropy::encodeCoeff( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool& bCodeDQP, Bool& codeChromaQpAdj )
    669625{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1259 r1260  
    37613761/** Function for deciding the nal_unit_type.
    37623762 * \param pocCurr POC of the current picture
    3763  * \returns the nal unit type of the picture
     3763 * \param lastIDR  POC of the last IDR picture
     3764 * \param isField  true to indicate field coding
     3765 * \returns the NAL unit type of the picture
    37643766 * This function checks the configuration and returns the appropriate nal_unit_type for the picture.
    37653767 */

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncPic.cpp

    r1259 r1260  
    117117
    118118/** Initialize member variables
    119  * \param iWidth Picture width
    120  * \param iHeight Picture height
     119 * \param sps reference to used SPS
     120 * \param pps reference to used PPS
    121121 * \param uiMaxWidth Maximum CU width
    122122 * \param uiMaxHeight Maximum CU height
    … …  
    124124 * \param uiMaxAQDepth Maximum depth of unit block for assigning QP adaptive to local image characteristics
    125125 * \param bIsVirtual
    126  * \return Void
    127126 */
    128127
    129128#if SVC_EXTENSION
     129// * \param vps reference to used VPS
    130130Void TEncPic::create( const TComVPS& vps, const TComSPS &sps, const TComPPS &pps, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Bool bIsVirtual, const UInt layerId )
    131131{
    … …  
    138138{
    139139  TComPic::create( sps, pps, uiMaxWidth, uiMaxHeight, uiMaxDepth, bIsVirtual );
    140 
    141140  const Int iWidth  = sps.getPicWidthInLumaSamples();
    142141  const Int iHeight = sps.getPicHeightInLumaSamples();
    … …  
    153152}
    154153
    155 /** Clean up
    156  * \return Void
    157  */
     154//! Clean up
    158155Void TEncPic::destroy()
    159156{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp

    r1259 r1260  
    4646
    4747
    48 /** rounding with IBDI
    49  * \param  x
    50  */
     48//! rounding with IBDI
    5149inline Double xRoundIbdi2(Int bitDepth, Double x)
    5250{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

    r1259 r1260  
    335335
    336336/** Coding of coeff_abs_level_minus3
    337  * \param uiSymbol value of coeff_abs_level_minus3
    338  * \param ruiGoRiceParam reference to Rice parameter
    339  * \returns Void
     337 * \param symbol                  value of coeff_abs_level_minus3
     338 * \param rParam                  reference to Rice parameter
     339 * \param useLimitedPrefixLength
     340 * \param channelType             plane type (luma/chroma)
    340341 */
    341342Void TEncSbac::xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const ChannelType channelType )
    … …  
    11121113
    11131114/** Encode (X,Y) position of the last significant coefficient
    1114  * \param uiPosX X component of last coefficient
    1115  * \param uiPosY Y component of last coefficient
    1116  * \param width  Block width
    1117  * \param height Block height
    1118  * \param eTType plane type / luminance or chrominance
    1119  * \param uiScanIdx scan type (zig-zag, hor, ver)
     1115 * \param uiPosX     X component of last coefficient
     1116 * \param uiPosY     Y component of last coefficient
     1117 * \param width      Block width
     1118 * \param height     Block height
     1119 * \param component  chroma component ID
     1120 * \param uiScanIdx  scan type (zig-zag, hor, ver)
    11201121 * This method encodes the X and Y component within a block of the last significant coefficient.
    11211122 */
    … …  
    15791580
    15801581/** Code SAO EO class or BO band position
    1581  * \param uiLength
    1582  * \param uiCode
    15831582 */
    15841583Void TEncSbac::codeSaoUflc       ( UInt uiLength, UInt uiCode )
    … …  
    15881587
    15891588/** Code SAO merge flags
    1590  * \param uiCode
    1591  * \param uiCompIdx
    15921589 */
    15931590Void TEncSbac::codeSaoMerge       ( UInt uiCode )
    … …  
    15971594
    15981595/** Code SAO type index
    1599  * \param uiCode
    16001596 */
    16011597Void TEncSbac::codeSaoTypeIdx       ( UInt uiCode)

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

    r1259 r1260  
    27482748 * \param pcCU pointer to current CU
    27492749 * \param uiAbsPartIdx part index
    2750  * \param piOrg pointer to original sample arrays
    2751  * \param piPCM pointer to PCM code arrays
    2752  * \param piPred pointer to prediction signal arrays
    2753  * \param piResi pointer to residual signal arrays
    2754  * \param piReco pointer to reconstructed sample arrays
     2750 * \param pOrg pointer to original sample arrays
     2751 * \param pPCM pointer to PCM code arrays
     2752 * \param pPred pointer to prediction signal arrays
     2753 * \param pResi pointer to residual signal arrays
     2754 * \param pReco pointer to reconstructed sample arrays
    27552755 * \param uiStride stride of the original/prediction/residual sample arrays
    27562756 * \param uiWidth block width
    27572757 * \param uiHeight block height
    2758  * \param ttText texture component type
    2759  * \returns Void
     2758 * \param compID texture component type
    27602759 */
    27612760Void TEncSearch::xEncPCM (TComDataCU* pcCU, UInt uiAbsPartIdx, Pel* pOrg, Pel* pPCM, Pel* pPred, Pel* pResi, Pel* pReco, UInt uiStride, UInt uiWidth, UInt uiHeight, const ComponentID compID )
    … …  
    27922791
    27932792
    2794 /**  Function for PCM mode estimation.
    2795  * \param pcCU
    2796  * \param pcOrgYuv
    2797  * \param rpcPredYuv
    2798  * \param rpcResiYuv
    2799  * \param rpcRecoYuv
    2800  * \returns Void
    2801  */
     2793//!  Function for PCM mode estimation.
    28022794Void TEncSearch::IPCMSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, TComYuv* pcResiYuv, TComYuv* pcRecoYuv )
    28032795{
    … …  
    28652857}
    28662858
    2867 /** estimation of best merge coding
    2868  * \param pcCU
    2869  * \param pcYuvOrg
    2870  * \param iPUIdx
    2871  * \param uiInterDir
    2872  * \param pacMvField
    2873  * \param uiMergeIndex
    2874  * \param ruiCost
    2875  * \param ruiBits
    2876  * \param puhNeighCands
    2877  * \param bValid
    2878  * \returns Void
    2879  */
     2859//! estimation of best merge coding
    28802860Void TEncSearch::xMergeEstimation( TComDataCU* pcCU, TComYuv* pcYuvOrg, Int iPUIdx, UInt& uiInterDir, TComMvField* pacMvField, UInt& uiMergeIndex, Distortion& ruiCost, TComMvField* cMvFieldNeighbours, UChar* uhInterDirNeighbours, Int& numValidMergeCand )
    28812861{
    … …  
    29712951}
    29722952
    2973 /** search of the best candidate for inter prediction
    2974  * \param pcCU
    2975  * \param pcOrgYuv
    2976  * \param rpcPredYuv
    2977  * \param rpcResiYuv
    2978  * \param rpcRecoYuv
    2979  * \param bUseRes
    2980  * \returns Void
    2981  */
     2953//! search of the best candidate for inter prediction
    29822954#if SVC_EXTENSION
    29832955#if AMP_MRG
    … …  
    44874459
    44884460
    4489 /** encode residual and calculate rate-distortion for a CU block
    4490  * \param pcCU
    4491  * \param pcYuvOrg
    4492  * \param pcYuvPred
    4493  * \param rpcYuvResi
    4494  * \param rpcYuvResiBest
    4495  * \param rpcYuvRec
    4496  * \param bSkipRes
    4497  * \returns Void
    4498  */
     4461//! encode residual and calculate rate-distortion for a CU block
    44994462Void TEncSearch::encodeResAndCalcRdInterCU( TComDataCU* pcCU, TComYuv* pcYuvOrg, TComYuv* pcYuvPred,
    45004463                                            TComYuv* pcYuvResi, TComYuv* pcYuvResiBest, TComYuv* pcYuvRec,
    … …  
    57535716
    57545717
    5755 /** set wp tables
    5756  * \param TComDataCU* pcCU
    5757  * \param iRefIdx
    5758  * \param eRefPicListCur
    5759  * \returns Void
    5760  */
     5718//! set wp tables
    57615719Void  TEncSearch::setWpScalingDistParam( TComDataCU* pcCU, Int iRefIdx, RefPicList eRefPicListCur )
    57625720{

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

    r1259 r1260  
    4848
    4949TEncSlice::TEncSlice()
    50 : m_encCABACTableIdx(I_SLICE)
     50 : m_encCABACTableIdx(I_SLICE)
    5151{
    5252  m_apcPicYuvPred = NULL;
    … …  
    222222 .
    223223 \param pcPic         picture class
    224  \param pocLast      POC of last picture
    225  \param pocCurr     current POC
     224 \param pocLast       POC of last picture
     225 \param pocCurr       current POC
    226226 \param iNumPicRcvd   number of received pictures
    227  \param iTimeOffset   POC offset for hierarchical structure
    228  \param iDepth        temporal layer depth
     227 \param iGOPid        POC offset for hierarchical structure
    229228 \param rpcSlice      slice header class
    230229 \param pSPS          SPS associated with the slice
    231230 \param pPPS          PPS associated with the slice
     231 \param isField       true for field coding
    232232 */
    233233#if SVC_EXTENSION
    234 //\param vps          VPS associated with the slice
    235234Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, Bool isField )
    236235#else
    … …  
    621620
    622621/**
    623  - multi-loop slice encoding for different slice QP
    624  .
    625  \param rpcPic    picture class
     622 Multi-loop slice encoding for different slice QP
     623
     624 \param pcPic    picture class
    626625 */
    627626Void TEncSlice::precompressSlice( TComPic* pcPic )
    … …  
    742741}
    743742
    744 /** \param rpcPic   picture class
     743/** \param pcPic   picture class
    745744 */
    746745Void TEncSlice::compressSlice( TComPic* pcPic )
    … …  
    10321031}
    10331032
    1034 /**
    1035  \param  rpcPic        picture class
    1036  \retval rpcBitstream  bitstream class
    1037  */
    10381033Void TEncSlice::encodeSlice   ( TComPic* pcPic, TComOutputBitstream* pcSubstreams, UInt &numBinsCoded )
    10391034{
    … …  
    13131308
    13141309/** Determines the starting and bounding CTU address of current slice / dependent slice
    1315  * \param bEncodeSlice Identifies if the calling function is compressSlice() [false] or encodeSlice() [true]
    1316  * \returns Updates startCtuTsAddr, boundingCtuTsAddr with appropriate CTU address
     1310 * \param [out] startCtuTsAddr
     1311 * \param [out] boundingCtuTsAddr
     1312 * \param [in] pcPic
     1313 * \param encodingSlice Identifies, if the calling function is compressSlice() [false] or encodeSlice() [true]
     1314
     1315 * Updates startCtuTsAddr, boundingCtuTsAddr with appropriate CTU address
    13171316 */
    13181317Void TEncSlice::xDetermineStartAndBoundingCtuTsAddr  ( UInt& startCtuTsAddr, UInt& boundingCtuTsAddr, TComPic* pcPic, const Bool encodingSlice ) // TODO: this is now only ever called with encodingSlice=false

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1259 r1260  
    395395 \param   flush               cause encoder to encode a partial GOP
    396396 \param   pcPicYuvOrg         original YUV picture
     397 \param   pcPicYuvTrueOrg     
     398 \param   snrCSC
    397399 \retval  rcListPicYuvRecOut  list of reconstruction YUV pictures
    398  \retval  rcListBitstreamOut  list of output bitstreams
     400 \retval  accessUnitsOut      list of output access units
    399401 \retval  iNumEncoded         number of encoded pictures
    400402 */

  • branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp

    r1259 r1260  
    6464
    6565
    66 /** calculate AC and DC values for current original image
    67  * \param TComSlice *slice
    68  * \returns Void
    69  */
     66//! calculate AC and DC values for current original image
    7067Void WeightPredAnalysis::xCalcACDCParamSlice(TComSlice *const slice)
    7168{
    … …  
    127124
    128125
    129 /** check weighted pred or non-weighted pred
    130  * \param TComSlice *slice
    131  * \returns Void
    132  */
     126//! check weighted pred or non-weighted pred
    133127Void  WeightPredAnalysis::xCheckWPEnable(TComSlice *const slice)
    134128{
    … …  
    178172
    179173
    180 /** estimate wp tables for explicit wp
    181  * \param TComSlice *slice
    182  */
     174//! estimate wp tables for explicit wp
    183175Void WeightPredAnalysis::xEstimateWPParamSlice(TComSlice *const slice)
    184176{
    … …  
    208200
    209201
    210 /** update wp tables for explicit wp w.r.t ramge limitation
    211  * \param TComSlice *slice
    212  * \returns Bool
    213  */
     202//! update wp tables for explicit wp w.r.t range limitation
    214203Bool WeightPredAnalysis::xUpdatingWPParameters(TComSlice *const slice, const Int log2Denom)
    215204{
    … …  
    329318
    330319
    331 /** select whether weighted pred enables or not.
    332  * \param TComSlice *slice
    333  * \param log2Denom
    334  * \returns Bool
    335  */
     320//! select whether weighted pred enables or not.
    336321Bool WeightPredAnalysis::xSelectWP(TComSlice *const slice, const Int log2Denom)
    337322{
    … …  
    385370
    386371
    387 /** calculate SAD values for both WP version and non-WP version.
    388  * \param Pel *pOrgPel
    389  * \param Pel *pRefPel
    390  * \param Int iWidth
    391  * \param Int iHeight
    392  * \param Int iOrgStride
    393  * \param Int iRefStride
    394  * \param Int iLog2Denom
    395  * \param Int iWeight
    396  * \param Int iOffset
    397  * \returns Int64
    398  */
     372//! calculate SAD values for both WP version and non-WP version.
    399373Int64 WeightPredAnalysis::xCalcSADvalueWP(const Int   bitDepth,
    400374                                          const Pel  *pOrgPel,
Note: See TracChangeset for help on using the changeset viewer.