Commit 7d1715a6 authored by Karl Sharman's avatar Karl Sharman
Browse files

remove macro JCTVC_Y0038_PARAMS

parent 100a2140
......@@ -884,9 +884,7 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
("IntraPeriod,-ip", m_iIntraPeriod, -1, "Intra period in frames, (-1: only first frame)")
("DecodingRefreshType,-dr", m_iDecodingRefreshType, 0, "Intra refresh type (0:none 1:CRA 2:IDR 3:RecPointSEI)")
("GOPSize,g", m_iGOPSize, 1, "GOP size of temporal structure")
#if JCTVC_Y0038_PARAMS
("ReWriteParamSetsFlag", m_bReWriteParamSetsFlag, true, "Enable rewriting of Parameter sets before every (intra) random access point")
#endif
// motion search options
("DisableIntraInInter", m_bDisableIntraPUsInInterSlices, false, "Flag to disable intra PUs in inter slices")
......
......@@ -146,9 +146,7 @@ protected:
Int m_iIntraPeriod; ///< period of I-slice (random access period)
Int m_iDecodingRefreshType; ///< random access type
Int m_iGOPSize; ///< GOP size of hierarchical structure
#if JCTVC_Y0038_PARAMS
Bool m_bReWriteParamSetsFlag; ///< Flag to enable rewriting of parameter sets at random access points
#endif
Int m_extraRPSs; ///< extra RPSs added to handle CRA
GOPEntry m_GOPList[MAX_GOP]; ///< the coding structure entries from the config file
Int m_numReorderPics[MAX_TLAYER]; ///< total number of reorder pictures
......
......@@ -130,9 +130,7 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setIntraPeriod ( m_iIntraPeriod );
m_cTEncTop.setDecodingRefreshType ( m_iDecodingRefreshType );
m_cTEncTop.setGOPSize ( m_iGOPSize );
#if JCTVC_Y0038_PARAMS
m_cTEncTop.setReWriteParamSetsFlag ( m_bReWriteParamSetsFlag );
#endif
m_cTEncTop.setGopList ( m_GOPList );
m_cTEncTop.setExtraRPSs ( m_extraRPSs );
for(Int i = 0; i < MAX_TLAYER; i++)
......
......@@ -89,7 +89,6 @@
#define DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES 1 ///< TODO: integrate this macro into a broader conformance checking system.
#define X0038_LAMBDA_FROM_QP_CAPABILITY 1 ///< This approach derives lambda from QP+QPoffset+QPoffset2. QPoffset2 is derived from QP+QPoffset using a linear model that is clipped between 0 and 3.
// To use this capability enable config parameter LambdaFromQpEnable
#define JCTVC_Y0038_PARAMS 1
#define JVET_E0059_FLOATING_POINT_QP_FIX 1 ///< Replace floating point QP with a source-file frame number.
#define JVET_G0101_QP_SWITCHING 1 ///< After switching POC, increase base QP instead of frame level QP.
......
......@@ -173,9 +173,7 @@ protected:
//====== Coding Structure ========
UInt m_uiIntraPeriod; // TODO: make this an Int - it can be -1!
UInt m_uiDecodingRefreshType; ///< the type of decoding refresh employed for the random access.
#if JCTVC_Y0038_PARAMS
Bool m_bReWriteParamSetsFlag;
#endif
Int m_iGOPSize;
GOPEntry m_GOPList[MAX_GOP];
Int m_extraRPSs;
......@@ -614,9 +612,7 @@ public:
//====== Coding Structure ========
Void setIntraPeriod ( Int i ) { m_uiIntraPeriod = (UInt)i; }
Void setDecodingRefreshType ( Int i ) { m_uiDecodingRefreshType = (UInt)i; }
#if JCTVC_Y0038_PARAMS
Void setReWriteParamSetsFlag ( Bool b ) { m_bReWriteParamSetsFlag = b; }
#endif
Void setGOPSize ( Int i ) { m_iGOPSize = i; }
Void setGopList ( const GOPEntry GOPList[MAX_GOP] ) { for ( Int i = 0; i < MAX_GOP; i++ ) m_GOPList[i] = GOPList[i]; }
Void setExtraRPSs ( Int i ) { m_extraRPSs = i; }
......@@ -721,9 +717,7 @@ public:
//==== Coding Structure ========
UInt getIntraPeriod () { return m_uiIntraPeriod; }
UInt getDecodingRefreshType () { return m_uiDecodingRefreshType; }
#if JCTVC_Y0038_PARAMS
Bool getReWriteParamSetsFlag () { return m_bReWriteParamSetsFlag; }
#endif
Int getGOPSize () { return m_iGOPSize; }
Int getMaxDecPicBuffering (UInt tlayer) { return m_maxDecPicBuffering[tlayer]; }
Int getNumReorderPics (UInt tlayer) { return m_numReorderPics[tlayer]; }
......
......@@ -1803,7 +1803,6 @@ Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rc
m_pcEntropyCoder->setEntropyCoder ( m_pcCavlcCoder );
// write various parameter sets
#if JCTVC_Y0038_PARAMS
//bool writePS = m_bSeqFirst || (m_pcCfg->getReWriteParamSetsFlag() && (pcPic->getSlice(0)->getSliceType() == I_SLICE));
bool writePS = m_bSeqFirst || (m_pcCfg->getReWriteParamSetsFlag() && (pcSlice->isIRAP()));
if (writePS)
......@@ -1813,11 +1812,6 @@ Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rc
actualTotalBits += xWriteParameterSets(accessUnit, pcSlice, writePS);
if (writePS)
#else
actualTotalBits += xWriteParameterSets(accessUnit, pcSlice, m_bSeqFirst);
if ( m_bSeqFirst )
#endif
{
// create prefix SEI messages at the beginning of the sequence
assert(leadingSeiMessages.empty());
......
......@@ -1366,13 +1366,11 @@ Void TEncCfg::xCheckGSParameters()
}
}
#if JCTVC_Y0038_PARAMS
Void TEncTop::setParamSetChanged(Int spsId, Int ppsId)
{
m_ppsMap.setChangedFlag(ppsId);
m_spsMap.setChangedFlag(spsId);
}
#endif
Bool TEncTop::PPSNeedsWriting(Int ppsId)
{
......
......@@ -156,9 +156,7 @@ public:
Void selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid );
Int getReferencePictureSetIdxForSOP(Int POCCurr, Int GOPid );
#if JCTVC_Y0038_PARAMS
Void setParamSetChanged(Int spsId, Int ppsId);
#endif
Bool PPSNeedsWriting(Int ppsId);
Bool SPSNeedsWriting(Int spsId);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment