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


Ignore:
Timestamp:
21 Jul 2015, 01:21:46 (10 years ago)
Author:
seregin
Message:

port rev 4363

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

Legend:

Unmodified
Added
Removed

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

    r1303 r1307  
    225225      sopDescriptionSEI->m_sopDescVclNaluType[i] = m_pcEncGOP->getNalUnitType(sopCurrPOC, lastIdr, slice->getPic()->isField());
    226226      sopDescriptionSEI->m_sopDescTemporalId[i] = m_pcCfg->getGOPEntry(j).m_temporalId;
    227       sopDescriptionSEI->m_sopDescStRpsIdx[i] = m_pcEncTop->getReferencePictureSetIdxForSOP(slice, sopCurrPOC, j);
     227      sopDescriptionSEI->m_sopDescStRpsIdx[i] = m_pcEncTop->getReferencePictureSetIdxForSOP(sopCurrPOC, j);
    228228      sopDescriptionSEI->m_sopDescPocDelta[i] = deltaPOC;
    229229
    … …  
    416416}
    417417
    418 Void SEIEncoder::initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint, Bool bChromaLocInfoPresent, Int iHorFilterIndex, Int iVerFilterIndex)
     418Void SEIEncoder::initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint, Int iHorFilterIndex, Int iVerFilterIndex)
    419419{
    420420  assert (m_isInitialized);

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h

    r1287 r1307  
    7979  Void initSEITempMotionConstrainedTileSets (SEITempMotionConstrainedTileSets *sei, const TComPPS *pps);
    8080  Void initSEIKneeFunctionInfo(SEIKneeFunctionInfo *sei);
    81   Void initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *sei, Bool bChromaLocInfoPresent, Int iHorFilterIndex, Int iVerFilterIndex);
     81  Void initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *sei, Int iHorFilterIndex, Int iVerFilterIndex);
    8282  Void initSEITimeCode(SEITimeCode *sei);
    8383

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

    r1273 r1307  
    142142    break;
    143143  case SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS:
    144     xWriteSEITempMotionConstrainedTileSets(bs, *static_cast<const SEITempMotionConstrainedTileSets*>(&sei));
     144    xWriteSEITempMotionConstrainedTileSets(*static_cast<const SEITempMotionConstrainedTileSets*>(&sei));
    145145    break;
    146146  case SEI::TIME_CODE:
    … …  
    729729}
    730730
    731 Void SEIWriter::xWriteSEINoDisplay(const SEINoDisplay &sei)
     731Void SEIWriter::xWriteSEINoDisplay(const SEINoDisplay& /*sei*/)
    732732{
    733733}
    … …  
    798798}
    799799
    800 Void SEIWriter::xWriteSEITempMotionConstrainedTileSets(TComBitIf& bs, const SEITempMotionConstrainedTileSets& sei)
     800Void SEIWriter::xWriteSEITempMotionConstrainedTileSets(const SEITempMotionConstrainedTileSets& sei)
    801801{
    802802  //UInt code;

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h

    r1273 r1307  
    8989  Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComSPS *sps);
    9090#endif
    91   Void xWriteSEITempMotionConstrainedTileSets(TComBitIf& bs, const SEITempMotionConstrainedTileSets& sei);
     91  Void xWriteSEITempMotionConstrainedTileSets(const SEITempMotionConstrainedTileSets& sei);
    9292  Void xWriteSEITimeCode(const SEITimeCode& sei);
    9393  Void xWriteSEIChromaSamplingFilterHint(const SEIChromaSamplingFilterHint& sei/*, TComSPS *sps*/);

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

    r1259 r1307  
    106106 * \param binValue bin value
    107107 */
    108 Void TEncBinCABACCounter::encodeBinEP( UInt binValue )
     108Void TEncBinCABACCounter::encodeBinEP( UInt /*binValue*/ )
    109109{
    110110  m_uiBinsCoded += m_binCountIncrement;
    … …  
    118118 * \param numBins number of bins
    119119 */
    120 Void TEncBinCABACCounter::encodeBinsEP( UInt binValues, Int numBins )
     120Void TEncBinCABACCounter::encodeBinsEP( UInt /*binValues*/, Int numBins )
    121121{
    122122  m_uiBinsCoded += numBins & -m_binCountIncrement;

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

    r1291 r1307  
    8282// ====================================================================================================================
    8383
    84 Void TEncCavlc::resetEntropy(const TComSlice *pSlice)
    85 {
    86 }
    87 
    88 
    89 Void TEncCavlc::codeDFFlag(UInt uiCode, const Char *pSymbolName)
    90 {
    91   WRITE_FLAG(uiCode, pSymbolName);
    92 }
    93 Void TEncCavlc::codeDFSvlc(Int iCode, const Char *pSymbolName)
    94 {
    95   WRITE_SVLC(iCode, pSymbolName);
    96 }
     84Void TEncCavlc::resetEntropy(const TComSlice* /*pSlice*/)
     85{
     86}
     87
    9788
    9889Void TEncCavlc::codeShortTermRefPicSet( const TComReferencePictureSet* rps, Bool calledFromSliceHeader, Int idx)
    … …  
    14961487}
    14971488
    1498 Void TEncCavlc::codeTerminatingBit      ( UInt uilsLast )
     1489Void TEncCavlc::codeTerminatingBit      ( UInt /*uilsLast*/ )
    14991490{
    15001491}
    … …  
    15041495}
    15051496
    1506 Void TEncCavlc::codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
     1497Void TEncCavlc::codeMVPIdx ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ )
    15071498{
    15081499  assert(0);
    15091500}
    15101501
    1511 Void TEncCavlc::codePartSize( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
     1502Void TEncCavlc::codePartSize( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ )
    15121503{
    15131504  assert(0);
    15141505}
    15151506
    1516 Void TEncCavlc::codePredMode( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1507Void TEncCavlc::codePredMode( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15171508{
    15181509  assert(0);
    15191510}
    15201511
    1521 Void TEncCavlc::codeMergeFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1512Void TEncCavlc::codeMergeFlag    ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15221513{
    15231514  assert(0);
    15241515}
    15251516
    1526 Void TEncCavlc::codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1517Void TEncCavlc::codeMergeIndex    ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15271518{
    15281519  assert(0);
    15291520}
    15301521
    1531 Void TEncCavlc::codeInterModeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiEncMode )
     1522Void TEncCavlc::codeInterModeFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/, UInt /*uiEncMode*/ )
    15321523{
    15331524  assert(0);
    15341525}
    15351526
    1536 Void TEncCavlc::codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1527Void TEncCavlc::codeCUTransquantBypassFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15371528{
    15381529  assert(0);
    15391530}
    15401531
    1541 Void TEncCavlc::codeSkipFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1532Void TEncCavlc::codeSkipFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15421533{
    15431534  assert(0);
    15441535}
    15451536
    1546 Void TEncCavlc::codeSplitFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
     1537Void TEncCavlc::codeSplitFlag   ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ )
    15471538{
    15481539  assert(0);
    15491540}
    15501541
    1551 Void TEncCavlc::codeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx )
     1542Void TEncCavlc::codeTransformSubdivFlag( UInt /*uiSymbol*/, UInt /*uiCtx*/ )
    15521543{
    15531544  assert(0);
    15541545}
    15551546
    1556 Void TEncCavlc::codeQtCbf( TComTU &rTu, const ComponentID compID, const Bool lowestLevel )
     1547Void TEncCavlc::codeQtCbf( TComTU& /*rTu*/, const ComponentID /*compID*/, const Bool /*lowestLevel*/ )
    15571548{
    15581549  assert(0);
    15591550}
    15601551
    1561 Void TEncCavlc::codeQtRootCbf( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1552Void TEncCavlc::codeQtRootCbf( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15621553{
    15631554  assert(0);
    15641555}
    15651556
    1566 Void TEncCavlc::codeQtCbfZero( TComTU &rTu, const ChannelType chType )
     1557Void TEncCavlc::codeQtCbfZero( TComTU& /*rTu*/, const ChannelType /*chType*/ )
    15671558{
    15681559  assert(0);
    15691560}
    1570 Void TEncCavlc::codeQtRootCbfZero( TComDataCU* pcCU )
     1561Void TEncCavlc::codeQtRootCbfZero( )
    15711562{
    15721563  assert(0);
    15731564}
    15741565
    1575 Void TEncCavlc::codeTransformSkipFlags (TComTU &rTu, ComponentID component )
     1566Void TEncCavlc::codeTransformSkipFlags (TComTU& /*rTu*/, ComponentID /*component*/ )
    15761567{
    15771568  assert(0);
    … …  
    15831574 * \returns Void
    15841575 */
    1585 Void TEncCavlc::codeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1576Void TEncCavlc::codeIPCMInfo( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15861577{
    15871578  assert(0);
    15881579}
    15891580
    1590 Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool isMultiple)
     1581Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, Bool /*isMultiple*/)
    15911582{
    15921583  assert(0);
    15931584}
    15941585
    1595 Void TEncCavlc::codeIntraDirChroma( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1586Void TEncCavlc::codeIntraDirChroma( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    15961587{
    15971588  assert(0);
    15981589}
    15991590
    1600 Void TEncCavlc::codeInterDir( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1591Void TEncCavlc::codeInterDir( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    16011592{
    16021593  assert(0);
    16031594}
    16041595
    1605 Void TEncCavlc::codeRefFrmIdx( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
     1596Void TEncCavlc::codeRefFrmIdx( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ )
    16061597{
    16071598  assert(0);
    16081599}
    16091600
    1610 Void TEncCavlc::codeMvd( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
     1601Void TEncCavlc::codeMvd( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ )
    16111602{
    16121603  assert(0);
    … …  
    16341625}
    16351626
    1636 Void TEncCavlc::codeChromaQpAdjustment( TComDataCU* pcCU, UInt uiAbsPartIdx )
     1627Void TEncCavlc::codeChromaQpAdjustment( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ )
    16371628{
    16381629  assert(0);
    16391630}
    16401631
    1641 Void TEncCavlc::codeCoeffNxN    ( TComTU &rTu, TCoeff* pcCoef, const ComponentID compID )
     1632Void TEncCavlc::codeCoeffNxN    ( TComTU& /*rTu*/, TCoeff* /*pcCoef*/, const ComponentID /*compID*/ )
    16421633{
    16431634  assert(0);
    16441635}
    16451636
    1646 Void TEncCavlc::estBit( estBitsSbacStruct* pcEstBitsCabac, Int width, Int height, ChannelType chType )
     1637Void TEncCavlc::estBit( estBitsSbacStruct* /*pcEstBitsCabac*/, Int /*width*/, Int /*height*/, ChannelType /*chType*/ )
    16471638{
    16481639  // printf("error : no VLC mode support in this version\n");
    … …  
    18221813}
    18231814
    1824 Void TEncCavlc::codeExplicitRdpcmMode( TComTU &rTu, const ComponentID compID )
     1815Void TEncCavlc::codeExplicitRdpcmMode( TComTU& /*rTu*/, const ComponentID /*compID*/ )
    18251816 {
    18261817   assert(0);

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

    r1291 r1307  
    7979
    8080  Void  resetEntropy          (const TComSlice *pSlice);
    81   SliceType determineCabacInitIdx  (const TComSlice *pSlice) { assert(0); return I_SLICE; };
     81  SliceType determineCabacInitIdx  (const TComSlice* /*pSlice*/) { assert(0); return I_SLICE; };
    8282
    8383  Void  setBitstream          ( TComBitIf* p )  { m_pcBitIf = p;  }
    … …  
    101101
    102102  Void codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList );
    103   Void codeSAOBlkParam(SAOBlkParam& saoBlkParam, const BitDepths &bitDepths, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail, Bool onlyEstMergeInfo = false){printf("only supported in CABAC"); assert(0); exit(-1);}
     103  Void codeSAOBlkParam(SAOBlkParam& /*saoBlkParam*/, const BitDepths& /*bitDepths*/, Bool* /*sliceEnabled*/, Bool /*leftMergeAvail*/, Bool /*aboveMergeAvail*/, Bool /*onlyEstMergeInfo*/ = false){printf("only supported in CABAC"); assert(0); exit(-1);}
    104104  Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx );
    105105  Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    … …  
    107107  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    108108
    109   Void codeAlfCtrlFlag   ( ComponentID component, UInt code ) {printf("Not supported\n"); assert(0);}
     109  Void codeAlfCtrlFlag   ( ComponentID /*component*/, UInt /*code*/ ) {printf("Not supported\n"); assert(0);}
    110110  Void codeInterModeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiEncMode );
    111111  Void codeSplitFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    … …  
    120120  Void codeQtRootCbf     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    121121  Void codeQtCbfZero     ( TComTU &rTu, const ChannelType chType );
    122   Void codeQtRootCbfZero ( TComDataCU* pcCU );
     122  Void codeQtRootCbfZero ( );
    123123  Void codeIntraDirLumaAng( TComDataCU* pcCU, UInt absPartIdx, Bool isMultiple);
    124124  Void codeIntraDirChroma( TComDataCU* pcCU, UInt uiAbsPartIdx );
    … …  
    141141  Void codeScalingList  ( const TComScalingList &scalingList );
    142142  Void xCodeScalingList ( const TComScalingList* scalingList, UInt sizeId, UInt listId);
    143   Void codeDFFlag       ( UInt uiCode, const Char *pSymbolName );
    144   Void codeDFSvlc       ( Int   iCode, const Char *pSymbolName );
    145143
    146144  Void codeExplicitRdpcmMode( TComTU &rTu, const ComponentID compID );

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

    r1290 r1307  
    969969  rpcBestCU->copyToPic(uiDepth);                                                     // Copy Best data to Picture for next partition prediction.
    970970
    971   xCopyYuv2Pic( rpcBestCU->getPic(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu(), uiDepth, uiDepth, rpcBestCU, uiLPelX, uiTPelY );   // Copy Yuv data to picture Yuv
     971  xCopyYuv2Pic( rpcBestCU->getPic(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu(), uiDepth, uiDepth );   // Copy Yuv data to picture Yuv
    972972  if (bBoundary)
    973973  {
    … …  
    988988 * \returns Void
    989989 */
    990 Void TEncCu::finishCU( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
     990Void TEncCu::finishCU( TComDataCU* pcCU, UInt uiAbsPartIdx )
    991991{
    992992  TComPic* pcPic = pcCU->getPic();
    … …  
    11351135  {
    11361136    m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx );
    1137     finishCU(pcCU,uiAbsPartIdx,uiDepth);
     1137    finishCU(pcCU,uiAbsPartIdx);
    11381138    return;
    11391139  }
    … …  
    11491149    {
    11501150      // Encode slice finish
    1151       finishCU(pcCU,uiAbsPartIdx,uiDepth);
     1151      finishCU(pcCU,uiAbsPartIdx);
    11521152      return;
    11531153    }
    … …  
    11651165
    11661166  // --- write terminating bit ---
    1167   finishCU(pcCU,uiAbsPartIdx,uiDepth);
     1167  finishCU(pcCU,uiAbsPartIdx);
    11681168}
    11691169
    … …  
    16751675  }
    16761676}
    1677 Void TEncCu::xCopyYuv2Pic(TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth, TComDataCU* pcCU, UInt uiLPelX, UInt uiTPelY )
     1677Void TEncCu::xCopyYuv2Pic(TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth )
    16781678{
    16791679  UInt uiAbsPartIdxInRaster = g_auiZscanToRaster[uiAbsPartIdx];

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

    r1259 r1307  
    123123
    124124protected:
    125   Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx,           UInt uiDepth        );
     125  Void  finishCU            ( TComDataCU*  pcCU, UInt uiAbsPartIdx );
    126126#if AMP_ENC_SPEEDUP
    127127  Void  xCompressCU         ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth DEBUG_STRING_FN_DECLARE(sDebug), PartSize eParentPartSize = NUMBER_OF_PART_SIZES );
    … …  
    156156  Void  xCheckIntraPCM      ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU                      );
    157157  Void  xCopyAMVPInfo       ( AMVPInfo* pSrc, AMVPInfo* pDst );
    158   Void  xCopyYuv2Pic        (TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth, TComDataCU* pcCU, UInt uiLPelX, UInt uiTPelY );
     158  Void  xCopyYuv2Pic        (TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth );
    159159  Void  xCopyYuv2Tmp        ( UInt uhPartUnitIdx, UInt uiDepth );
    160160

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

    r1291 r1307  
    588588}
    589589
    590 Void TEncEntropy::encodeQtRootCbfZero( TComDataCU* pcCU )
    591 {
    592   m_pcEntropyCoderIf->codeQtRootCbfZero( pcCU );
     590Void TEncEntropy::encodeQtRootCbfZero( )
     591{
     592  m_pcEntropyCoderIf->codeQtRootCbfZero( );
    593593}
    594594

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

    r1291 r1307  
    9999  virtual Void codeQtRootCbf     ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    100100  virtual Void codeQtCbfZero     ( TComTU &rTu, const ChannelType chType ) = 0;
    101   virtual Void codeQtRootCbfZero ( TComDataCU* pcCU ) = 0;
     101  virtual Void codeQtRootCbfZero ( ) = 0;
    102102  virtual Void codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool isMultiplePU ) = 0;
    103103
    … …  
    115115  virtual Void codeSAOBlkParam   (SAOBlkParam& saoBlkParam, const BitDepths &bitDepths, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail, Bool onlyEstMergeInfo = false)    =0;
    116116  virtual Void estBit               (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType) = 0;
    117 
    118   virtual Void codeDFFlag (UInt uiCode, const Char *pSymbolName) = 0;
    119   virtual Void codeDFSvlc (Int iCode, const Char *pSymbolName)   = 0;
    120117
    121118  virtual Void codeExplicitRdpcmMode ( TComTU &rTu, const ComponentID compID ) = 0;
    … …  
    176173
    177174  Void encodeQtCbfZero         ( TComTU &rTu, const ChannelType chType );
    178   Void encodeQtRootCbfZero     ( TComDataCU* pcCU );
     175  Void encodeQtRootCbfZero     ( );
    179176  Void encodeQtRootCbf         ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    180177  Void encodeQP                ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );

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

    r1306 r1307  
    904904  {
    905905    SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint = new SEIChromaSamplingFilterHint;
    906     m_seiEncoder.initSEIChromaSamplingFilterHint(seiChromaSamplingFilterHint, m_pcCfg->getChromaLocInfoPresentFlag(), m_pcCfg->getChromaSamplingHorFilterIdc(), m_pcCfg->getChromaSamplingVerFilterIdc());
     906    m_seiEncoder.initSEIChromaSamplingFilterHint(seiChromaSamplingFilterHint, m_pcCfg->getChromaSamplingHorFilterIdc(), m_pcCfg->getChromaSamplingVerFilterIdc());
    907907    seiMessages.push_back(seiChromaSamplingFilterHint);
    908908  }
    … …  
    974974}
    975975
    976 Void TEncGOP::xCreatePictureTimingSEI  (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, AccessUnit &accessUnit, TComSlice *slice, Bool isField, std::deque<DUData> &duData)
     976Void TEncGOP::xCreatePictureTimingSEI  (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, TComSlice *slice, Bool isField, std::deque<DUData> &duData)
    977977{
    978978  Int picSptDpbOutputDuDelay = 0;
    … …  
    15001500  AccessUnit::iterator  itLocationToPushSliceHeaderNALU; // used to store location where NALU containing slice header is to be inserted
    15011501
    1502   xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut, isField );
     1502  xInitGOP( iPOCLast, iNumPicRcvd, isField );
    15031503
    15041504  m_iNumPicCoded = 0;
    … …  
    15941594    m_pcSliceEncoder->setSliceIdx(0);
    15951595    pcPic->setCurrSliceIdx(0);
     1596
    15961597#if SVC_EXTENSION
    15971598    pcPic->setLayerId( m_layerId );
    15981599#endif
    1599     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, isField );
     1600
     1601    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iGOPid, pcSlice, isField );
    16001602
    16011603    //Set Frame/Field coding
    … …  
    28422844
    28432845#if EFFICIENT_FIELD_IRAP
    2844     xCreatePictureTimingSEI(effFieldIRAPMap.GetIRAPGOPid(), leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, accessUnit, pcSlice, isField, duData);
    2845 #else
    2846     xCreatePictureTimingSEI(0, leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, accessUnit, pcSlice, isField, duData);
     2846    xCreatePictureTimingSEI(effFieldIRAPMap.GetIRAPGOPid(), leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, pcSlice, isField, duData);
     2847#else
     2848    xCreatePictureTimingSEI(0, leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, pcSlice, isField, duData);
    28472849#endif
    28482850    if (m_pcCfg->getScalableNestingSEIEnabled())
    … …  
    29922994
    29932995
    2994 Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Bool isField )
     2996Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, Bool isField )
    29952997{
    29962998  assert( iNumPicRcvd > 0 );
    … …  
    31763178      if( (pcPic->isTopField() && isFieldTopFieldFirst) || (!pcPic->isTopField() && !isFieldTopFieldFirst))
    31773179      {
    3178         xCalculateInterlacedAddPSNR(pcPic, correspondingFieldPic, pcPic->getPicYuvRec(), correspondingFieldPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
     3180        xCalculateInterlacedAddPSNR(pcPic, correspondingFieldPic, pcPic->getPicYuvRec(), correspondingFieldPic->getPicYuvRec(), snr_conversion, printFrameMSE );
    31793181      }
    31803182      else
    31813183      {
    3182         xCalculateInterlacedAddPSNR(correspondingFieldPic, pcPic, correspondingFieldPic->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
     3184        xCalculateInterlacedAddPSNR(correspondingFieldPic, pcPic, correspondingFieldPic->getPicYuvRec(), pcPic->getPicYuvRec(), snr_conversion, printFrameMSE );
    31833185      }
    31843186    }
    … …  
    31993201  {
    32003202    cscd.create(pcPicD->getWidth(COMPONENT_Y), pcPicD->getHeight(COMPONENT_Y), pcPicD->getChromaFormat(), pcPicD->getWidth(COMPONENT_Y), pcPicD->getHeight(COMPONENT_Y), 0, false);
    3201 #if SVC_EXTENSION
    3202     TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, pcPic->getSlice(0)->getBitDepths().recon, false);
    3203 #else
    3204     TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, pcPic->getPicSym()->getSPS().getBitDepths().recon, false);
    3205 #endif
     3203    TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, false);
    32063204  }
    32073205  TComPicYuv &picd=(conversion==IPCOLOURSPACE_UNCHANGED)?*pcPicD : cscd;
    … …  
    33843382Void TEncGOP::xCalculateInterlacedAddPSNR( TComPic* pcPicOrgFirstField, TComPic* pcPicOrgSecondField,
    33853383                                           TComPicYuv* pcPicRecFirstField, TComPicYuv* pcPicRecSecondField,
    3386                                            const AccessUnit& accessUnit, Double dEncTime, const InputColourSpaceConversion conversion, const Bool printFrameMSE )
     3384                                           const InputColourSpaceConversion conversion, const Bool printFrameMSE )
    33873385{
    33883386#if !SVC_EXTENSION
    … …  
    34053403      TComPicYuv &reconField=*(apcPicRecFields[fieldNum]);
    34063404      cscd[fieldNum].create(reconField.getWidth(COMPONENT_Y), reconField.getHeight(COMPONENT_Y), reconField.getChromaFormat(), reconField.getWidth(COMPONENT_Y), reconField.getHeight(COMPONENT_Y), 0, false);
    3407 #if SVC_EXTENSION
    3408       TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, pcPicOrgFirstField->getSlice(0)->getBitDepths().recon, false);
    3409 #else
    3410       TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, sps.getBitDepths().recon, false);
    3411 #endif
     3405      TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, false);
    34123406      apcPicRecFields[fieldNum]=cscd+fieldNum;
    34133407    }

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

    r1292 r1307  
    199199
    200200  TComList<TComPic*>*   getListPic()      { return m_pcListPic; }
    201  
     201
    202202  Void  printOutSummary      ( UInt uiNumAllPicCoded, Bool isField, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths );
    203203  Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist );
    … …  
    228228protected:
    229229
    230   Void  xInitGOP          ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Bool isField );
     230  Void  xInitGOP          ( Int iPOCLast, Int iNumPicRcvd, Bool isField );
    231231  Void  xGetBuffer        ( TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr, Bool isField );
    232232
    … …  
    235235  Void  xCalculateInterlacedAddPSNR( TComPic* pcPicOrgFirstField, TComPic* pcPicOrgSecondField,
    236236                                     TComPicYuv* pcPicRecFirstField, TComPicYuv* pcPicRecSecondField,
    237                                      const AccessUnit& accessUnit, Double dEncTime, const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE );
     237                                     const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE );
    238238
    239239  UInt64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths);
    … …  
    243243  Void xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TComSPS *sps, const TComPPS *pps);
    244244  Void xCreatePerPictureSEIMessages (Int picInGOP, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, TComSlice *slice);
    245   Void xCreatePictureTimingSEI  (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, AccessUnit &accessUnit, TComSlice *slice, Bool isField, std::deque<DUData> &duData);
     245  Void xCreatePictureTimingSEI  (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, TComSlice *slice, Bool isField, std::deque<DUData> &duData);
    246246  Void xUpdateDuData(AccessUnit &testAU, std::deque<DUData> &duData);
    247247  Void xUpdateTimingSEI(SEIPictureTiming *pictureTimingSEI, std::deque<DUData> &duData, const TComSPS *sps);

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

    r1291 r1307  
    354354#endif
    355355                , srcBlk, orgBlk, srcStride, orgStride, (width  >> componentScaleX), (height >> componentScaleY)
    356                 , isLeftAvail,  isRightAvail, isAboveAvail, isBelowAvail, isAboveLeftAvail, isAboveRightAvail, isBelowLeftAvail, isBelowRightAvail
     356                , isLeftAvail,  isRightAvail, isAboveAvail, isBelowAvail, isAboveLeftAvail, isAboveRightAvail
    357357#if SAO_ENCODE_ALLOW_USE_PREDEBLOCK
    358358                , isCalculatePreDeblockSamples
    … …  
    442442
    443443
    444 inline Int TEncSampleAdaptiveOffset::estIterOffset(Int typeIdx, Int classIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh )
     444inline Int TEncSampleAdaptiveOffset::estIterOffset(Int typeIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh )
    445445{
    446446  Int iterOffset, tempOffset;
    … …  
    535535          if( quantOffsets[classIdx] != 0 ) //iterative adjustment only when derived offset is not zero
    536536          {
    537             quantOffsets[classIdx] = estIterOffset( typeIdc, classIdx, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], classDist , classCost , offsetTh );
     537            quantOffsets[classIdx] = estIterOffset( typeIdc, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], classDist , classCost , offsetTh );
    538538          }
    539539        }
    … …  
    552552          if( quantOffsets[classIdx] != 0 ) //iterative adjustment only when derived offset is not zero
    553553          {
    554             quantOffsets[classIdx] = estIterOffset( typeIdc, classIdx, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], distBOClasses[classIdx], costBOClasses[classIdx], offsetTh );
     554            quantOffsets[classIdx] = estIterOffset( typeIdc, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], distBOClasses[classIdx], costBOClasses[classIdx], offsetTh );
    555555          }
    556556        }
    … …  
    933933Void TEncSampleAdaptiveOffset::getBlkStats(const ComponentID compIdx, const Int channelBitDepth, SAOStatData* statsDataTypes
    934934                        , Pel* srcBlk, Pel* orgBlk, Int srcStride, Int orgStride, Int width, Int height
    935                         , Bool isLeftAvail,  Bool isRightAvail, Bool isAboveAvail, Bool isBelowAvail, Bool isAboveLeftAvail, Bool isAboveRightAvail, Bool isBelowLeftAvail, Bool isBelowRightAvail
     935                        , Bool isLeftAvail,  Bool isRightAvail, Bool isAboveAvail, Bool isBelowAvail, Bool isAboveLeftAvail, Bool isAboveRightAvail
    936936#if SAO_ENCODE_ALLOW_USE_PREDEBLOCK
    937937                        , Bool isCalculatePreDeblockSamples

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

    r1287 r1307  
    126126  Void decidePicParams(Bool* sliceEnabled, Int picTempLayer);
    127127  Void decideBlkParams(TComPic* pic, Bool* sliceEnabled, SAOStatData*** blkStats, TComPicYuv* srcYuv, TComPicYuv* resYuv, SAOBlkParam* reconParams, SAOBlkParam* codedParams);
    128   Void getBlkStats(const ComponentID compIdx, const Int channelBitDepth, SAOStatData* statsDataTypes, Pel* srcBlk, Pel* orgBlk, Int srcStride, Int orgStride, Int width, Int height, Bool isLeftAvail,  Bool isRightAvail, Bool isAboveAvail, Bool isBelowAvail, Bool isAboveLeftAvail, Bool isAboveRightAvail, Bool isBelowLeftAvail, Bool isBelowRightAvail
     128  Void getBlkStats(const ComponentID compIdx, const Int channelBitDepth, SAOStatData* statsDataTypes, Pel* srcBlk, Pel* orgBlk, Int srcStride, Int orgStride, Int width, Int height, Bool isLeftAvail,  Bool isRightAvail, Bool isAboveAvail, Bool isBelowAvail, Bool isAboveLeftAvail, Bool isAboveRightAvail
    129129#if SAO_ENCODE_ALLOW_USE_PREDEBLOCK
    130130                  , Bool isCalculatePreDeblockSamples
    … …  
    136136  Void deriveOffsets(ComponentID compIdx, const Int channelBitDepth, Int typeIdc, SAOStatData& statData, Int* quantOffsets, Int& typeAuxInfo);
    137137  inline Int64 estSaoDist(Int64 count, Int64 offset, Int64 diffSum, Int shift);
    138   inline Int estIterOffset(Int typeIdx, Int classIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh );
     138  inline Int estIterOffset(Int typeIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh );
    139139#if SAO_ENCODE_ALLOW_USE_PREDEBLOCK
    140140  Void addPreDBFStatistics(SAOStatData*** blkStats);

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

    r1305 r1307  
    221221}
    222222
    223 Void TEncSbac::codeVPS( const TComVPS* pcVPS )
     223Void TEncSbac::codeVPS( const TComVPS* /*pcVPS*/ )
    224224{
    225225  assert (0);
    … …  
    227227}
    228228
    229 Void TEncSbac::codeSPS( const TComSPS* pcSPS )
     229Void TEncSbac::codeSPS( const TComSPS* /*pcSPS*/ )
    230230{
    231231  assert (0);
    … …  
    234234
    235235#if CGS_3D_ASYMLUT
    236 Void TEncSbac::codePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT )
     236Void TEncSbac::codePPS( const TComPPS* /*pcPPS*/, TEnc3DAsymLUT * pc3DAsymLUT )
    237237#else
    238 Void TEncSbac::codePPS( const TComPPS* pcPPS )
     238Void TEncSbac::codePPS( const TComPPS* /*pcPPS*/ )
    239239#endif
    240240{
    … …  
    243243}
    244244
    245 Void TEncSbac::codeSliceHeader( TComSlice* pcSlice )
     245Void TEncSbac::codeSliceHeader( TComSlice* /*pcSlice*/ )
    246246{
    247247  assert (0);
    … …  
    249249}
    250250
    251 Void TEncSbac::codeTilesWPPEntryPoint( TComSlice* pSlice )
     251Void TEncSbac::codeTilesWPPEntryPoint( TComSlice* /*pSlice*/ )
    252252{
    253253  assert (0);
    … …  
    11031103}
    11041104
    1105 Void TEncSbac::codeQtRootCbfZero( TComDataCU* pcCU )
     1105Void TEncSbac::codeQtRootCbfZero( )
    11061106{
    11071107  // this function is only used to estimate the bits when cbf is 0

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

    r1305 r1307  
    124124  Void  xCopyContextsFrom    ( const TEncSbac* pSrc );
    125125
    126   Void codeDFFlag( UInt /*uiCode*/, const Char* /*pSymbolName*/ )       {printf("Not supported in codeDFFlag()\n"); assert(0); exit(1);};
    127   Void codeDFSvlc( Int /*iCode*/, const Char* /*pSymbolName*/ )         {printf("Not supported in codeDFSvlc()\n"); assert(0); exit(1);};
    128 
    129126protected:
    130127  TComBitIf*    m_pcBitIf;
    … …  
    148145  Void codeQtRootCbf           ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    149146  Void codeQtCbfZero           ( TComTU &rTu, const ChannelType chType );
    150   Void codeQtRootCbfZero       ( TComDataCU* pcCU );
     147  Void codeQtRootCbfZero       ( );
    151148  Void codeIntraDirLumaAng     ( TComDataCU* pcCU, UInt absPartIdx, Bool isMultiple);
    152149

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

    r1290 r1307  
    11731173#endif
    11741174  {
    1175     const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, pcCU->getSlice()->getSPS()->getDisableIntraReferenceSmoothing());
     1175    const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, sps.getDisableIntraReferenceSmoothing());
    11761176
    11771177    initAdiPatternChType( rTu, bAboveAvail, bLeftAvail, compID, bUseFilteredPredictions DEBUG_STRING_PASS_INTO(sDebug) );
    … …  
    23332333
    23342334        // NB xModeBitsIntra will not affect the mode for chroma that may have already been pre-estimated.
    2335         iModeBits+=xModeBitsIntra( pcCU, uiMode, uiPartOffset, uiDepth, uiInitTrDepth, CHANNEL_TYPE_LUMA );
     2335        iModeBits+=xModeBitsIntra( pcCU, uiMode, uiPartOffset, uiDepth, CHANNEL_TYPE_LUMA );
    23362336
    23372337        Double cost      = (Double)uiSad + (Double)iModeBits * sqrtLambdaForFirstPass;
    … …  
    36233623    if(pcCU->getSlice()->getMvdL1ZeroFlag() && eRefPicList==REF_PIC_LIST_1)
    36243624    {
    3625       (*puiDistBiP) = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, rcMvPred, 0, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight);
     3625      (*puiDistBiP) = xGetTemplateCost( pcCU, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, rcMvPred, 0, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight);
    36263626    }
    36273627    return;
    … …  
    36403640  {
    36413641    Distortion uiTmpCost;
    3642     uiTmpCost = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, pcAMVPInfo->m_acMvCand[i], i, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight);
     3642    uiTmpCost = xGetTemplateCost( pcCU, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, pcAMVPInfo->m_acMvCand[i], i, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight);
    36433643    if ( uiBestCost > uiTmpCost )
    36443644    {
    … …  
    37983798
    37993799Distortion TEncSearch::xGetTemplateCost( TComDataCU* pcCU,
    3800                                          UInt        uiPartIdx,
    38013800                                         UInt        uiPartAddr,
    38023801                                         TComYuv*    pcOrgYuv,
    … …  
    39733972  else    //non ILR reference pic
    39743973#endif
    3975   xPatternSearchFracDIF( bIsLosslessCoded, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost ,bBi );
     3974  xPatternSearchFracDIF( bIsLosslessCoded, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost ); 
    39763975
    39773976  m_pcRdCost->setCostScale( 0 );
    … …  
    44724471                                       TComMv&      rcMvHalf,
    44734472                                       TComMv&      rcMvQter,
    4474                                        Distortion&  ruiCost,
    4475                                        Bool         biPred
     4473                                       Distortion&  ruiCost
    44764474                                      )
    44774475{
    … …  
    44864484
    44874485  //  Half-pel refinement
    4488   xExtDIFUpSamplingH ( &cPatternRoi, biPred );
     4486  xExtDIFUpSamplingH ( &cPatternRoi );
    44894487
    44904488  rcMvHalf = *pcMvInt;   rcMvHalf <<= 1;    // for mv-cost
    … …  
    44944492  m_pcRdCost->setCostScale( 0 );
    44954493
    4496   xExtDIFUpSamplingQ ( &cPatternRoi, rcMvHalf, biPred );
     4494  xExtDIFUpSamplingQ ( &cPatternRoi, rcMvHalf );
    44974495  baseRefMv = rcMvHalf;
    44984496  baseRefMv <<= 1;
    … …  
    45934591
    45944592  m_pcEntropyCoder->resetBits();
    4595   m_pcEntropyCoder->encodeQtRootCbfZero( pcCU );
     4593  m_pcEntropyCoder->encodeQtRootCbfZero( );
    45964594  const UInt   zeroResiBits = m_pcEntropyCoder->getNumberOfWrittenBits();
    45974595  const Double zeroCost     = (pcCU->isLosslessCoded( 0 )) ? (nonZeroCost+1) : (m_pcRdCost->calcRdCost( zeroResiBits, zeroDistortion ));
    … …  
    46264624
    46274625  UInt finalBits = 0;
    4628   xAddSymbolBitsInter( pcCU, 0, 0, finalBits );
     4626  xAddSymbolBitsInter( pcCU, finalBits );
    46294627  // we've now encoded the pcCU, and so have a valid bit cost
    46304628
    … …  
    54585456
    54595457
    5460 UInt TEncSearch::xModeBitsIntra( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, UInt uiInitTrDepth, const ChannelType chType )
     5458UInt TEncSearch::xModeBitsIntra( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, const ChannelType chType )
    54615459{
    54625460  // Reload only contexts required for coding intra mode information
    … …  
    55265524 * \returns Void
    55275525 */
    5528 Void  TEncSearch::xAddSymbolBitsInter( TComDataCU* pcCU, UInt uiQp, UInt uiTrMode, UInt& ruiBits )
     5526Void  TEncSearch::xAddSymbolBitsInter( TComDataCU* pcCU, UInt& ruiBits )
    55295527{
    55305528  if(pcCU->getMergeFlag( 0 ) && pcCU->getPartitionSize( 0 ) == SIZE_2Nx2N && !pcCU->getQtRootCbf( 0 ))
    … …  
    55745572 * \param biPred    Flag indicating whether block is for biprediction
    55755573 */
    5576 Void TEncSearch::xExtDIFUpSamplingH( TComPattern* pattern, Bool biPred )
     5574Void TEncSearch::xExtDIFUpSamplingH( TComPattern* pattern )
    55775575{
    55785576  Int width      = pattern->getROIYWidth();
    … …  
    56215619 * \param biPred     Flag indicating whether block is for biprediction
    56225620 */
    5623 Void TEncSearch::xExtDIFUpSamplingQ( TComPattern* pattern, TComMv halfPelRef, Bool biPred )
     5621Void TEncSearch::xExtDIFUpSamplingQ( TComPattern* pattern, TComMv halfPelRef )
    56245622{
    56255623  Int width      = pattern->getROIYWidth();

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

    r1290 r1307  
    341341
    342342  Distortion xGetTemplateCost    ( TComDataCU*  pcCU,
    343                                     UInt        uiPartIdx,
    344343                                    UInt        uiPartAddr,
    345344                                    TComYuv*    pcOrgYuv,
    … …  
    448447                                    TComMv&      rcMvHalf,
    449448                                    TComMv&      rcMvQter,
    450                                     Distortion&  ruiCost,
    451                                     Bool         biPred
     449                                    Distortion&  ruiCost
    452450                                   );
    453451
    454   Void xExtDIFUpSamplingH( TComPattern* pcPattern, Bool biPred );
    455   Void xExtDIFUpSamplingQ( TComPattern* pcPatternKey, TComMv halfPelRef, Bool biPred );
     452  Void xExtDIFUpSamplingH( TComPattern* pcPattern );
     453  Void xExtDIFUpSamplingQ( TComPattern* pcPatternKey, TComMv halfPelRef );
    456454
    457455  // -------------------------------------------------------------------------------------------------------------------
    … …  
    464462  Void xSetInterResidualQTData( TComYuv* pcResi, Bool bSpatial, TComTU &rTu  );
    465463
    466   UInt  xModeBitsIntra ( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, UInt uiInitTrDepth, const ChannelType compID );
     464  UInt  xModeBitsIntra ( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, const ChannelType compID );
    467465  UInt  xUpdateCandList( UInt uiMode, Double uiCost, UInt uiFastCandNum, UInt * CandModeList, Double * CandCostList );
    468466
    … …  
    472470
    473471  Void xAddSymbolBitsInter       ( TComDataCU*   pcCU,
    474                                    UInt          uiQp,
    475                                    UInt          uiTrMode,
    476472                                   UInt&         ruiBits);
    477473

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

    r1305 r1307  
    236236 */
    237237
    238 Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, Bool isField )
     238Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iGOPid, TComSlice*& rpcSlice, Bool isField )
    239239{
    240240  Double dQP;
    … …  
    12421242
    12431243Void TEncSlice::calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary,
    1244                                                    TComPic* pcPic, const Int sliceMode, const Int sliceArgument, const UInt sliceCurEndCtuTSAddr)
     1244                                                   TComPic* pcPic, const Int sliceMode, const Int sliceArgument)
    12451245{
    12461246  TComSlice* pcSlice = pcPic->getSlice(getSliceIdx());
    … …  
    13431343  UInt boundingCtuTsAddrSlice;
    13441344  calculateBoundingCtuTsAddrForSlice(startCtuTsAddrSlice, boundingCtuTsAddrSlice, haveReachedTileBoundarySlice, pcPic,
    1345                                      m_pcCfg->getSliceMode(), m_pcCfg->getSliceArgument(), pcSlice->getSliceCurEndCtuTsAddr());
     1345                                     m_pcCfg->getSliceMode(), m_pcCfg->getSliceArgument());
    13461346  pcSlice->setSliceCurEndCtuTsAddr(   boundingCtuTsAddrSlice );
    13471347  pcSlice->setSliceCurStartCtuTsAddr( startCtuTsAddrSlice    );
    … …  
    13521352  UInt boundingCtuTsAddrSliceSegment;
    13531353  calculateBoundingCtuTsAddrForSlice(startCtuTsAddrSliceSegment, boundingCtuTsAddrSliceSegment, haveReachedTileBoundarySliceSegment, pcPic,
    1354                                      m_pcCfg->getSliceSegmentMode(), m_pcCfg->getSliceSegmentArgument(), pcSlice->getSliceSegmentCurEndCtuTsAddr());
     1354                                     m_pcCfg->getSliceSegmentMode(), m_pcCfg->getSliceSegmentArgument());
    13551355  if (boundingCtuTsAddrSliceSegment>boundingCtuTsAddrSlice)
    13561356  {

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

    r1291 r1307  
    105105  Void     setUpLambda(TComSlice* slice, const Double dLambda, Int iQP);
    106106#endif
    107   Void     calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary, TComPic* pcPic, const Int sliceMode, const Int sliceArgument, const UInt uiSliceCurEndCtuTSAddr);
     107  Void     calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary, TComPic* pcPic, const Int sliceMode, const Int sliceArgument);
    108108
    109109#if SVC_EXTENSION
    … …  
    120120
    121121  /// preparation of slice encoding (reference marking, QP and lambda)
    122   Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
     122  Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr,
    123123                                Int iGOPid,   TComSlice*& rpcSlice, Bool isField );
    124124  Void    resetQP             ( TComPic* pic, Int sliceQP, Double lambda );

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

    r1298 r1307  
    286286  {
    287287#if SVC_EXTENSION
    288     getTrQuant()->setFlatScalingList( m_cVPS.getChromaFormatIdc(&m_cSPS, m_layerId), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
     288    getTrQuant()->setFlatScalingList( maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
    289289#else
    290     getTrQuant()->setFlatScalingList(m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths());
     290    getTrQuant()->setFlatScalingList(maxLog2TrDynamicRange, m_cSPS.getBitDepths());
    291291#endif
    292292    getTrQuant()->setUseScalingList(false);
    … …  
    308308
    309309      // infer the scaling list from the reference layer
    310       getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
     310      getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
    311311    }
    312312    else
    … …  
    317317    m_cPPS.setScalingListPresentFlag(false);
    318318
    319     getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths());
     319#if SVC_EXTENSION
     320    getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId));
     321#else
     322    getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cSPS.getBitDepths());
     323#endif
    320324#if SVC_EXTENSION
    321325    }
    … …  
    337341
    338342      // infer the scaling list from the reference layer
    339       getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
     343      getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) );
    340344    }
    341345    else
    … …  
    352356    m_cSPS.setScalingListPresentFlag(m_cSPS.getScalingList().checkDefaultScalingList());
    353357    m_cPPS.setScalingListPresentFlag(false);
    354     getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths());
     358    getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cSPS.getBitDepths());
    355359#if SVC_EXTENSION
    356360    }
    … …  
    13881392}
    13891393
    1390 Int TEncTop::getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid )
     1394Int TEncTop::getReferencePictureSetIdxForSOP(Int POCCurr, Int GOPid )
    13911395{
    13921396  Int rpsIdx = GOPid;

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

    r1292 r1307  
    189189  TEncRateCtrl*           getRateCtrl           () { return &m_cRateCtrl;             }
    190190  Void selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid );
    191   Int getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid );
     191  Int getReferencePictureSetIdxForSOP(Int POCCurr, Int GOPid );
    192192  // -------------------------------------------------------------------------------------------------------------------
    193193  // encoder function
    … …  
    285285
    286286  Void printSummary(Bool isField) { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded, isField, m_printMSEBasedSequencePSNR, m_printSequenceMSE, m_cSPS.getBitDepths()); }
     287
    287288};
    288289
Note: See TracChangeset for help on using the changeset viewer.