Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/CommonDef.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/CommonDef.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/CommonDef.h (revision 651) @@ -61,7 +61,7 @@ #if H_MV #define NV_VERSION "8.1" ///< Current software version -#define HM_VERSION "11.0" ///< +#define HM_VERSION "12.0" ///< #else -#define NV_VERSION "11.0" ///< Current software version +#define NV_VERSION "12.0" ///< Current software version #endif Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComMv.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComMv.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComMv.h (revision 651) @@ -40,4 +40,5 @@ #include "CommonDef.h" +#include //! \ingroup TLibCommon Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.cpp (revision 651) @@ -50,5 +50,4 @@ , m_bUsedByCurr (false) , m_bIsLongTerm (false) -, m_bIsUsedAsLongTerm (false) , m_apcPicSym (NULL) , m_pcPicYuvPred (NULL) Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPic.h (revision 651) @@ -61,5 +61,4 @@ Bool m_bUsedByCurr; // Used by current picture Bool m_bIsLongTerm; // IS long term picture - Bool m_bIsUsedAsLongTerm; // long term picture is used as reference before TComPicSym* m_apcPicSym; // Symbol @@ -83,4 +82,7 @@ Window m_defaultDisplayWindow; + bool m_isTop; + bool m_isField; + std::vector > m_vSliceCUDataLink; @@ -208,4 +210,12 @@ TComPicYuv* getYuvPicBufferForIndependentBoundaryProcessing() {return m_pNDBFilterYuvTmp;} std::vector& getOneSliceCUDataForNDBFilter (Int sliceID) { return m_vSliceCUDataLink[sliceID];} + + + /* field coding parameters*/ + + Void setTopField(bool b) {m_isTop = b;} + bool isTopField() {return m_isTop;} + Void setField(bool b) {m_isField = b;} + bool isField() {return m_isField;} #if H_MV Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.cpp (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.cpp (revision 651) @@ -61,5 +61,4 @@ ,m_uiNumAllocatedSlice (0) ,m_apcTComDataCU (NULL) -,m_iTileBoundaryIndependenceIdr (0) ,m_iNumColumnsMinus1 (0) ,m_iNumRowsMinus1(0) Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPicSym.h (revision 651) @@ -99,6 +99,5 @@ UInt m_uiNumAllocatedSlice; TComDataCU** m_apcTComDataCU; ///< array of CU data - - Int m_iTileBoundaryIndependenceIdr; + Int m_iNumColumnsMinus1; Int m_iNumRowsMinus1; Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComPrediction.cpp (revision 651) @@ -1261,5 +1261,5 @@ Int k, l, bottomLeft, topRight; Int horPred; - Int leftColumn[MAX_CU_SIZE], topRow[MAX_CU_SIZE], bottomRow[MAX_CU_SIZE], rightColumn[MAX_CU_SIZE]; + Int leftColumn[MAX_CU_SIZE+1], topRow[MAX_CU_SIZE+1], bottomRow[MAX_CU_SIZE], rightColumn[MAX_CU_SIZE]; UInt blkSize = width; UInt offset2D = width; Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRdCost.h (revision 651) @@ -148,6 +148,4 @@ private: // for distortion - Int m_iBlkWidth; - Int m_iBlkHeight; #if AMP_SAD Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComRom.cpp (revision 651) @@ -55,10 +55,9 @@ ::memset( g_aucConvertToBit, -1, sizeof( g_aucConvertToBit ) ); c=0; - for ( i=4; i& rcListPic) +Void TComSlice::checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, NalUnitType& associatedIRAPType, TComList& rcListPic) { for(Int i = 0; i < pReferencePictureSet->getNumberOfNegativePictures()+pReferencePictureSet->getNumberOfPositivePictures(); i++) @@ -832,10 +832,9 @@ { pocCRA = getPOC(); - prevRAPisBLA = false; } else if ( getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found { pocCRA = getPOC(); - prevRAPisBLA = false; + associatedIRAPType = getNalUnitType(); } else if ( getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP @@ -844,5 +843,5 @@ { pocCRA = getPOC(); - prevRAPisBLA = true; + associatedIRAPType = getNalUnitType(); } } @@ -869,4 +868,5 @@ { TComPic* rpcPic; + setAssociatedIRAPPOC(pocCRA); Int pocCurr = getPOC(); @@ -1054,5 +1054,5 @@ } -Int TComSlice::m_prevPOC = 0; +Int TComSlice::m_prevTid0POC = 0; /** Function for setting the slice's temporal layer ID and corresponding temporal_layer_switching_point_flag. @@ -1109,4 +1109,166 @@ } + +Void TComSlice::checkLeadingPictureRestrictions(TComList& rcListPic) +{ + TComPic* rpcPic; + + Int nalUnitType = this->getNalUnitType(); + + // When a picture is a leading picture, it shall be a RADL or RASL picture. + if(this->getAssociatedIRAPPOC() > this->getPOC()) + { + // Do not check IRAP pictures since they may get a POC lower than their associated IRAP + if(nalUnitType < NAL_UNIT_CODED_SLICE_BLA_W_LP || + nalUnitType > NAL_UNIT_RESERVED_IRAP_VCL23) + { + assert(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R); + } + } + + // When a picture is a trailing picture, it shall not be a RADL or RASL picture. + if(this->getAssociatedIRAPPOC() < this->getPOC()) + { + assert(nalUnitType != NAL_UNIT_CODED_SLICE_RASL_N && + nalUnitType != NAL_UNIT_CODED_SLICE_RASL_R && + nalUnitType != NAL_UNIT_CODED_SLICE_RADL_N && + nalUnitType != NAL_UNIT_CODED_SLICE_RADL_R); + } + + // No RASL pictures shall be present in the bitstream that are associated + // with a BLA picture having nal_unit_type equal to BLA_W_RADL or BLA_N_LP. + if(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R) + { + assert(this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_BLA_W_RADL && + this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_BLA_N_LP); + } + + // No RASL pictures shall be present in the bitstream that are associated with + // an IDR picture. + if(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R) + { + assert(this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_IDR_N_LP && + this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_IDR_W_RADL); + } + + // No RADL pictures shall be present in the bitstream that are associated with + // a BLA picture having nal_unit_type equal to BLA_N_LP or that are associated + // with an IDR picture having nal_unit_type equal to IDR_N_LP. + if(nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R) + { + assert(this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_BLA_N_LP && + this->getAssociatedIRAPType() != NAL_UNIT_CODED_SLICE_IDR_N_LP); + } + + // loop through all pictures in the reference picture buffer + TComList::iterator iterPic = rcListPic.begin(); + while ( iterPic != rcListPic.end()) + { + rpcPic = *(iterPic++); + if (rpcPic->getPOC() == this->getPOC()) + { + continue; + } + + // Any picture that has PicOutputFlag equal to 1 that precedes an IRAP picture + // in decoding order shall precede the IRAP picture in output order. + // (Note that any picture following in output order would be present in the DPB) + if(rpcPic->getSlice(0)->getPicOutputFlag() == 1) + { + if(nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP || + nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP || + nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL || + nalUnitType == NAL_UNIT_CODED_SLICE_CRA || + nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP || + nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL) + { + assert(rpcPic->getPOC() < this->getPOC()); + } + } + + // Any picture that has PicOutputFlag equal to 1 that precedes an IRAP picture + // in decoding order shall precede any RADL picture associated with the IRAP + // picture in output order. + if(rpcPic->getSlice(0)->getPicOutputFlag() == 1) + { + if((nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R)) + { + // rpcPic precedes the IRAP in decoding order + if(this->getAssociatedIRAPPOC() > rpcPic->getSlice(0)->getAssociatedIRAPPOC()) + { + // rpcPic must not be the IRAP picture + if(this->getAssociatedIRAPPOC() != rpcPic->getPOC()) + { + assert(rpcPic->getPOC() < this->getPOC()); + } + } + } + } + + // When a picture is a leading picture, it shall precede, in decoding order, + // all trailing pictures that are associated with the same IRAP picture. + if(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RADL_R) + { + if(rpcPic->getSlice(0)->getAssociatedIRAPPOC() == this->getAssociatedIRAPPOC()) + { + // rpcPic is a picture that preceded the leading in decoding order since it exist in the DPB + // rpcPic would violate the constraint if it was a trailing picture + assert(rpcPic->getPOC() <= this->getAssociatedIRAPPOC()); + } + } + + // Any RASL picture associated with a CRA or BLA picture shall precede any + // RADL picture associated with the CRA or BLA picture in output order + if(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R) + { + if((this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_BLA_N_LP || + this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_BLA_W_LP || + this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL || + this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_CRA) && + this->getAssociatedIRAPPOC() == rpcPic->getSlice(0)->getAssociatedIRAPPOC()) + { + if(rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_RADL_N || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_RADL_R) + { + assert(rpcPic->getPOC() > this->getPOC()); + } + } + } + + // Any RASL picture associated with a CRA picture shall follow, in output + // order, any IRAP picture that precedes the CRA picture in decoding order. + if(nalUnitType == NAL_UNIT_CODED_SLICE_RASL_N || + nalUnitType == NAL_UNIT_CODED_SLICE_RASL_R) + { + if(this->getAssociatedIRAPType() == NAL_UNIT_CODED_SLICE_CRA) + { + if(rpcPic->getSlice(0)->getPOC() < this->getAssociatedIRAPPOC() && + (rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_N_LP || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || + rpcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)) + { + assert(this->getPOC() > rpcPic->getSlice(0)->getPOC()); + } + } + } + } +} + + + /** Function for applying picture marking based on the Reference Picture Set in pReferencePictureSet. */ @@ -1115,4 +1277,6 @@ TComPic* rpcPic; Int i, isReference; + + checkLeadingPictureRestrictions(rcListPic); // loop through all pictures in the reference picture buffer @@ -1151,5 +1315,4 @@ else { - if(rpcPic->getIsLongTerm() && (rpcPic->getPicSym()->getSlice(0)->getPOC()%(1<getPicSym()->getSlice(0)->getSPS()->getBitsForPOC())) == pReferencePictureSet->getPOC(i)%(1<getPicSym()->getSlice(0)->getSPS()->getBitsForPOC())) { isReference = 1; @@ -1211,5 +1374,4 @@ else { - if(rpcPic->getIsLongTerm() && (rpcPic->getPicSym()->getSlice(0)->getPOC()%(1<getPicSym()->getSlice(0)->getSPS()->getBitsForPOC())) == pReferencePictureSet->getPOC(i)%(1<getPicSym()->getSlice(0)->getSPS()->getBitsForPOC()) && rpcPic->getSlice(0)->isReferenced()) { isAvailable = 1; @@ -1230,6 +1392,6 @@ if (!pReferencePictureSet->getCheckLTMSBPresent(i)) { - curPoc = curPoc % pocCycle; - refPoc = refPoc % pocCycle; + curPoc = curPoc & (pocCycle - 1); + refPoc = refPoc & (pocCycle - 1); } @@ -2437,5 +2599,4 @@ TComScalingList::TComScalingList() { - m_useTransformSkip = false; init(); } Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComSlice.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComSlice.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComSlice.h (revision 651) @@ -155,6 +155,4 @@ Void setScalingListPresentFlag (Bool b) { m_scalingListPresentFlag = b; } Bool getScalingListPresentFlag () { return m_scalingListPresentFlag; } - Bool getUseTransformSkip () { return m_useTransformSkip; } - Void setUseTransformSkip (Bool b) { m_useTransformSkip = b; } Int* getScalingListAddress (UInt sizeId, UInt listId) { return m_scalingListCoef[sizeId][listId]; } //!< get matrix coefficient Bool checkPredMode (UInt sizeId, UInt listId); @@ -182,5 +180,4 @@ UInt m_predMatrixId [SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< reference list index Int *m_scalingListCoef [SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< quantization matrix - Bool m_useTransformSkip; //!< transform skipping flag for setting default scaling matrix for 4x4 }; @@ -1617,5 +1614,7 @@ #endif Int m_iLastIDR; - static Int m_prevPOC; + Int m_iAssociatedIRAP; + NalUnitType m_iAssociatedIRAPType; + static Int m_prevTid0POC; TComReferencePictureSet *m_pcRPS; TComReferencePictureSet m_LocalRPS; @@ -1776,8 +1775,12 @@ Void setRPSidx ( Int iBDidx ) { m_iBDidx = iBDidx; } Int getRPSidx () { return m_iBDidx; } - Int getPrevPOC () { return m_prevPOC; } + Int getPrevTid0POC () { return m_prevTid0POC; } TComRefPicListModification* getRefPicListModification() { return &m_RefPicListModification; } Void setLastIDR(Int iIDRPOC) { m_iLastIDR = iIDRPOC; } Int getLastIDR() { return m_iLastIDR; } + Void setAssociatedIRAPPOC(Int iAssociatedIRAPPOC) { m_iAssociatedIRAP = iAssociatedIRAPPOC; } + Int getAssociatedIRAPPOC() { return m_iAssociatedIRAP; } + Void setAssociatedIRAPType(NalUnitType associatedIRAPType) { m_iAssociatedIRAPType = associatedIRAPType; } + NalUnitType getAssociatedIRAPType() { return m_iAssociatedIRAPType; } SliceType getSliceType () { return m_eSliceType; } Int getPOC () { return m_iPOC; } @@ -1824,4 +1827,5 @@ Void checkColRefIdx (UInt curSliceIdx, TComPic* pic); Bool getIsUsedAsLongTerm (Int i, Int j) { return m_bIsUsedAsLongTerm[i][j]; } + Void setIsUsedAsLongTerm (Int i, Int j, Bool value) { m_bIsUsedAsLongTerm[i][j] = value; } Bool getCheckLDC () { return m_bCheckLDC; } Bool getMvdL1ZeroFlag () { return m_bLMvdL1Zero; } @@ -1830,5 +1834,6 @@ Void setReferenced(Bool b) { m_bRefenced = b; } Bool isReferenced() { return m_bRefenced; } - Void setPOC ( Int i ) { m_iPOC = i; if(getTLayer()==0) m_prevPOC=i; } + Bool isReferenceNalu() { return ((getNalUnitType() <= NAL_UNIT_RESERVED_VCL_R15) && (getNalUnitType()%2 != 0)) || ((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_RESERVED_IRAP_VCL23) ); } + Void setPOC ( Int i ) { m_iPOC = i; if ((getTLayer()==0) && (isReferenceNalu() && (getNalUnitType()!=NAL_UNIT_CODED_SLICE_RASL_R)&& (getNalUnitType()!=NAL_UNIT_CODED_SLICE_RADL_R))) {m_prevTid0POC=i;} } Void setNalUnitType ( NalUnitType e ) { m_eNalUnitType = e; } NalUnitType getNalUnitType () const { return m_eNalUnitType; } @@ -1836,5 +1841,5 @@ Bool getIdrPicFlag () { return getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP; } Bool isIRAP () const { return (getNalUnitType() >= 16) && (getNalUnitType() <= 23); } - Void checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, Bool& prevRAPisBLA, TComList& rcListPic); + Void checkCRA(TComReferencePictureSet *pReferencePictureSet, Int& pocCRA, NalUnitType& associatedIRAPType, TComList& rcListPic); Void decodingRefreshMarking(Int& pocCRA, Bool& bRefreshPending, TComList& rcListPic); Void setSliceType ( SliceType e ) { m_eSliceType = e; } @@ -1912,4 +1917,5 @@ Void setTLayerInfo( UInt uiTLayer ); Void decodingMarking( TComList& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum ); + Void checkLeadingPictureRestrictions( TComList& rcListPic ); Void applyReferencePictureSet( TComList& rcListPic, TComReferencePictureSet *RPSList); #if H_MV Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComWeightPrediction.h =================================================================== --- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComWeightPrediction.h (revision 650) +++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComWeightPrediction.h (revision 651) @@ -53,6 +53,4 @@ class TComWeightPrediction { - wpScalingParam m_wp0[3], m_wp1[3]; - public: TComWeightPrediction();