Index: /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp (revision 1307) @@ -740,5 +740,5 @@ // -------------------------------------------------------------------------------------------------------------------- -Void TComDataCU::copySubCU( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) +Void TComDataCU::copySubCU( TComDataCU* pcCU, UInt uiAbsPartIdx ) { UInt uiPart = uiAbsPartIdx; Index: /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h (revision 1307) @@ -194,5 +194,5 @@ Void setOutsideCUPart ( UInt uiAbsPartIdx, UInt uiDepth ); - Void copySubCU ( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth ); + Void copySubCU ( TComDataCU* pcCU, UInt uiPartUnitIdx ); Void copyInterPredInfoFrom ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefPicList ); Void copyPartFrom ( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth ); Index: /branches/SHM-dev/source/Lib/TLibCommon/TComPattern.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComPattern.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComPattern.cpp (revision 1307) @@ -49,12 +49,19 @@ /// padding of unavailable reference samples for intra prediction -#if O0043_BEST_EFFORT_DECODING -Void fillReferenceSamples( const Int bitDepth, const Int bitDepthDelta, TComDataCU* pcCU, const Pel* piRoiOrigin, Pel* piAdiTemp, const Bool* bNeighborFlags, -#else -Void fillReferenceSamples( const Int bitDepth, TComDataCU* pcCU, const Pel* piRoiOrigin, Pel* piAdiTemp, const Bool* bNeighborFlags, -#endif - const Int iNumIntraNeighbor, const Int unitWidth, const Int unitHeight, const Int iAboveUnits, const Int iLeftUnits, - const UInt uiCuWidth, const UInt uiCuHeight, const UInt uiWidth, const UInt uiHeight, const Int iPicStride, - const ChannelType chType, const ChromaFormat chFmt ); +Void fillReferenceSamples( const Int bitDepth, +#if O0043_BEST_EFFORT_DECODING + const Int bitDepthDelta, +#endif + const Pel* piRoiOrigin, + Pel* piAdiTemp, + const Bool* bNeighborFlags, + const Int iNumIntraNeighbor, + const Int unitWidth, + const Int unitHeight, + const Int iAboveUnits, + const Int iLeftUnits, + const UInt uiWidth, + const UInt uiHeight, + const Int iPicStride ); /// constrained intra prediction @@ -152,5 +159,4 @@ bLeft = true; - const ChromaFormat chFmt = rTu.GetChromaFormat(); const UInt uiROIWidth = uiTuWidth2+1; const UInt uiROIHeight = uiTuHeight2+1; @@ -167,9 +173,10 @@ #if O0043_BEST_EFFORT_DECODING const Int bitDepthForChannelInStream = sps.getStreamBitDepth(chType); - fillReferenceSamples (bitDepthForChannelInStream, bitDepthForChannelInStream - bitDepthForChannel, pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, + fillReferenceSamples (bitDepthForChannelInStream, bitDepthForChannelInStream - bitDepthForChannel, #else - fillReferenceSamples (bitDepthForChannel, pcCU, piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, -#endif - uiTuWidth, uiTuHeight, uiROIWidth, uiROIHeight, iPicStride, toChannelType(compID), chFmt); + fillReferenceSamples (bitDepthForChannel, +#endif + piRoiOrigin, piAdiTemp, bNeighborFlags, iNumIntraNeighbor, iUnitWidth, iUnitHeight, iAboveUnits, iLeftUnits, + uiROIWidth, uiROIHeight, iPicStride); @@ -320,12 +327,19 @@ } -#if O0043_BEST_EFFORT_DECODING -Void fillReferenceSamples( const Int bitDepth, const Int bitDepthDelta, TComDataCU* pcCU, const Pel* piRoiOrigin, Pel* piAdiTemp, const Bool* bNeighborFlags, -#else -Void fillReferenceSamples( const Int bitDepth, TComDataCU* pcCU, const Pel* piRoiOrigin, Pel* piAdiTemp, const Bool* bNeighborFlags, -#endif - const Int iNumIntraNeighbor, const Int unitWidth, const Int unitHeight, const Int iAboveUnits, const Int iLeftUnits, - const UInt uiCuWidth, const UInt uiCuHeight, const UInt uiWidth, const UInt uiHeight, const Int iPicStride, - const ChannelType chType, const ChromaFormat chFmt ) +Void fillReferenceSamples( const Int bitDepth, +#if O0043_BEST_EFFORT_DECODING + const Int bitDepthDelta, +#endif + const Pel* piRoiOrigin, + Pel* piAdiTemp, + const Bool* bNeighborFlags, + const Int iNumIntraNeighbor, + const Int unitWidth, + const Int unitHeight, + const Int iAboveUnits, + const Int iLeftUnits, + const UInt uiWidth, + const UInt uiHeight, + const Int iPicStride ) { const Pel* piRoiTemp; Index: /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp (revision 1307) @@ -181,5 +181,5 @@ // Function for calculating DC value of the reference samples used in Intra prediction //NOTE: Bit-Limit - 25-bit source -Pel TComPrediction::predIntraGetPredValDC( const Pel* pSrc, Int iSrcStride, UInt iWidth, UInt iHeight, ChannelType channelType, ChromaFormat format, Bool bAbove, Bool bLeft ) +Pel TComPrediction::predIntraGetPredValDC( const Pel* pSrc, Int iSrcStride, UInt iWidth, UInt iHeight, Bool bAbove, Bool bLeft ) { assert(iWidth > 0 && iHeight > 0); @@ -251,5 +251,5 @@ const Pel* pSrc, Int srcStride, Pel* pTrueDst, Int dstStrideTrue, - UInt uiWidth, UInt uiHeight, ChannelType channelType, ChromaFormat format, + UInt uiWidth, UInt uiHeight, ChannelType channelType, UInt dirMode, Bool blkAboveAvailable, Bool blkLeftAvailable , const Bool bEnableEdgeFilters @@ -266,5 +266,5 @@ if (modeDC) { - const Pel dcval = predIntraGetPredValDC(pSrc, srcStride, width, height, channelType, format, blkAboveAvailable, blkLeftAvailable); + const Pel dcval = predIntraGetPredValDC(pSrc, srcStride, width, height, blkAboveAvailable, blkLeftAvailable); for (Int y=height;y>0;y--, pTrueDst+=dstStrideTrue) @@ -412,5 +412,4 @@ Void TComPrediction::predIntraAng( const ComponentID compID, UInt uiDirMode, Pel* piOrg /* Will be null for decoding */, UInt uiOrgStride, Pel* piPred, UInt uiStride, TComTU &rTu, Bool bAbove, Bool bLeft, const Bool bUseFilteredPredSamples, const Bool bUseLosslessDPCM ) { - const ChromaFormat format = rTu.GetChromaFormat(); const ChannelType channelType = toChannelType(compID); const TComRectangle &rect = rTu.getRect(isLuma(compID) ? COMPONENT_Y : COMPONENT_Cb); @@ -472,5 +471,5 @@ if ( uiDirMode == PLANAR_IDX ) { - xPredIntraPlanar( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, channelType, format ); + xPredIntraPlanar( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight ); } else @@ -489,5 +488,5 @@ #endif #endif - xPredIntraAng( channelsBitDepthForPrediction, ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, channelType, format, uiDirMode, bAbove, bLeft, enableEdgeFilters ); + xPredIntraAng( channelsBitDepthForPrediction, ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, channelType, uiDirMode, bAbove, bLeft, enableEdgeFilters ); if(( uiDirMode == DC_IDX ) && bAbove && bLeft ) @@ -787,5 +786,5 @@ */ //NOTE: Bit-Limit - 24-bit source -Void TComPrediction::xPredIntraPlanar( const Pel* pSrc, Int srcStride, Pel* rpDst, Int dstStride, UInt width, UInt height, ChannelType channelType, ChromaFormat format ) +Void TComPrediction::xPredIntraPlanar( const Pel* pSrc, Int srcStride, Pel* rpDst, Int dstStride, UInt width, UInt height ) { assert(width <= height); Index: /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.h (revision 1307) @@ -88,6 +88,6 @@ Int m_iLumaRecStride; ///< stride of #m_pLumaRecBuffer array - Void xPredIntraAng ( Int bitDepth, const Pel* pSrc, Int srcStride, Pel* pDst, Int dstStride, UInt width, UInt height, ChannelType channelType, ChromaFormat format, UInt dirMode, Bool blkAboveAvailable, Bool blkLeftAvailable, const Bool bEnableEdgeFilters ); - Void xPredIntraPlanar ( const Pel* pSrc, Int srcStride, Pel* rpDst, Int dstStride, UInt width, UInt height, ChannelType channelType, ChromaFormat format ); + Void xPredIntraAng ( Int bitDepth, const Pel* pSrc, Int srcStride, Pel* pDst, Int dstStride, UInt width, UInt height, ChannelType channelType, UInt dirMode, Bool blkAboveAvailable, Bool blkLeftAvailable, const Bool bEnableEdgeFilters ); + Void xPredIntraPlanar ( const Pel* pSrc, Int srcStride, Pel* rpDst, Int dstStride, UInt width, UInt height ); // motion compensation functions @@ -124,5 +124,5 @@ Void predIntraAng ( const ComponentID compID, UInt uiDirMode, Pel *piOrg /* Will be null for decoding */, UInt uiOrgStride, Pel* piPred, UInt uiStride, TComTU &rTu, Bool bAbove, Bool bLeft, const Bool bUseFilteredPredSamples, const Bool bUseLosslessDPCM = false ); - Pel predIntraGetPredValDC ( const Pel* pSrc, Int iSrcStride, UInt iWidth, UInt iHeight, ChannelType channelType, ChromaFormat format, Bool bAbove, Bool bLeft ); + Pel predIntraGetPredValDC ( const Pel* pSrc, Int iSrcStride, UInt iWidth, UInt iHeight, Bool bAbove, Bool bLeft ); Pel* getPredictorPtr ( const ComponentID compID, const Bool bUseFilteredPredictions ) Index: /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp (revision 1307) @@ -993,5 +993,5 @@ // To minimize the distortion only. No rate is considered. -Void TComTrQuant::signBitHidingHDQ( const ComponentID compID, TCoeff* pQCoef, TCoeff* pCoef, TCoeff* deltaU, const TUEntropyCodingParameters &codingParameters, const Int maxLog2TrDynamicRange ) +Void TComTrQuant::signBitHidingHDQ( TCoeff* pQCoef, TCoeff* pCoef, TCoeff* deltaU, const TUEntropyCodingParameters &codingParameters, const Int maxLog2TrDynamicRange ) { const UInt width = codingParameters.widthInGroups << MLS_CG_LOG2_WIDTH; @@ -1255,5 +1255,5 @@ if(uiAbsSum >= 2) //this prevents TUs with only one coefficient of value 1 from being tested { - signBitHidingHDQ( compID, piQCoef, piCoef, deltaU, codingParameters, maxLog2TrDynamicRange ) ; + signBitHidingHDQ( piQCoef, piCoef, deltaU, codingParameters, maxLog2TrDynamicRange ) ; } } @@ -3091,5 +3091,5 @@ * \param bitDepths reference to bit depth array for all channels */ -Void TComTrQuant::setScalingList(TComScalingList *scalingList, const ChromaFormat format, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths) +Void TComTrQuant::setScalingList(TComScalingList *scalingList, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths) { const Int minimumQp = 0; @@ -3102,6 +3102,6 @@ for(Int qp = minimumQp; qp < maximumQp; qp++) { - xSetScalingListEnc(scalingList,list,size,qp,format); - xSetScalingListDec(*scalingList,list,size,qp,format); + xSetScalingListEnc(scalingList,list,size,qp); + xSetScalingListDec(*scalingList,list,size,qp); setErrScaleCoeff(list,size,qp,maxLog2TrDynamicRange, bitDepths); } @@ -3113,5 +3113,5 @@ * \param format chroma format */ -Void TComTrQuant::setScalingListDec(const TComScalingList &scalingList, const ChromaFormat format) +Void TComTrQuant::setScalingListDec(const TComScalingList &scalingList) { const Int minimumQp = 0; @@ -3124,5 +3124,5 @@ for(Int qp = minimumQp; qp < maximumQp; qp++) { - xSetScalingListDec(scalingList,list,size,qp,format); + xSetScalingListDec(scalingList,list,size,qp); } } @@ -3168,5 +3168,5 @@ * \param format chroma format */ -Void TComTrQuant::xSetScalingListEnc(TComScalingList *scalingList, UInt listId, UInt sizeId, Int qp, const ChromaFormat format) +Void TComTrQuant::xSetScalingListEnc(TComScalingList *scalingList, UInt listId, UInt sizeId, Int qp) { UInt width = g_scalingListSizeX[sizeId]; @@ -3194,5 +3194,5 @@ * \param format chroma format */ -Void TComTrQuant::xSetScalingListDec(const TComScalingList &scalingList, UInt listId, UInt sizeId, Int qp, const ChromaFormat format) +Void TComTrQuant::xSetScalingListDec(const TComScalingList &scalingList, UInt listId, UInt sizeId, Int qp) { UInt width = g_scalingListSizeX[sizeId]; @@ -3216,5 +3216,5 @@ /** set flat matrix value to quantized coefficient */ -Void TComTrQuant::setFlatScalingList(const ChromaFormat format, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths) +Void TComTrQuant::setFlatScalingList(const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths) { const Int minimumQp = 0; @@ -3227,5 +3227,5 @@ for(Int qp = minimumQp; qp < maximumQp; qp++) { - xsetFlatScalingList(list,size,qp,format); + xsetFlatScalingList(list,size,qp); setErrScaleCoeff(list,size,qp,maxLog2TrDynamicRange, bitDepths); } @@ -3240,5 +3240,5 @@ * \param format chroma format */ -Void TComTrQuant::xsetFlatScalingList(UInt list, UInt size, Int qp, const ChromaFormat format) +Void TComTrQuant::xsetFlatScalingList(UInt list, UInt size, Int qp) { UInt i,num = g_scalingListSize[size]; Index: /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.h (revision 1307) @@ -182,10 +182,10 @@ Void setUseScalingList ( Bool bUseScalingList){ m_scalingListEnabledFlag = bUseScalingList; }; Bool getUseScalingList (const UInt width, const UInt height, const Bool isTransformSkip){ return m_scalingListEnabledFlag && (!isTransformSkip || ((width == 4) && (height == 4))); }; - Void setFlatScalingList (const ChromaFormat format, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths); - Void xsetFlatScalingList ( UInt list, UInt size, Int qp, const ChromaFormat format); - Void xSetScalingListEnc ( TComScalingList *scalingList, UInt list, UInt size, Int qp, const ChromaFormat format); - Void xSetScalingListDec ( const TComScalingList &scalingList, UInt list, UInt size, Int qp, const ChromaFormat format); - Void setScalingList ( TComScalingList *scalingList, const ChromaFormat format, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths); - Void setScalingListDec ( const TComScalingList &scalingList, const ChromaFormat format); + Void setFlatScalingList (const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths); + Void xsetFlatScalingList ( UInt list, UInt size, Int qp); + Void xSetScalingListEnc ( TComScalingList *scalingList, UInt list, UInt size, Int qp); + Void xSetScalingListDec ( const TComScalingList &scalingList, UInt list, UInt size, Int qp); + Void setScalingList ( TComScalingList *scalingList, const Int maxLog2TrDynamicRange[MAX_NUM_CHANNEL_TYPE], const BitDepths &bitDepths); + Void setScalingListDec ( const TComScalingList &scalingList); Void processScalingListEnc( Int *coeff, Int *quantcoeff, Int quantScales, UInt height, UInt width, UInt ratio, Int sizuNum, UInt dc); Void processScalingListDec( const Int *coeff, Int *dequantcoeff, Int invQuantScales, UInt height, UInt width, UInt ratio, Int sizuNum, UInt dc); @@ -241,5 +241,5 @@ Void xTransformSkip ( Pel* piBlkResi, UInt uiStride, TCoeff* psCoeff, TComTU &rTu, const ComponentID component ); - Void signBitHidingHDQ( const ComponentID compID, TCoeff* pQCoef, TCoeff* pCoef, TCoeff* deltaU, const TUEntropyCodingParameters &codingParameters, const Int maxLog2TrDynamicRange ); + Void signBitHidingHDQ( TCoeff* pQCoef, TCoeff* pCoef, TCoeff* deltaU, const TUEntropyCodingParameters &codingParameters, const Int maxLog2TrDynamicRange ); // quantization Index: /branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp (revision 1307) @@ -104,5 +104,5 @@ { std::string seiMessageHdr(SEI::getSEIMessageString(sei.payloadType())); seiMessageHdr+=" SEI message"; - (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw(seiMessageHdr.size()) << "-" << std::setfill(' ') << "\n" << seiMessageHdr << "\n"; + (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw(seiMessageHdr.size()) << "-" << std::setfill(' ') << "\n" << seiMessageHdr << " (" << payloadSize << " bytes)"<< "\n"; } } @@ -647,6 +647,5 @@ } #else - const TComVUI *vui = sps->getVuiParameters(); - + const TComVUI *vui = sps->getVuiParameters(); if(vui->getHrdParameters()->getSubPicCpbParamsInPicTimingSEIFlag()) { Index: /branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (revision 1307) @@ -2656,5 +2656,5 @@ } -Void TDecCavlc::parseExplicitRdpcmMode( TComTU &rTu, ComponentID compID ) +Void TDecCavlc::parseExplicitRdpcmMode( TComTU& /*rTu*/, ComponentID /*compID*/ ) { assert(0); Index: /branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp (revision 1307) @@ -442,5 +442,5 @@ m_ppcYuvResi[uiDepth]->clear(); - m_ppcCU[uiDepth]->copySubCU( pCtu, uiAbsPartIdx, uiDepth ); + m_ppcCU[uiDepth]->copySubCU( pCtu, uiAbsPartIdx ); switch( m_ppcCU[uiDepth]->getPredictionMode(0) ) Index: /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 1307) @@ -1776,9 +1776,5 @@ scalingList.setDefaultScalingList(); } -#if SVC_EXTENSION - m_cTrQuant.setScalingListDec(scalingList, pcSlice->getChromaFormatIdc()); -#else - m_cTrQuant.setScalingListDec(scalingList, pcSlice->getSPS()->getChromaFormatIdc()); -#endif + m_cTrQuant.setScalingListDec(scalingList); m_cTrQuant.setUseScalingList(true); } @@ -1791,7 +1787,7 @@ }; #if SVC_EXTENSION - m_cTrQuant.setFlatScalingList(pcSlice->getChromaFormatIdc(), maxLog2TrDynamicRange, pcSlice->getBitDepths()); + m_cTrQuant.setFlatScalingList(maxLog2TrDynamicRange, pcSlice->getBitDepths()); #else - m_cTrQuant.setFlatScalingList(pcSlice->getSPS()->getChromaFormatIdc(), maxLog2TrDynamicRange, pcSlice->getSPS()->getBitDepths()); + m_cTrQuant.setFlatScalingList(maxLog2TrDynamicRange, pcSlice->getSPS()->getBitDepths()); #endif m_cTrQuant.setUseScalingList(false); Index: /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.cpp (revision 1307) @@ -225,5 +225,5 @@ sopDescriptionSEI->m_sopDescVclNaluType[i] = m_pcEncGOP->getNalUnitType(sopCurrPOC, lastIdr, slice->getPic()->isField()); sopDescriptionSEI->m_sopDescTemporalId[i] = m_pcCfg->getGOPEntry(j).m_temporalId; - sopDescriptionSEI->m_sopDescStRpsIdx[i] = m_pcEncTop->getReferencePictureSetIdxForSOP(slice, sopCurrPOC, j); + sopDescriptionSEI->m_sopDescStRpsIdx[i] = m_pcEncTop->getReferencePictureSetIdxForSOP(sopCurrPOC, j); sopDescriptionSEI->m_sopDescPocDelta[i] = deltaPOC; @@ -416,5 +416,5 @@ } -Void SEIEncoder::initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint, Bool bChromaLocInfoPresent, Int iHorFilterIndex, Int iVerFilterIndex) +Void SEIEncoder::initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint, Int iHorFilterIndex, Int iVerFilterIndex) { assert (m_isInitialized); Index: /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/SEIEncoder.h (revision 1307) @@ -79,5 +79,5 @@ Void initSEITempMotionConstrainedTileSets (SEITempMotionConstrainedTileSets *sei, const TComPPS *pps); Void initSEIKneeFunctionInfo(SEIKneeFunctionInfo *sei); - Void initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *sei, Bool bChromaLocInfoPresent, Int iHorFilterIndex, Int iVerFilterIndex); + Void initSEIChromaSamplingFilterHint(SEIChromaSamplingFilterHint *sei, Int iHorFilterIndex, Int iVerFilterIndex); Void initSEITimeCode(SEITimeCode *sei); Index: /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp (revision 1307) @@ -142,5 +142,5 @@ break; case SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS: - xWriteSEITempMotionConstrainedTileSets(bs, *static_cast(&sei)); + xWriteSEITempMotionConstrainedTileSets(*static_cast(&sei)); break; case SEI::TIME_CODE: @@ -729,5 +729,5 @@ } -Void SEIWriter::xWriteSEINoDisplay(const SEINoDisplay &sei) +Void SEIWriter::xWriteSEINoDisplay(const SEINoDisplay& /*sei*/) { } @@ -798,5 +798,5 @@ } -Void SEIWriter::xWriteSEITempMotionConstrainedTileSets(TComBitIf& bs, const SEITempMotionConstrainedTileSets& sei) +Void SEIWriter::xWriteSEITempMotionConstrainedTileSets(const SEITempMotionConstrainedTileSets& sei) { //UInt code; Index: /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h (revision 1307) @@ -89,5 +89,5 @@ Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, const TComSPS *sps); #endif - Void xWriteSEITempMotionConstrainedTileSets(TComBitIf& bs, const SEITempMotionConstrainedTileSets& sei); + Void xWriteSEITempMotionConstrainedTileSets(const SEITempMotionConstrainedTileSets& sei); Void xWriteSEITimeCode(const SEITimeCode& sei); Void xWriteSEIChromaSamplingFilterHint(const SEIChromaSamplingFilterHint& sei/*, TComSPS *sps*/); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncBinCoderCABACCounter.cpp (revision 1307) @@ -106,5 +106,5 @@ * \param binValue bin value */ -Void TEncBinCABACCounter::encodeBinEP( UInt binValue ) +Void TEncBinCABACCounter::encodeBinEP( UInt /*binValue*/ ) { m_uiBinsCoded += m_binCountIncrement; @@ -118,5 +118,5 @@ * \param numBins number of bins */ -Void TEncBinCABACCounter::encodeBinsEP( UInt binValues, Int numBins ) +Void TEncBinCABACCounter::encodeBinsEP( UInt /*binValues*/, Int numBins ) { m_uiBinsCoded += numBins & -m_binCountIncrement; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1307) @@ -82,17 +82,8 @@ // ==================================================================================================================== -Void TEncCavlc::resetEntropy(const TComSlice *pSlice) -{ -} - - -Void TEncCavlc::codeDFFlag(UInt uiCode, const Char *pSymbolName) -{ - WRITE_FLAG(uiCode, pSymbolName); -} -Void TEncCavlc::codeDFSvlc(Int iCode, const Char *pSymbolName) -{ - WRITE_SVLC(iCode, pSymbolName); -} +Void TEncCavlc::resetEntropy(const TComSlice* /*pSlice*/) +{ +} + Void TEncCavlc::codeShortTermRefPicSet( const TComReferencePictureSet* rps, Bool calledFromSliceHeader, Int idx) @@ -1496,5 +1487,5 @@ } -Void TEncCavlc::codeTerminatingBit ( UInt uilsLast ) +Void TEncCavlc::codeTerminatingBit ( UInt /*uilsLast*/ ) { } @@ -1504,74 +1495,74 @@ } -Void TEncCavlc::codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) +Void TEncCavlc::codeMVPIdx ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ ) { assert(0); } -Void TEncCavlc::codePartSize( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) +Void TEncCavlc::codePartSize( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ ) { assert(0); } -Void TEncCavlc::codePredMode( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codePredMode( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeMergeFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeMergeFlag ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeMergeIndex ( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeMergeIndex ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeInterModeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiEncMode ) +Void TEncCavlc::codeInterModeFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/, UInt /*uiEncMode*/ ) { assert(0); } -Void TEncCavlc::codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeCUTransquantBypassFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeSkipFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeSkipFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeSplitFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) +Void TEncCavlc::codeSplitFlag ( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ ) { assert(0); } -Void TEncCavlc::codeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx ) +Void TEncCavlc::codeTransformSubdivFlag( UInt /*uiSymbol*/, UInt /*uiCtx*/ ) { assert(0); } -Void TEncCavlc::codeQtCbf( TComTU &rTu, const ComponentID compID, const Bool lowestLevel ) +Void TEncCavlc::codeQtCbf( TComTU& /*rTu*/, const ComponentID /*compID*/, const Bool /*lowestLevel*/ ) { assert(0); } -Void TEncCavlc::codeQtRootCbf( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeQtRootCbf( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeQtCbfZero( TComTU &rTu, const ChannelType chType ) +Void TEncCavlc::codeQtCbfZero( TComTU& /*rTu*/, const ChannelType /*chType*/ ) { assert(0); } -Void TEncCavlc::codeQtRootCbfZero( TComDataCU* pcCU ) +Void TEncCavlc::codeQtRootCbfZero( ) { assert(0); } -Void TEncCavlc::codeTransformSkipFlags (TComTU &rTu, ComponentID component ) +Void TEncCavlc::codeTransformSkipFlags (TComTU& /*rTu*/, ComponentID /*component*/ ) { assert(0); @@ -1583,30 +1574,30 @@ * \returns Void */ -Void TEncCavlc::codeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeIPCMInfo( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool isMultiple) +Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, Bool /*isMultiple*/) { assert(0); } -Void TEncCavlc::codeIntraDirChroma( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeIntraDirChroma( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeInterDir( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeInterDir( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeRefFrmIdx( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) +Void TEncCavlc::codeRefFrmIdx( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ ) { assert(0); } -Void TEncCavlc::codeMvd( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) +Void TEncCavlc::codeMvd( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, RefPicList /*eRefList*/ ) { assert(0); @@ -1634,15 +1625,15 @@ } -Void TEncCavlc::codeChromaQpAdjustment( TComDataCU* pcCU, UInt uiAbsPartIdx ) +Void TEncCavlc::codeChromaQpAdjustment( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/ ) { assert(0); } -Void TEncCavlc::codeCoeffNxN ( TComTU &rTu, TCoeff* pcCoef, const ComponentID compID ) +Void TEncCavlc::codeCoeffNxN ( TComTU& /*rTu*/, TCoeff* /*pcCoef*/, const ComponentID /*compID*/ ) { assert(0); } -Void TEncCavlc::estBit( estBitsSbacStruct* pcEstBitsCabac, Int width, Int height, ChannelType chType ) +Void TEncCavlc::estBit( estBitsSbacStruct* /*pcEstBitsCabac*/, Int /*width*/, Int /*height*/, ChannelType /*chType*/ ) { // printf("error : no VLC mode support in this version\n"); @@ -1822,5 +1813,5 @@ } -Void TEncCavlc::codeExplicitRdpcmMode( TComTU &rTu, const ComponentID compID ) +Void TEncCavlc::codeExplicitRdpcmMode( TComTU& /*rTu*/, const ComponentID /*compID*/ ) { assert(0); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h (revision 1307) @@ -79,5 +79,5 @@ Void resetEntropy (const TComSlice *pSlice); - SliceType determineCabacInitIdx (const TComSlice *pSlice) { assert(0); return I_SLICE; }; + SliceType determineCabacInitIdx (const TComSlice* /*pSlice*/) { assert(0); return I_SLICE; }; Void setBitstream ( TComBitIf* p ) { m_pcBitIf = p; } @@ -101,5 +101,5 @@ Void codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ); - 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);} + 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);} Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ); Void codeSkipFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx ); @@ -107,5 +107,5 @@ Void codeMergeIndex ( TComDataCU* pcCU, UInt uiAbsPartIdx ); - Void codeAlfCtrlFlag ( ComponentID component, UInt code ) {printf("Not supported\n"); assert(0);} + Void codeAlfCtrlFlag ( ComponentID /*component*/, UInt /*code*/ ) {printf("Not supported\n"); assert(0);} Void codeInterModeFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiEncMode ); Void codeSplitFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ); @@ -120,5 +120,5 @@ Void codeQtRootCbf ( TComDataCU* pcCU, UInt uiAbsPartIdx ); Void codeQtCbfZero ( TComTU &rTu, const ChannelType chType ); - Void codeQtRootCbfZero ( TComDataCU* pcCU ); + Void codeQtRootCbfZero ( ); Void codeIntraDirLumaAng( TComDataCU* pcCU, UInt absPartIdx, Bool isMultiple); Void codeIntraDirChroma( TComDataCU* pcCU, UInt uiAbsPartIdx ); @@ -141,6 +141,4 @@ Void codeScalingList ( const TComScalingList &scalingList ); Void xCodeScalingList ( const TComScalingList* scalingList, UInt sizeId, UInt listId); - Void codeDFFlag ( UInt uiCode, const Char *pSymbolName ); - Void codeDFSvlc ( Int iCode, const Char *pSymbolName ); Void codeExplicitRdpcmMode( TComTU &rTu, const ComponentID compID ); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1307) @@ -969,5 +969,5 @@ rpcBestCU->copyToPic(uiDepth); // Copy Best data to Picture for next partition prediction. - xCopyYuv2Pic( rpcBestCU->getPic(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu(), uiDepth, uiDepth, rpcBestCU, uiLPelX, uiTPelY ); // Copy Yuv data to picture Yuv + xCopyYuv2Pic( rpcBestCU->getPic(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu(), uiDepth, uiDepth ); // Copy Yuv data to picture Yuv if (bBoundary) { @@ -988,5 +988,5 @@ * \returns Void */ -Void TEncCu::finishCU( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) +Void TEncCu::finishCU( TComDataCU* pcCU, UInt uiAbsPartIdx ) { TComPic* pcPic = pcCU->getPic(); @@ -1135,5 +1135,5 @@ { m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx ); - finishCU(pcCU,uiAbsPartIdx,uiDepth); + finishCU(pcCU,uiAbsPartIdx); return; } @@ -1149,5 +1149,5 @@ { // Encode slice finish - finishCU(pcCU,uiAbsPartIdx,uiDepth); + finishCU(pcCU,uiAbsPartIdx); return; } @@ -1165,5 +1165,5 @@ // --- write terminating bit --- - finishCU(pcCU,uiAbsPartIdx,uiDepth); + finishCU(pcCU,uiAbsPartIdx); } @@ -1675,5 +1675,5 @@ } } -Void TEncCu::xCopyYuv2Pic(TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth, TComDataCU* pcCU, UInt uiLPelX, UInt uiTPelY ) +Void TEncCu::xCopyYuv2Pic(TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth ) { UInt uiAbsPartIdxInRaster = g_auiZscanToRaster[uiAbsPartIdx]; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1307) @@ -123,5 +123,5 @@ protected: - Void finishCU ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ); + Void finishCU ( TComDataCU* pcCU, UInt uiAbsPartIdx ); #if AMP_ENC_SPEEDUP Void xCompressCU ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth DEBUG_STRING_FN_DECLARE(sDebug), PartSize eParentPartSize = NUMBER_OF_PART_SIZES ); @@ -156,5 +156,5 @@ Void xCheckIntraPCM ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU ); Void xCopyAMVPInfo ( AMVPInfo* pSrc, AMVPInfo* pDst ); - Void xCopyYuv2Pic (TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth, TComDataCU* pcCU, UInt uiLPelX, UInt uiTPelY ); + Void xCopyYuv2Pic (TComPic* rpcPic, UInt uiCUAddr, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSrcDepth ); Void xCopyYuv2Tmp ( UInt uhPartUnitIdx, UInt uiDepth ); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp (revision 1307) @@ -588,7 +588,7 @@ } -Void TEncEntropy::encodeQtRootCbfZero( TComDataCU* pcCU ) -{ - m_pcEntropyCoderIf->codeQtRootCbfZero( pcCU ); +Void TEncEntropy::encodeQtRootCbfZero( ) +{ + m_pcEntropyCoderIf->codeQtRootCbfZero( ); } Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.h (revision 1307) @@ -99,5 +99,5 @@ virtual Void codeQtRootCbf ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0; virtual Void codeQtCbfZero ( TComTU &rTu, const ChannelType chType ) = 0; - virtual Void codeQtRootCbfZero ( TComDataCU* pcCU ) = 0; + virtual Void codeQtRootCbfZero ( ) = 0; virtual Void codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool isMultiplePU ) = 0; @@ -115,7 +115,4 @@ virtual Void codeSAOBlkParam (SAOBlkParam& saoBlkParam, const BitDepths &bitDepths, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail, Bool onlyEstMergeInfo = false) =0; virtual Void estBit (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType) = 0; - - virtual Void codeDFFlag (UInt uiCode, const Char *pSymbolName) = 0; - virtual Void codeDFSvlc (Int iCode, const Char *pSymbolName) = 0; virtual Void codeExplicitRdpcmMode ( TComTU &rTu, const ComponentID compID ) = 0; @@ -176,5 +173,5 @@ Void encodeQtCbfZero ( TComTU &rTu, const ChannelType chType ); - Void encodeQtRootCbfZero ( TComDataCU* pcCU ); + Void encodeQtRootCbfZero ( ); Void encodeQtRootCbf ( TComDataCU* pcCU, UInt uiAbsPartIdx ); Void encodeQP ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false ); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 1307) @@ -904,5 +904,5 @@ { SEIChromaSamplingFilterHint *seiChromaSamplingFilterHint = new SEIChromaSamplingFilterHint; - m_seiEncoder.initSEIChromaSamplingFilterHint(seiChromaSamplingFilterHint, m_pcCfg->getChromaLocInfoPresentFlag(), m_pcCfg->getChromaSamplingHorFilterIdc(), m_pcCfg->getChromaSamplingVerFilterIdc()); + m_seiEncoder.initSEIChromaSamplingFilterHint(seiChromaSamplingFilterHint, m_pcCfg->getChromaSamplingHorFilterIdc(), m_pcCfg->getChromaSamplingVerFilterIdc()); seiMessages.push_back(seiChromaSamplingFilterHint); } @@ -974,5 +974,5 @@ } -Void TEncGOP::xCreatePictureTimingSEI (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, AccessUnit &accessUnit, TComSlice *slice, Bool isField, std::deque &duData) +Void TEncGOP::xCreatePictureTimingSEI (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, TComSlice *slice, Bool isField, std::deque &duData) { Int picSptDpbOutputDuDelay = 0; @@ -1500,5 +1500,5 @@ AccessUnit::iterator itLocationToPushSliceHeaderNALU; // used to store location where NALU containing slice header is to be inserted - xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut, isField ); + xInitGOP( iPOCLast, iNumPicRcvd, isField ); m_iNumPicCoded = 0; @@ -1594,8 +1594,10 @@ m_pcSliceEncoder->setSliceIdx(0); pcPic->setCurrSliceIdx(0); + #if SVC_EXTENSION pcPic->setLayerId( m_layerId ); #endif - m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, isField ); + + m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iGOPid, pcSlice, isField ); //Set Frame/Field coding @@ -2842,7 +2844,7 @@ #if EFFICIENT_FIELD_IRAP - xCreatePictureTimingSEI(effFieldIRAPMap.GetIRAPGOPid(), leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, accessUnit, pcSlice, isField, duData); -#else - xCreatePictureTimingSEI(0, leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, accessUnit, pcSlice, isField, duData); + xCreatePictureTimingSEI(effFieldIRAPMap.GetIRAPGOPid(), leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, pcSlice, isField, duData); +#else + xCreatePictureTimingSEI(0, leadingSeiMessages, nestedSeiMessages, duInfoSeiMessages, pcSlice, isField, duData); #endif if (m_pcCfg->getScalableNestingSEIEnabled()) @@ -2992,5 +2994,5 @@ -Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, Bool isField ) +Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, Bool isField ) { assert( iNumPicRcvd > 0 ); @@ -3176,9 +3178,9 @@ if( (pcPic->isTopField() && isFieldTopFieldFirst) || (!pcPic->isTopField() && !isFieldTopFieldFirst)) { - xCalculateInterlacedAddPSNR(pcPic, correspondingFieldPic, pcPic->getPicYuvRec(), correspondingFieldPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE ); + xCalculateInterlacedAddPSNR(pcPic, correspondingFieldPic, pcPic->getPicYuvRec(), correspondingFieldPic->getPicYuvRec(), snr_conversion, printFrameMSE ); } else { - xCalculateInterlacedAddPSNR(correspondingFieldPic, pcPic, correspondingFieldPic->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE ); + xCalculateInterlacedAddPSNR(correspondingFieldPic, pcPic, correspondingFieldPic->getPicYuvRec(), pcPic->getPicYuvRec(), snr_conversion, printFrameMSE ); } } @@ -3199,9 +3201,5 @@ { cscd.create(pcPicD->getWidth(COMPONENT_Y), pcPicD->getHeight(COMPONENT_Y), pcPicD->getChromaFormat(), pcPicD->getWidth(COMPONENT_Y), pcPicD->getHeight(COMPONENT_Y), 0, false); -#if SVC_EXTENSION - TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, pcPic->getSlice(0)->getBitDepths().recon, false); -#else - TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, pcPic->getPicSym()->getSPS().getBitDepths().recon, false); -#endif + TVideoIOYuv::ColourSpaceConvert(*pcPicD, cscd, conversion, false); } TComPicYuv &picd=(conversion==IPCOLOURSPACE_UNCHANGED)?*pcPicD : cscd; @@ -3384,5 +3382,5 @@ Void TEncGOP::xCalculateInterlacedAddPSNR( TComPic* pcPicOrgFirstField, TComPic* pcPicOrgSecondField, TComPicYuv* pcPicRecFirstField, TComPicYuv* pcPicRecSecondField, - const AccessUnit& accessUnit, Double dEncTime, const InputColourSpaceConversion conversion, const Bool printFrameMSE ) + const InputColourSpaceConversion conversion, const Bool printFrameMSE ) { #if !SVC_EXTENSION @@ -3405,9 +3403,5 @@ TComPicYuv &reconField=*(apcPicRecFields[fieldNum]); cscd[fieldNum].create(reconField.getWidth(COMPONENT_Y), reconField.getHeight(COMPONENT_Y), reconField.getChromaFormat(), reconField.getWidth(COMPONENT_Y), reconField.getHeight(COMPONENT_Y), 0, false); -#if SVC_EXTENSION - TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, pcPicOrgFirstField->getSlice(0)->getBitDepths().recon, false); -#else - TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, sps.getBitDepths().recon, false); -#endif + TVideoIOYuv::ColourSpaceConvert(reconField, cscd[fieldNum], conversion, false); apcPicRecFields[fieldNum]=cscd+fieldNum; } Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h (revision 1307) @@ -199,5 +199,5 @@ TComList* getListPic() { return m_pcListPic; } - + Void printOutSummary ( UInt uiNumAllPicCoded, Bool isField, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths ); Void preLoopFilterPicAll ( TComPic* pcPic, UInt64& ruiDist ); @@ -228,5 +228,5 @@ protected: - Void xInitGOP ( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, Bool isField ); + Void xInitGOP ( Int iPOCLast, Int iNumPicRcvd, Bool isField ); Void xGetBuffer ( TComList& rcListPic, TComList& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr, Bool isField ); @@ -235,5 +235,5 @@ Void xCalculateInterlacedAddPSNR( TComPic* pcPicOrgFirstField, TComPic* pcPicOrgSecondField, TComPicYuv* pcPicRecFirstField, TComPicYuv* pcPicRecSecondField, - const AccessUnit& accessUnit, Double dEncTime, const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE ); + const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE ); UInt64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths); @@ -243,5 +243,5 @@ Void xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const TComSPS *sps, const TComPPS *pps); Void xCreatePerPictureSEIMessages (Int picInGOP, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, TComSlice *slice); - Void xCreatePictureTimingSEI (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, AccessUnit &accessUnit, TComSlice *slice, Bool isField, std::deque &duData); + Void xCreatePictureTimingSEI (Int IRAPGOPid, SEIMessages& seiMessages, SEIMessages& nestedSeiMessages, SEIMessages& duInfoSeiMessages, TComSlice *slice, Bool isField, std::deque &duData); Void xUpdateDuData(AccessUnit &testAU, std::deque &duData); Void xUpdateTimingSEI(SEIPictureTiming *pictureTimingSEI, std::deque &duData, const TComSPS *sps); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp (revision 1307) @@ -354,5 +354,5 @@ #endif , srcBlk, orgBlk, srcStride, orgStride, (width >> componentScaleX), (height >> componentScaleY) - , isLeftAvail, isRightAvail, isAboveAvail, isBelowAvail, isAboveLeftAvail, isAboveRightAvail, isBelowLeftAvail, isBelowRightAvail + , isLeftAvail, isRightAvail, isAboveAvail, isBelowAvail, isAboveLeftAvail, isAboveRightAvail #if SAO_ENCODE_ALLOW_USE_PREDEBLOCK , isCalculatePreDeblockSamples @@ -442,5 +442,5 @@ -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 ) +inline Int TEncSampleAdaptiveOffset::estIterOffset(Int typeIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh ) { Int iterOffset, tempOffset; @@ -535,5 +535,5 @@ if( quantOffsets[classIdx] != 0 ) //iterative adjustment only when derived offset is not zero { - quantOffsets[classIdx] = estIterOffset( typeIdc, classIdx, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], classDist , classCost , offsetTh ); + quantOffsets[classIdx] = estIterOffset( typeIdc, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], classDist , classCost , offsetTh ); } } @@ -552,5 +552,5 @@ if( quantOffsets[classIdx] != 0 ) //iterative adjustment only when derived offset is not zero { - 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 ); + quantOffsets[classIdx] = estIterOffset( typeIdc, m_lambda[compIdx], quantOffsets[classIdx], statData.count[classIdx], statData.diff[classIdx], shift, m_offsetStepLog2[compIdx], distBOClasses[classIdx], costBOClasses[classIdx], offsetTh ); } } @@ -933,5 +933,5 @@ Void TEncSampleAdaptiveOffset::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 + , Bool isLeftAvail, Bool isRightAvail, Bool isAboveAvail, Bool isBelowAvail, Bool isAboveLeftAvail, Bool isAboveRightAvail #if SAO_ENCODE_ALLOW_USE_PREDEBLOCK , Bool isCalculatePreDeblockSamples Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h (revision 1307) @@ -126,5 +126,5 @@ Void decidePicParams(Bool* sliceEnabled, Int picTempLayer); Void decideBlkParams(TComPic* pic, Bool* sliceEnabled, SAOStatData*** blkStats, TComPicYuv* srcYuv, TComPicYuv* resYuv, SAOBlkParam* reconParams, SAOBlkParam* codedParams); - 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 + 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 #if SAO_ENCODE_ALLOW_USE_PREDEBLOCK , Bool isCalculatePreDeblockSamples @@ -136,5 +136,5 @@ Void deriveOffsets(ComponentID compIdx, const Int channelBitDepth, Int typeIdc, SAOStatData& statData, Int* quantOffsets, Int& typeAuxInfo); inline Int64 estSaoDist(Int64 count, Int64 offset, Int64 diffSum, Int shift); - 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 ); + inline Int estIterOffset(Int typeIdx, Double lambda, Int offsetInput, Int64 count, Int64 diffSum, Int shift, Int bitIncrease, Int64& bestDist, Double& bestCost, Int offsetTh ); #if SAO_ENCODE_ALLOW_USE_PREDEBLOCK Void addPreDBFStatistics(SAOStatData*** blkStats); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (revision 1307) @@ -221,5 +221,5 @@ } -Void TEncSbac::codeVPS( const TComVPS* pcVPS ) +Void TEncSbac::codeVPS( const TComVPS* /*pcVPS*/ ) { assert (0); @@ -227,5 +227,5 @@ } -Void TEncSbac::codeSPS( const TComSPS* pcSPS ) +Void TEncSbac::codeSPS( const TComSPS* /*pcSPS*/ ) { assert (0); @@ -234,7 +234,7 @@ #if CGS_3D_ASYMLUT -Void TEncSbac::codePPS( const TComPPS* pcPPS, TEnc3DAsymLUT * pc3DAsymLUT ) +Void TEncSbac::codePPS( const TComPPS* /*pcPPS*/, TEnc3DAsymLUT * pc3DAsymLUT ) #else -Void TEncSbac::codePPS( const TComPPS* pcPPS ) +Void TEncSbac::codePPS( const TComPPS* /*pcPPS*/ ) #endif { @@ -243,5 +243,5 @@ } -Void TEncSbac::codeSliceHeader( TComSlice* pcSlice ) +Void TEncSbac::codeSliceHeader( TComSlice* /*pcSlice*/ ) { assert (0); @@ -249,5 +249,5 @@ } -Void TEncSbac::codeTilesWPPEntryPoint( TComSlice* pSlice ) +Void TEncSbac::codeTilesWPPEntryPoint( TComSlice* /*pSlice*/ ) { assert (0); @@ -1103,5 +1103,5 @@ } -Void TEncSbac::codeQtRootCbfZero( TComDataCU* pcCU ) +Void TEncSbac::codeQtRootCbfZero( ) { // this function is only used to estimate the bits when cbf is 0 Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h (revision 1307) @@ -124,7 +124,4 @@ Void xCopyContextsFrom ( const TEncSbac* pSrc ); - Void codeDFFlag( UInt /*uiCode*/, const Char* /*pSymbolName*/ ) {printf("Not supported in codeDFFlag()\n"); assert(0); exit(1);}; - Void codeDFSvlc( Int /*iCode*/, const Char* /*pSymbolName*/ ) {printf("Not supported in codeDFSvlc()\n"); assert(0); exit(1);}; - protected: TComBitIf* m_pcBitIf; @@ -148,5 +145,5 @@ Void codeQtRootCbf ( TComDataCU* pcCU, UInt uiAbsPartIdx ); Void codeQtCbfZero ( TComTU &rTu, const ChannelType chType ); - Void codeQtRootCbfZero ( TComDataCU* pcCU ); + Void codeQtRootCbfZero ( ); Void codeIntraDirLumaAng ( TComDataCU* pcCU, UInt absPartIdx, Bool isMultiple); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1307) @@ -1173,5 +1173,5 @@ #endif { - const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, pcCU->getSlice()->getSPS()->getDisableIntraReferenceSmoothing()); + const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, sps.getDisableIntraReferenceSmoothing()); initAdiPatternChType( rTu, bAboveAvail, bLeftAvail, compID, bUseFilteredPredictions DEBUG_STRING_PASS_INTO(sDebug) ); @@ -2333,5 +2333,5 @@ // NB xModeBitsIntra will not affect the mode for chroma that may have already been pre-estimated. - iModeBits+=xModeBitsIntra( pcCU, uiMode, uiPartOffset, uiDepth, uiInitTrDepth, CHANNEL_TYPE_LUMA ); + iModeBits+=xModeBitsIntra( pcCU, uiMode, uiPartOffset, uiDepth, CHANNEL_TYPE_LUMA ); Double cost = (Double)uiSad + (Double)iModeBits * sqrtLambdaForFirstPass; @@ -3623,5 +3623,5 @@ if(pcCU->getSlice()->getMvdL1ZeroFlag() && eRefPicList==REF_PIC_LIST_1) { - (*puiDistBiP) = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, rcMvPred, 0, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight); + (*puiDistBiP) = xGetTemplateCost( pcCU, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, rcMvPred, 0, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight); } return; @@ -3640,5 +3640,5 @@ { Distortion uiTmpCost; - uiTmpCost = xGetTemplateCost( pcCU, uiPartIdx, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, pcAMVPInfo->m_acMvCand[i], i, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight); + uiTmpCost = xGetTemplateCost( pcCU, uiPartAddr, pcOrgYuv, &m_cYuvPredTemp, pcAMVPInfo->m_acMvCand[i], i, AMVP_MAX_NUM_CANDS, eRefPicList, iRefIdx, iRoiWidth, iRoiHeight); if ( uiBestCost > uiTmpCost ) { @@ -3798,5 +3798,4 @@ Distortion TEncSearch::xGetTemplateCost( TComDataCU* pcCU, - UInt uiPartIdx, UInt uiPartAddr, TComYuv* pcOrgYuv, @@ -3973,5 +3972,5 @@ else //non ILR reference pic #endif - xPatternSearchFracDIF( bIsLosslessCoded, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost ,bBi ); + xPatternSearchFracDIF( bIsLosslessCoded, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost ); m_pcRdCost->setCostScale( 0 ); @@ -4472,6 +4471,5 @@ TComMv& rcMvHalf, TComMv& rcMvQter, - Distortion& ruiCost, - Bool biPred + Distortion& ruiCost ) { @@ -4486,5 +4484,5 @@ // Half-pel refinement - xExtDIFUpSamplingH ( &cPatternRoi, biPred ); + xExtDIFUpSamplingH ( &cPatternRoi ); rcMvHalf = *pcMvInt; rcMvHalf <<= 1; // for mv-cost @@ -4494,5 +4492,5 @@ m_pcRdCost->setCostScale( 0 ); - xExtDIFUpSamplingQ ( &cPatternRoi, rcMvHalf, biPred ); + xExtDIFUpSamplingQ ( &cPatternRoi, rcMvHalf ); baseRefMv = rcMvHalf; baseRefMv <<= 1; @@ -4593,5 +4591,5 @@ m_pcEntropyCoder->resetBits(); - m_pcEntropyCoder->encodeQtRootCbfZero( pcCU ); + m_pcEntropyCoder->encodeQtRootCbfZero( ); const UInt zeroResiBits = m_pcEntropyCoder->getNumberOfWrittenBits(); const Double zeroCost = (pcCU->isLosslessCoded( 0 )) ? (nonZeroCost+1) : (m_pcRdCost->calcRdCost( zeroResiBits, zeroDistortion )); @@ -4626,5 +4624,5 @@ UInt finalBits = 0; - xAddSymbolBitsInter( pcCU, 0, 0, finalBits ); + xAddSymbolBitsInter( pcCU, finalBits ); // we've now encoded the pcCU, and so have a valid bit cost @@ -5458,5 +5456,5 @@ -UInt TEncSearch::xModeBitsIntra( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, UInt uiInitTrDepth, const ChannelType chType ) +UInt TEncSearch::xModeBitsIntra( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, const ChannelType chType ) { // Reload only contexts required for coding intra mode information @@ -5526,5 +5524,5 @@ * \returns Void */ -Void TEncSearch::xAddSymbolBitsInter( TComDataCU* pcCU, UInt uiQp, UInt uiTrMode, UInt& ruiBits ) +Void TEncSearch::xAddSymbolBitsInter( TComDataCU* pcCU, UInt& ruiBits ) { if(pcCU->getMergeFlag( 0 ) && pcCU->getPartitionSize( 0 ) == SIZE_2Nx2N && !pcCU->getQtRootCbf( 0 )) @@ -5574,5 +5572,5 @@ * \param biPred Flag indicating whether block is for biprediction */ -Void TEncSearch::xExtDIFUpSamplingH( TComPattern* pattern, Bool biPred ) +Void TEncSearch::xExtDIFUpSamplingH( TComPattern* pattern ) { Int width = pattern->getROIYWidth(); @@ -5621,5 +5619,5 @@ * \param biPred Flag indicating whether block is for biprediction */ -Void TEncSearch::xExtDIFUpSamplingQ( TComPattern* pattern, TComMv halfPelRef, Bool biPred ) +Void TEncSearch::xExtDIFUpSamplingQ( TComPattern* pattern, TComMv halfPelRef ) { Int width = pattern->getROIYWidth(); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h (revision 1307) @@ -341,5 +341,4 @@ Distortion xGetTemplateCost ( TComDataCU* pcCU, - UInt uiPartIdx, UInt uiPartAddr, TComYuv* pcOrgYuv, @@ -448,10 +447,9 @@ TComMv& rcMvHalf, TComMv& rcMvQter, - Distortion& ruiCost, - Bool biPred + Distortion& ruiCost ); - Void xExtDIFUpSamplingH( TComPattern* pcPattern, Bool biPred ); - Void xExtDIFUpSamplingQ( TComPattern* pcPatternKey, TComMv halfPelRef, Bool biPred ); + Void xExtDIFUpSamplingH( TComPattern* pcPattern ); + Void xExtDIFUpSamplingQ( TComPattern* pcPatternKey, TComMv halfPelRef ); // ------------------------------------------------------------------------------------------------------------------- @@ -464,5 +462,5 @@ Void xSetInterResidualQTData( TComYuv* pcResi, Bool bSpatial, TComTU &rTu ); - UInt xModeBitsIntra ( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, UInt uiInitTrDepth, const ChannelType compID ); + UInt xModeBitsIntra ( TComDataCU* pcCU, UInt uiMode, UInt uiPartOffset, UInt uiDepth, const ChannelType compID ); UInt xUpdateCandList( UInt uiMode, Double uiCost, UInt uiFastCandNum, UInt * CandModeList, Double * CandCostList ); @@ -472,6 +470,4 @@ Void xAddSymbolBitsInter ( TComDataCU* pcCU, - UInt uiQp, - UInt uiTrMode, UInt& ruiBits); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1307) @@ -236,5 +236,5 @@ */ -Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, Bool isField ) +Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iGOPid, TComSlice*& rpcSlice, Bool isField ) { Double dQP; @@ -1242,5 +1242,5 @@ Void TEncSlice::calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary, - TComPic* pcPic, const Int sliceMode, const Int sliceArgument, const UInt sliceCurEndCtuTSAddr) + TComPic* pcPic, const Int sliceMode, const Int sliceArgument) { TComSlice* pcSlice = pcPic->getSlice(getSliceIdx()); @@ -1343,5 +1343,5 @@ UInt boundingCtuTsAddrSlice; calculateBoundingCtuTsAddrForSlice(startCtuTsAddrSlice, boundingCtuTsAddrSlice, haveReachedTileBoundarySlice, pcPic, - m_pcCfg->getSliceMode(), m_pcCfg->getSliceArgument(), pcSlice->getSliceCurEndCtuTsAddr()); + m_pcCfg->getSliceMode(), m_pcCfg->getSliceArgument()); pcSlice->setSliceCurEndCtuTsAddr( boundingCtuTsAddrSlice ); pcSlice->setSliceCurStartCtuTsAddr( startCtuTsAddrSlice ); @@ -1352,5 +1352,5 @@ UInt boundingCtuTsAddrSliceSegment; calculateBoundingCtuTsAddrForSlice(startCtuTsAddrSliceSegment, boundingCtuTsAddrSliceSegment, haveReachedTileBoundarySliceSegment, pcPic, - m_pcCfg->getSliceSegmentMode(), m_pcCfg->getSliceSegmentArgument(), pcSlice->getSliceSegmentCurEndCtuTsAddr()); + m_pcCfg->getSliceSegmentMode(), m_pcCfg->getSliceSegmentArgument()); if (boundingCtuTsAddrSliceSegment>boundingCtuTsAddrSlice) { Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.h (revision 1307) @@ -105,5 +105,5 @@ Void setUpLambda(TComSlice* slice, const Double dLambda, Int iQP); #endif - Void calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary, TComPic* pcPic, const Int sliceMode, const Int sliceArgument, const UInt uiSliceCurEndCtuTSAddr); + Void calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UInt &boundingCtuTSAddrSlice, Bool &haveReachedTileBoundary, TComPic* pcPic, const Int sliceMode, const Int sliceArgument); #if SVC_EXTENSION @@ -120,5 +120,5 @@ /// preparation of slice encoding (reference marking, QP and lambda) - Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, + Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iGOPid, TComSlice*& rpcSlice, Bool isField ); Void resetQP ( TComPic* pic, Int sliceQP, Double lambda ); Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1307) @@ -286,7 +286,7 @@ { #if SVC_EXTENSION - getTrQuant()->setFlatScalingList( m_cVPS.getChromaFormatIdc(&m_cSPS, m_layerId), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); + getTrQuant()->setFlatScalingList( maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); #else - getTrQuant()->setFlatScalingList(m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths()); + getTrQuant()->setFlatScalingList(maxLog2TrDynamicRange, m_cSPS.getBitDepths()); #endif getTrQuant()->setUseScalingList(false); @@ -308,5 +308,5 @@ // infer the scaling list from the reference layer - getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); + getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); } else @@ -317,5 +317,9 @@ m_cPPS.setScalingListPresentFlag(false); - getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths()); +#if SVC_EXTENSION + getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId)); +#else + getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cSPS.getBitDepths()); +#endif #if SVC_EXTENSION } @@ -337,5 +341,5 @@ // infer the scaling list from the reference layer - getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); + getTrQuant()->setScalingList( &m_ppcTEncTop[m_cVPS.getLayerIdxInVps(refLayerId)]->getSPS()->getScalingList(), maxLog2TrDynamicRange, m_cVPS.getBitDepths(&m_cSPS, m_layerId) ); } else @@ -352,5 +356,5 @@ m_cSPS.setScalingListPresentFlag(m_cSPS.getScalingList().checkDefaultScalingList()); m_cPPS.setScalingListPresentFlag(false); - getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), m_cSPS.getChromaFormatIdc(), maxLog2TrDynamicRange, m_cSPS.getBitDepths()); + getTrQuant()->setScalingList(&(m_cSPS.getScalingList()), maxLog2TrDynamicRange, m_cSPS.getBitDepths()); #if SVC_EXTENSION } @@ -1388,5 +1392,5 @@ } -Int TEncTop::getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid ) +Int TEncTop::getReferencePictureSetIdxForSOP(Int POCCurr, Int GOPid ) { Int rpsIdx = GOPid; Index: /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 1307) @@ -189,5 +189,5 @@ TEncRateCtrl* getRateCtrl () { return &m_cRateCtrl; } Void selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid ); - Int getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid ); + Int getReferencePictureSetIdxForSOP(Int POCCurr, Int GOPid ); // ------------------------------------------------------------------------------------------------------------------- // encoder function @@ -285,4 +285,5 @@ Void printSummary(Bool isField) { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded, isField, m_printMSEBasedSequencePSNR, m_printSequenceMSE, m_cSPS.getBitDepths()); } + }; Index: /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp =================================================================== --- /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp (revision 1307) @@ -747,5 +747,5 @@ internalBitDepth[chType] = m_bitdepthShift[chType] + m_MSBExtendedBitDepth[chType]; } - ColourSpaceConvert(*pPicYuvTrueOrg, *pPicYuvUser, ipcsc, internalBitDepth, true); + ColourSpaceConvert(*pPicYuvTrueOrg, *pPicYuvUser, ipcsc, true); return true; @@ -776,5 +776,5 @@ internalBitDepth[chType] = m_bitdepthShift[chType] + m_MSBExtendedBitDepth[chType]; } - ColourSpaceConvert(*pPicYuvUser, cPicYuvCSCd, ipCSC, internalBitDepth, false); + ColourSpaceConvert(*pPicYuvUser, cPicYuvCSCd, ipCSC, false); } TComPicYuv *pPicYuv=(ipCSC==IPCOLOURSPACE_UNCHANGED) ? pPicYuvUser : &cPicYuvCSCd; @@ -876,6 +876,6 @@ internalBitDepth[chType] = m_bitdepthShift[chType] + m_MSBExtendedBitDepth[chType]; } - ColourSpaceConvert(*pPicYuvUserTop, cPicYuvTopCSCd, ipCSC, internalBitDepth, false); - ColourSpaceConvert(*pPicYuvUserBottom, cPicYuvBottomCSCd, ipCSC, internalBitDepth, false); + ColourSpaceConvert(*pPicYuvUserTop, cPicYuvTopCSCd, ipCSC, false); + ColourSpaceConvert(*pPicYuvUserBottom, cPicYuvBottomCSCd, ipCSC, false); } TComPicYuv *pPicYuvTop = (ipCSC==IPCOLOURSPACE_UNCHANGED) ? pPicYuvUserTop : &cPicYuvTopCSCd; @@ -1011,5 +1011,5 @@ // static member -Void TVideoIOYuv::ColourSpaceConvert(const TComPicYuv &src, TComPicYuv &dest, const InputColourSpaceConversion conversion, const Int bitDepths[MAX_NUM_CHANNEL_TYPE], Bool bIsForwards) +Void TVideoIOYuv::ColourSpaceConvert(const TComPicYuv &src, TComPicYuv &dest, const InputColourSpaceConversion conversion, Bool bIsForwards) { const ChromaFormat format=src.getChromaFormat(); Index: /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.h =================================================================== --- /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.h (revision 1306) +++ /branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.h (revision 1307) @@ -75,5 +75,5 @@ Bool write ( TComPicYuv* pPicYuv, const InputColourSpaceConversion ipCSC, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0, ChromaFormat fileFormat=NUM_CHROMA_FORMAT ); ///< write one YUV frame with padding parameter Bool write ( TComPicYuv* pPicYuvTop, TComPicYuv* pPicYuvBottom, const InputColourSpaceConversion ipCSC, Int confLeft=0, Int confRight=0, Int confTop=0, Int confBottom=0, ChromaFormat fileFormat=NUM_CHROMA_FORMAT, Bool isTff=false); - static Void ColourSpaceConvert(const TComPicYuv &src, TComPicYuv &dest, const InputColourSpaceConversion conversion, const Int bitDepths[MAX_NUM_CHANNEL_TYPE], Bool bIsForwards); + static Void ColourSpaceConvert(const TComPicYuv &src, TComPicYuv &dest, const InputColourSpaceConversion conversion, Bool bIsForwards); Bool isEof (); ///< check for end-of-file