Changeset 1258 in SHVCSoftware


Ignore:
Timestamp:
14 Jul 2015, 02:57:50 (10 years ago)
Author:
seregin
Message:

port rev 4253 and rev 4255

Location:
branches/SHM-dev/source/Lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r1246 r1258  
    453453
    454454/**
    455  - initialize top-level CU
    456  - internal buffers are already created
    457  - set values before encoding a CU
    458  .
    459  \param  pcPic     picture (TComPic) class pointer
    460  \param  iCUAddr   CU address
     455 Initialize top-level CU: create internal buffers and set initial values before encoding the CTU.
     456 
     457 \param  pcPic       picture (TComPic) class pointer
     458 \param  ctuRsAddr   CTU address in raster scan order
    461459 */
    462460Void TComDataCU::initCtu( TComPic* pcPic, UInt ctuRsAddr )
    … …  
    571569
    572570
    573 /** initialize prediction data with enabling sub-CTU-level delta QP
    574 *\param  uiDepth  depth of the current CU
    575 *\param  qp     qp for the current CU
    576 *- set CU width and CU height according to depth
    577 *- set qp value according to input qp
    578 *- set last-coded qp value according to input last-coded qp
     571/** Initialize prediction data with enabling sub-CTU-level delta QP.
     572*   - set CU width and CU height according to depth
     573*   - set qp value according to input qp
     574*   - set last-coded qp value according to input last-coded qp
     575*
     576* \param  uiDepth            depth of the current CU
     577* \param  qp                 qp for the current CU
     578* \param  bTransquantBypass  true for transquant bypass
    579579*/
    580580Void TComDataCU::initEstData( const UInt uiDepth, const Int qp, const Bool bTransquantBypass )
    … …  
    14931493
    14941494
    1495 /** Check whether the CU is coded in lossless coding mode
    1496  * \param   uiAbsPartIdx
     1495/** Check whether the CU is coded in lossless coding mode.
     1496 * \param   absPartIdx
    14971497 * \returns true if the CU is coded in lossless coding mode; false if otherwise
    14981498 */
    … …  
    15041504
    15051505/** Get allowed chroma intra modes
    1506 *\param   uiAbsPartIdx
    1507 *\param   uiModeList  pointer to chroma intra modes array
    1508 *\returns
    1509 *- fill uiModeList with chroma intra modes
     1506*   - fills uiModeList with chroma intra modes
     1507*
     1508*\param   [in]  uiAbsPartIdx
     1509*\param   [out] uiModeList pointer to chroma intra modes array
    15101510*/
    15111511Void TComDataCU::getAllowedChromaDir( UInt uiAbsPartIdx, UInt uiModeList[NUM_CHROMA_MODE] )
    … …  
    15311531
    15321532/** Get most probable intra modes
    1533 *\param   uiAbsPartIdx
     1533*\param   uiAbsPartIdx    partition index
    15341534*\param   uiIntraDirPred  pointer to the array for MPM storage
     1535*\param   compID          color component ID
    15351536*\param   piMode          it is set with MPM mode in case both MPM are equal. It is used to restrict RD search at encode side.
    15361537*\returns Number of MPM
    … …  
    22532254}
    22542255
    2255 /** Derives the partition index of neighbouring bottom right block
    2256  * \param [in]  eCUMode
    2257  * \param [in]  uiPartIdx
    2258  * \param [out] ruiPartIdxRB
     2256/** Derive the partition index of neighbouring bottom right block
     2257 * \param [in]  uiPartIdx     current partition index
     2258 * \param [out] ruiPartIdxRB  partition index of neighbouring bottom right block
    22592259 */
    2260 Void TComDataCU::deriveRightBottomIdx( UInt  uiPartIdx,      UInt&      ruiPartIdxRB )
     2260Void TComDataCU::deriveRightBottomIdx( UInt uiPartIdx, UInt &ruiPartIdxRB )
    22612261{
    22622262  ruiPartIdxRB      = g_auiRasterToZscan [g_auiZscanToRaster[ m_absZIdxInCtu ] + ( ((m_puhHeight[0] / m_pcPic->getMinCUHeight())>>1) - 1)*m_pcPic->getNumPartInCtuWidth() +  m_puhWidth[0] / m_pcPic->getMinCUWidth() - 1];
    … …  
    23352335}
    23362336
    2337 /** Constructs a list of merging candidates
    2338  * \param uiAbsPartIdx
    2339  * \param uiPUIdx
    2340  * \param uiDepth
    2341  * \param pcMvFieldNeighbours
    2342  * \param puhInterDirNeighbours
    2343  * \param numValidMergeCand
    2344  */
     2337//! Construct a list of merging candidates
    23452338Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int mrgCandIdx )
    23462339{
    … …  
    26982691
    26992692/** Check whether the current PU and a spatial neighboring PU are in a same ME region.
    2700  * \param xN, xN   location of the upper-left corner pixel of a neighboring PU
     2693 * \param xN, yN   location of the upper-left corner pixel of a neighboring PU
    27012694 * \param xP, yP   location of the upper-left corner pixel of the current PU
    2702  * \returns Bool
    27032695 */
    27042696Bool TComDataCU::isDiffMER(Int xN, Int yN, Int xP, Int yP)
    … …  
    27172709}
    27182710
    2719 /** calculate the location of upper-left corner pixel and size of the current PU.
    2720  * \param partIdx  PU index within a CU
    2721  * \param xP, yP   location of the upper-left corner pixel of the current PU
    2722  * \param PSW, nPSH    size of the curren PU
    2723  * \returns Void
     2711/** Calculate the location of upper-left corner pixel and size of the current PU.
     2712 * \param partIdx       PU index within a CU
     2713 * \param xP, yP        location of the upper-left corner pixel of the current PU
     2714 * \param nPSW, nPSH    size of the current PU
    27242715 */
    27252716Void TComDataCU::getPartPosition( UInt partIdx, Int& xP, Int& yP, Int& nPSW, Int& nPSH)
    … …  
    30183009}
    30193010
    3020 /** Test whether the current block is skipped
    3021  * \param uiPartIdx Block index
    3022  * \returns Flag indicating whether the block is skipped
     3011/** Test whether the block at uiPartIdx is skipped.
     3012 * \param uiPartIdx Partition index
     3013 * \returns true if the current the block is skipped
    30233014 */
    30243015Bool TComDataCU::isSkipped( UInt uiPartIdx )
    … …  
    32423233}
    32433234
    3244 /**
    3245  * \param eRefPicList
    3246  * \param uiCUAddr
    3247  * \param uiPartUnitIdx
    3248  * \param riRefIdx
    3249  * \returns Bool
    3250  */
    32513235Bool TComDataCU::xGetColMVP( RefPicList eRefPicList, Int ctuRsAddr, Int uiPartUnitIdx, TComMv& rcMv, Int& riRefIdx )
    32523236{
    … …  
    33623346}
    33633347
    3364 /**
    3365  * \param eCUMode
    3366  * \param uiPartIdx
    3367  * \param ruiPartIdxCenter
    3368  * \returns Void
    3369  */
    33703348Void TComDataCU::xDeriveCenterIdx( UInt uiPartIdx, UInt& ruiPartIdxCenter )
    33713349{

  • branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

    r1246 r1258  
    449449  Bool          isIntra            ( UInt uiPartIdx )  const { return m_pePredMode[ uiPartIdx ] == MODE_INTRA;                                              }
    450450  Bool          isInter            ( UInt uiPartIdx )  const { return m_pePredMode[ uiPartIdx ] == MODE_INTER;                                              }
    451   Bool          isSkipped          ( UInt uiPartIdx );                                                     ///< SKIP (no residual)
     451  Bool          isSkipped          ( UInt uiPartIdx );                                                     ///< returns true, if the partiton is skipped
    452452  Bool          isBipredRestriction( UInt puIdx );
    453453

  • branches/SHM-dev/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp

    r1029 r1258  
    140140// HADAMARD with step (used in fractional search)
    141141// --------------------------------------------------------------------------------------------------------------------
    142 /** get weighted Hadamard cost for 2x2 block
    143  * \param *piOrg
    144  * \param *piCur
    145  * \param iStrideOrg
    146  * \param iStrideCur
    147  * \param iStep
    148  * \returns Distortion
    149  */
     142//! get weighted Hadamard cost for 2x2 block
    150143Distortion xCalcHADs2x2w( const WPScalingParam &wpCur, const Pel *piOrg, const Pel *piCur, Int iStrideOrg, Int iStrideCur, Int iStep )
    151144{
    … …  
    184177
    185178
    186 /** get weighted Hadamard cost for 4x4 block
    187  * \param *piOrg
    188  * \param *piCur
    189  * \param iStrideOrg
    190  * \param iStrideCur
    191  * \param iStep
    192  * \returns Distortion
    193  */
     179//! get weighted Hadamard cost for 4x4 block
    194180Distortion xCalcHADs4x4w( const WPScalingParam &wpCur, const Pel *piOrg, const Pel *piCur, Int iStrideOrg, Int iStrideCur, Int iStep )
    195181{
    … …  
    300286
    301287
    302 /** get weighted Hadamard cost for 8x8 block
    303  * \param *piOrg
    304  * \param *piCur
    305  * \param iStrideOrg
    306  * \param iStrideCur
    307  * \param iStep
    308  * \returns Distortion
    309  */
     288//! get weighted Hadamard cost for 8x8 block
    310289Distortion xCalcHADs8x8w( const WPScalingParam &wpCur, const Pel *piOrg, const Pel *piCur, Int iStrideOrg, Int iStrideCur, Int iStep )
    311290{
    … …  
    425404
    426405
    427 /** get weighted Hadamard cost
    428  * \param *pcDtParam
    429  * \returns Distortion
    430  */
     406//! get weighted Hadamard cost
    431407Distortion TComRdCostWeightPrediction::xGetHADsw( DistParam* pcDtParam )
    432408{

  • branches/SHM-dev/source/Lib/TLibCommon/TComRdCostWeightPrediction.h

    r1029 r1258  
    4141
    4242#include "CommonDef.h"
    43 #include "TComPattern.h"
    44 #include "TComMv.h"
    45 #include "TComRdCost.h"
    46 #include "TComSlice.h"
    4743
    4844class DistParam;

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1256 r1258  
    582582
    583583    assert(numPicTotalCurr > 0);
    584     // genral tier and level limit:
     584    // general tier and level limit:
    585585    assert(numPicTotalCurr <= 8);
    586586
    … …  
    25602560}
    25612561
    2562 /** parse syntax infomation
    2563  *  \param pchFile syntax infomation
    2564  *  \returns false if successful
    2565  */
    2566 
    25672562static Void outputScalingListHelp(std::ostream &os)
    25682563{

  • branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

    r1246 r1258  
    230230 * either 8bit or 16bit little-endian lsb-aligned words.
    231231 *
    232  * @param dst     destination image
    233  * @param fd      input file stream
    234  * @param is16bit true if input file carries > 8bit data, false otherwise.
    235  * @param stride  distance between vertically adjacent pixels of dst.
    236  * @param width   width of active area in dst.
    237  * @param height  height of active area in dst.
    238  * @param pad_x   length of horizontal padding.
    239  * @param pad_y   length of vertical padding.
     232 * @param dst          destination image plane
     233 * @param fd           input file stream
     234 * @param is16bit      true if input file carries > 8bit data, false otherwise.
     235 * @param stride444    distance between vertically adjacent pixels of dst.
     236 * @param width444     width of active area in dst.
     237 * @param height444    height of active area in dst.
     238 * @param pad_x444     length of horizontal padding.
     239 * @param pad_y444     length of vertical padding.
     240 * @param compID       chroma component
     241 * @param destFormat   chroma format of image
     242 * @param fileFormat   chroma format of file
     243 * @param fileBitDepth component bit depth in file
    240244 * @return true for success, false in case of error
    241245 */
    … …  
    381385
    382386/**
    383  * Write width*height pixels info fd from src.
    384  *
    385  * @param fd      output file stream
    386  * @param src     source image
    387  * @param is16bit true if input file carries > 8bit data, false otherwise.
    388  * @param stride  distance between vertically adjacent pixels of src.
    389  * @param width   width of active area in src.
    390  * @param height  height of active area in src.
     387 * Write an image plane (width444*height444 pixels) from src into output stream fd.
     388 *
     389 * @param fd         output file stream
     390 * @param src        source image
     391 * @param is16bit    true if input file carries > 8bit data, false otherwise.
     392 * @param stride444  distance between vertically adjacent pixels of src.
     393 * @param width444   width of active area in src.
     394 * @param height444  height of active area in src.
     395 * @param compID       chroma component
     396 * @param srcFormat    chroma format of image
     397 * @param fileFormat   chroma format of file
     398 * @param fileBitDepth component bit depth in file
    391399 * @return true for success, false in case of error
    392400 */
Note: See TracChangeset for help on using the changeset viewer.