Commit 981f0f18 authored by Frank Bossen's avatar Frank Bossen

Remove JVET_K0072 macro

parent 462e875d
......@@ -445,11 +445,9 @@ void EncApp::xInitLibCfg()
m_cEncLib.setUseScalingListId ( m_useScalingListId );
m_cEncLib.setScalingListFileName ( m_scalingListFileName );
#endif
#if JVET_K0072
m_cEncLib.setDepQuantEnabledFlag ( m_depQuantEnabledFlag);
#if HEVC_USE_SIGN_HIDING
m_cEncLib.setSignDataHidingEnabledFlag ( m_signDataHidingEnabledFlag);
#endif
#endif
m_cEncLib.setUseRateCtrl ( m_RCEnableRateControl );
m_cEncLib.setTargetBitrate ( m_RCTargetBitrate );
......
......@@ -1057,15 +1057,9 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("ScalingList", m_useScalingListId, SCALING_LIST_OFF, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
("ScalingListFile", m_scalingListFileName, string(""), "Scaling list file name. Use an empty string to produce help.")
#endif
#if JVET_K0072
("DepQuant", m_depQuantEnabledFlag, true )
#if HEVC_USE_SIGN_HIDING
("SignHideFlag,-SBH", m_signDataHidingEnabledFlag, false )
#endif
#else
#if HEVC_USE_SIGN_HIDING
("SignHideFlag,-SBH", m_signDataHidingEnabledFlag, true)
#endif
#endif
("MaxNumMergeCand", m_maxNumMergeCand, 5u, "Maximum number of merge candidates")
/* Misc. */
......@@ -1963,7 +1957,6 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_SubPuMvpLog2Size < MIN_CU_LOG2, "SubPuMvpLog2Size must be 2 or greater." );
xConfirmPara( m_SubPuMvpLog2Size > 6, "SubPuMvpLog2Size must be 6 or smaller." );
#endif
#if JVET_K0072
if( m_depQuantEnabledFlag )
{
xConfirmPara( !m_useRDOQ || !m_useRDOQTS, "RDOQ and RDOQTS must be equal to 1 if dependent quantization is enabled" );
......@@ -1971,7 +1964,6 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_signDataHidingEnabledFlag, "SignHideFlag must be equal to 0 if dependent quantization is enabled" );
#endif
}
#endif
#if !JVET_K0220_ENC_CTRL
xConfirmPara( m_useSaveLoadEncInfo && !m_QTBT, "Encoder decision saving can only be applied with QTBT" );
#endif
......@@ -2029,9 +2021,6 @@ bool EncAppCfg::xCheckParameter()
}
#endif
#if JVET_K0072
#else
#endif
xConfirmPara( m_useAMaxBT && !m_QTBT, "AMaxBT can only be used with QTBT!" );
......@@ -3158,9 +3147,7 @@ void EncAppCfg::xPrintParameter()
#endif
msg( VERBOSE, "TMVPMode:%d ", m_TMVPModeId );
#if JVET_K0072
msg( VERBOSE, " DQ:%d ", m_depQuantEnabledFlag);
#endif
#if HEVC_USE_SIGN_HIDING
msg( VERBOSE, " SignBitHidingFlag:%d ", m_signDataHidingEnabledFlag);
#endif
......@@ -3192,9 +3179,6 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "IMV:%d ", m_ImvMode );
if( !m_QTBT ) msg( VERBOSE, "IMVMaxCand:%d ", m_ImvMaxCand );
#endif
#if JVET_K0072
#else
#endif
#if JVET_K0346 || JVET_K_AFFINE
#if !REMOVE_MV_ADAPT_PREC
msg(VERBOSE, "HighPrecMv:%d ", m_highPrecisionMv);
......
......@@ -429,11 +429,9 @@ protected:
uint32_t m_maxNumMergeCand; ///< Max number of merge candidates
int m_TMVPModeId;
#if JVET_K0072
bool m_depQuantEnabledFlag;
#if HEVC_USE_SIGN_HIDING
bool m_signDataHidingEnabledFlag;
#endif
#endif
bool m_RCEnableRateControl; ///< enable rate control or not
int m_RCTargetBitrate; ///< target bitrate when rate control is enabled
......
......@@ -101,9 +101,7 @@ enum CodingStatisticsType
STATS__CABAC_BITS__AFFINE_TYPE,
#endif
#endif
#if JVET_K0072
STATS__CABAC_BITS__PAR_FLAG,
#endif
STATS__CABAC_BITS__ALF,
#if JVET_K0357_AMVR
STATS__CABAC_BITS__IMV_FLAG,
......@@ -164,9 +162,7 @@ static inline const char* getName(CodingStatisticsType name)
"CABAC_BITS__LAST_SIG_X_Y",
"CABAC_BITS__SIG_COEFF_GROUP_FLAG",
"CABAC_BITS__SIG_COEFF_MAP_FLAG",
#if JVET_K0072
"CABAC_BITS__PAR_FLAG",
#endif
"CABAC_BITS__GT1_FLAG",
"CABAC_BITS__GT2_FLAG",
"CABAC_BITS__SIGN_BIT",
......
This diff is collapsed.
This diff is collapsed.
......@@ -407,14 +407,12 @@ const CtxSet ContextSetCfg::QtCbf[] =
{ 149, 107, 167, 154, 154, },
{ 94, 138, 182, 154, 154, },
}),
#if JVET_K0072
ContextSetCfg::addCtxSet
({
{ 149, 149, },
{ 149, 149, },
{ 94, 94, },
}),
#endif
};
const CtxSet ContextSetCfg::SigCoeffGroup[] =
......@@ -447,7 +445,6 @@ const CtxSet ContextSetCfg::SigCoeffGroup[] =
const CtxSet ContextSetCfg::SigFlag[] =
{
#if JVET_K0072
ContextSetCfg::addCtxSet
({
{ 106, 167, 182, 124, 139, 169, 134, 167, 197, 183, 183, 184, 209, 198, 168, 168, 183, 170, CNU, CNU, },
......@@ -484,36 +481,9 @@ const CtxSet ContextSetCfg::SigFlag[] =
{ 167, 155, 159, 157, 157, 158, 182, 223, 223, 223, 223, 223, },
{ 181, 159, 143, 232, 143, 173, 169, 237, 223, 223, 238, 253, },
}),
#else
ContextSetCfg::addCtxSet
({
{ 170, 154, 139, 153, 139, 123, 123, 63, 124, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 140, },
{ 155, 154, 139, 153, 139, 123, 123, 63, 153, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 166, 183, 140, 136, 153, 154, 140, },
{ 111, 111, 125, 110, 110, 94, 124, 108, 124, 107, 125, 141, 179, 153, 125, 107, 125, 141, 179, 153, 125, 107, 125, 141, 179, 153, 125, 141, },
}),
ContextSetCfg::addCtxSet
({
{ 170, 153, 138, 138, 122, 121, 122, 121, 167, 151, 183, 140, 151, 183, 140, 140, },
{ 170, 153, 123, 123, 107, 121, 107, 121, 167, 151, 183, 140, 151, 183, 140, 140, },
{ 140, 139, 182, 182, 152, 136, 152, 136, 153, 136, 139, 111, 136, 139, 111, 111, },
}),
ContextSetCfg::addCtxSet
({
{ 107, 139, 154, 140, 140, 141, 108, 154, 125, 155, 126, 127, 139, 155, 155, 141, 156, 143, 107, 139, 154, 140, 140, 141, 108, 154, 125, 155, 126, 127, 139, 155, 155, 141, 156, 143, 107, 139, 154, 140, 140, 141, 108, 154, 125, 155, 126, 127, 139, 155, 155, 141, 156, 143, },
{ 121, 167, 153, 139, 154, 140, 137, 168, 139, 154, 169, 155, 167, 169, 169, 184, 199, 156, 121, 167, 153, 139, 154, 140, 137, 168, 139, 154, 169, 155, 167, 169, 169, 184, 199, 156, 121, 167, 153, 139, 154, 140, 137, 168, 139, 154, 169, 155, 167, 169, 169, 184, 199, 156, },
{ 152, 139, 154, 154, 169, 155, 182, 154, 169, 184, 155, 141, 168, 214, 199, 170, 170, 171, 152, 139, 154, 154, 169, 155, 182, 154, 169, 184, 155, 141, 168, 214, 199, 170, 170, 171, 152, 139, 154, 154, 169, 155, 182, 154, 169, 184, 155, 141, 168, 214, 199, 170, 170, 171, },
}),
ContextSetCfg::addCtxSet
({
{ 137, 154, 154, 155, 155, 156, 124, 185, 156, 171, 142, 158, },
{ 136, 153, 139, 154, 125, 140, 122, 154, 184, 185, 171, 157, },
{ 167, 154, 169, 140, 155, 141, 153, 171, 185, 156, 171, 172, },
}),
#endif
};
#if JVET_K0072
const CtxSet ContextSetCfg::ParFlag[] =
{
ContextSetCfg::addCtxSet
......@@ -557,7 +527,6 @@ const CtxSet ContextSetCfg::GtxFlag[] =
{ 147, 73, 164, 151, 107, 109, 120, 152, 140, 185, 111, },
}),
};
#endif
const CtxSet ContextSetCfg::LastX[] =
{
......@@ -591,67 +560,6 @@ const CtxSet ContextSetCfg::LastY[] =
}),
};
#if JVET_K0072
#else
const CtxSet ContextSetCfg::GreaterOneFlag[] =
{
ContextSetCfg::addCtxSet
({
{ 154, 196, 167, 167, },
{ 154, 196, 196, 167, },
{ 140, 92, 137, 138, },
}),
ContextSetCfg::addCtxSet
({
{ 154, 152, 167, 182, },
{ 154, 152, 167, 182, },
{ 140, 152, 138, 139, },
}),
ContextSetCfg::addCtxSet
({
{ 182, 134, 149, 136, },
{ 182, 134, 149, 136, },
{ 153, 74, 149, 92, },
}),
ContextSetCfg::addCtxSet
({
{ 153, 121, 136, 122, },
{ 153, 121, 136, 137, },
{ 139, 107, 122, 152, },
}),
ContextSetCfg::addCtxSet
({
{ 169, 208, 166, 167, },
{ 169, 194, 166, 167, },
{ 140, 179, 166, 182, },
}),
ContextSetCfg::addCtxSet
({
{ 154, 152, 167, 182, },
{ 154, 167, 137, 182, },
{ 140, 227, 122, 197, },
}),
ContextSetCfg::addCtxSet
({
{ 121, 135, 123, 124, 139, 125, 92, 124, 154, 125, 155, 138, 169, 155, 170, 156, },
{ 165, 75, 152, 153, 139, 154, 121, 138, 139, 154, 140, 167, 183, 169, 170, 156, },
{ 196, 105, 152, 153, 139, 154, 136, 138, 139, 169, 140, 196, 183, 169, 170, 171, },
}),
ContextSetCfg::addCtxSet
({
{ 166, 152, 140, 170, 171, 157, },
{ 193, 181, 169, 170, 171, 172, },
{ 195, 181, 169, 170, 156, 157, },
}),
};
const CtxSet ContextSetCfg::GreaterTwoFlag = ContextSetCfg::addCtxSet
({
{ 107, 167, 91, 107, 107, 167,},
{ 107, 167, 91, 122, 107, 167,},
{ 138, 153, 136, 167, 152, 152,},
});
#endif
const CtxSet ContextSetCfg::MVPIdx = ContextSetCfg::addCtxSet
({
......
......@@ -175,26 +175,13 @@ public:
static const CtxSet Mvd;
static const CtxSet TransSubdivFlag;
static const CtxSet QtRootCbf;
#if JVET_K0072
static const CtxSet QtCbf [3]; // [ channel ]
#else
static const CtxSet QtCbf [2]; // [ ChannelType ]
#endif
static const CtxSet SigCoeffGroup [4]; // [ ChannelType ]
#if JVET_K0072
#else
static const CtxSet SigFlag [4]; // [ ChannelType ]
#endif
static const CtxSet LastX [2]; // [ ChannelType ]
static const CtxSet LastY [2]; // [ ChannelType ]
#if JVET_K0072
static const CtxSet SigFlag [6]; // [ ChannelType + State ]
static const CtxSet ParFlag [2]; // [ ChannelType ]
static const CtxSet GtxFlag [4]; // [ ChannelType + x ]
#else
static const CtxSet GreaterOneFlag [8]; // [ ContextSet ]
static const CtxSet GreaterTwoFlag;
#endif
static const CtxSet MVPIdx;
static const CtxSet SaoMergeFlag;
static const CtxSet SaoTypeIdx;
......
......@@ -41,7 +41,6 @@
#if JVET_K0072
namespace DQIntern
......@@ -1432,6 +1431,5 @@ void DepQuant::dequant( const TransformUnit &tu, CoeffBuf &dstCoeff, const Compo
}
}
#endif
......@@ -45,7 +45,6 @@
#if JVET_K0072
class DepQuant : public QuantRDOQ
......@@ -62,7 +61,6 @@ private:
};
#endif
#endif // __DEPQUANT__
......@@ -430,9 +430,6 @@ void Quant::dequant(const TransformUnit &tu,
void Quant::init( uint32_t uiMaxTrSize,
bool bUseRDOQ,
bool bUseRDOQTS,
#if JVET_K0072
#else
#endif
#if T0196_SELECTIVE_RDOQ
bool useSelectiveRDOQ
#endif
......@@ -448,9 +445,6 @@ void Quant::init( uint32_t uiMaxTrSize,
#if T0196_SELECTIVE_RDOQ
m_useSelectiveRDOQ = useSelectiveRDOQ;
#endif
#if JVET_K0072
#else
#endif
}
#if ENABLE_SPLIT_PARALLELISM
......@@ -721,12 +715,6 @@ void Quant::xDestroyScalingList()
void Quant::quant(TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx& ctx)
{
const SPS &sps = *tu.cs->sps;
#if JVET_K0072
#else
#if HEVC_USE_SIGN_HIDING
const PPS &pps = *tu.cs->pps;
#endif
#endif
const CompArea &rect = tu.blocks[compID];
#if HEVC_USE_SCALING_LISTS || HEVC_USE_SIGN_HIDING
const uint32_t uiWidth = rect.width;
......@@ -742,11 +730,7 @@ void Quant::quant(TransformUnit &tu, const ComponentID &compID, const CCoeffBuf
{
#if HEVC_USE_SIGN_HIDING
#if JVET_K0072
CoeffCodingContext cctx(tu, compID, tu.cs->slice->getSignDataHidingEnabledFlag());
#else
CoeffCodingContext cctx(tu, compID, pps.getSignDataHidingEnabledFlag());
#endif
#else
CoeffCodingContext cctx(tu, compID);
#endif
......
......@@ -92,9 +92,6 @@ public:
virtual void init( uint32_t uiMaxTrSize,
bool useRDOQ = false,
bool useRDOQTS = false,
#if JVET_K0072
#else
#endif
#if T0196_SELECTIVE_RDOQ
bool useSelectiveRDOQ = false
#endif
......@@ -150,9 +147,6 @@ protected:
#if T0196_SELECTIVE_RDOQ
bool m_useSelectiveRDOQ;
#endif
#if JVET_K0072
#else
#endif
#if HEVC_USE_SCALING_LISTS
private:
void xInitScalingList ( const Quant* other );
......
This diff is collapsed.
......@@ -82,7 +82,6 @@ private:
// RDOQ functions
void xRateDistOptQuant(TransformUnit &tu, const ComponentID &compID, const CCoeffBuf &pSrc, TCoeff &uiAbsSum, const QpParam &cQP, const Ctx &ctx);
#if JVET_K0072
inline uint32_t xGetCodedLevel( double& rd64CodedCost,
double& rd64CodedCost0,
double& rd64CodedCostSig,
......@@ -105,34 +104,6 @@ private:
const uint16_t ui16AbsGoRice,
const bool useLimitedPrefixLength,
const int maxLog2TrDynamicRange ) const;
#else
inline uint32_t xGetCodedLevel ( double& rd64CodedCost,
double& rd64CodedCost0,
double& rd64CodedCostSig,
Intermediate_Int lLevelDouble,
uint32_t uiMaxAbsLevel,
const BinFracBits* fracBitsSig,
const BinFracBits& fracBitsOne,
const BinFracBits& fracBitsAbs,
uint16_t ui16AbsGoRice,
uint32_t c1Idx,
uint32_t c2Idx,
int iQBits,
double errorScale,
bool bLast,
bool useLimitedPrefixLength,
const int maxLog2TrDynamicRange
) const;
inline int xGetICRate ( const uint32_t uiAbsLevel,
const BinFracBits& fracBitsOne,
const BinFracBits& fracBitsAbs,
const uint16_t ui16AbsGoRice,
const uint32_t c1Idx,
const uint32_t c2Idx,
const bool useLimitedPrefixLength,
const int maxLog2TrDynamicRange
) const;
#endif
inline double xGetRateLast ( const int* lastBitsX, const int* lastBitsY,
unsigned PosX, unsigned PosY ) const;
......
......@@ -604,7 +604,6 @@ const uint32_t g_uiMinInGroup[LAST_SIGNIFICANT_GROUPS] = { 0,1,2,3,4,6,8,12,16,2
const uint32_t g_uiGroupIdx[MAX_TU_SIZE] = { 0,1,2,3,4,4,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,9, 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11
,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12
,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13 };
#if JVET_K0072
const uint32_t g_auiGoRicePars[ 32 ] =
{
0, 0, 0, 0,
......@@ -612,7 +611,6 @@ const uint32_t g_auiGoRicePars[ 32 ] =
0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 2, 2, 2, 2, 2, 2, 2
};
#endif
const uint32_t g_auiGoRiceRange[MAX_GR_ORDER_RESIDUAL] =
{
6, 5, 6, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION, COEF_REMAIN_BIN_REDUCTION
......
......@@ -94,9 +94,7 @@ extern const uint32_t ctxIndMap4x4[4*4];
extern const uint32_t g_uiGroupIdx[ MAX_TU_SIZE ];
extern const uint32_t g_uiMinInGroup[ LAST_SIGNIFICANT_GROUPS ];
#if JVET_K0072
extern const uint32_t g_auiGoRicePars [ 32 ];
#endif
extern const uint32_t g_auiGoRiceRange[ MAX_GR_ORDER_RESIDUAL ]; //!< maximum value coded with Rice codes
// ====================================================================================================================
......
......@@ -68,12 +68,10 @@ Slice::Slice()
, m_deblockingFilterBetaOffsetDiv2( 0 )
, m_deblockingFilterTcOffsetDiv2 ( 0 )
, m_pendingRasInit ( false )
#if JVET_K0072
, m_depQuantEnabledFlag ( false )
#if HEVC_USE_SIGN_HIDING
, m_signDataHidingEnabledFlag ( false )
#endif
#endif
, m_bCheckLDC ( false )
, m_iSliceQpDelta ( 0 )
, m_iDepth ( 0 )
......@@ -1654,9 +1652,6 @@ SPSNext::SPSNext( SPS& sps )
#if JVET_K0357_AMVR
, m_IMV ( false )
#endif
#if JVET_K0072
#else
#endif
#if JVET_K0346 || JVET_K_AFFINE
#if !REMOVE_MV_ADAPT_PREC
, m_highPrecMv ( false )
......@@ -1688,9 +1683,6 @@ SPSNext::SPSNext( SPS& sps )
#endif
#if JVET_K0357_AMVR
, m_ImvMode ( IMV_OFF )
#endif
#if JVET_K0072
#else
#endif
, m_MTTMode ( 0 )
#if JVET_K0157
......@@ -1816,12 +1808,6 @@ PPS::PPS()
, m_numTileColumnsMinus1 (0)
, m_numTileRowsMinus1 (0)
#endif
#if JVET_K0072
#else
#if HEVC_USE_SIGN_HIDING
, m_signDataHidingEnabledFlag (false)
#endif
#endif
, m_cabacInitPresentFlag (false)
, m_sliceHeaderExtensionPresentFlag (false)
, m_loopFilterAcrossSlicesEnabledFlag(false)
......
......@@ -805,9 +805,6 @@ private:
#if JVET_K0357_AMVR
bool m_IMV; // 9
#endif
#if JVET_K0072
#else
#endif
#if JVET_K0346 || JVET_K_AFFINE
#if !REMOVE_MV_ADAPT_PREC
bool m_highPrecMv;
......@@ -847,9 +844,6 @@ private:
#if JVET_K0357_AMVR
//imv
ImvMode m_ImvMode;
#endif
#if JVET_K0072
#else
#endif
// multi type tree (QTBT + triple split)
unsigned m_MTTMode;
......@@ -889,9 +883,6 @@ public:
bool getUseAffineType () const { return m_AffineType; }
#endif
#endif
#if JVET_K0072
#else
#endif
#if JVET_K0346 || JVET_K_AFFINE
#if !REMOVE_MV_ADAPT_PREC
void setUseHighPrecMv(bool b) { m_highPrecMv = b; }
......@@ -945,9 +936,6 @@ public:
ImvMode getImvMode () const { return m_ImvMode; }
#endif
#if JVET_K0072
#else
#endif
// multi type tree
......@@ -1307,12 +1295,6 @@ private:
std::vector<int> m_tileRowHeight;
#endif
#if JVET_K0072
#else
#if HEVC_USE_SIGN_HIDING
bool m_signDataHidingEnabledFlag;
#endif
#endif
bool m_cabacInitPresentFlag;
bool m_sliceHeaderExtensionPresentFlag;
......@@ -1420,13 +1402,6 @@ public:
uint32_t getTileRowHeight(uint32_t rowIdx) const { return m_tileRowHeight[rowIdx]; }
#endif
#if JVET_K0072
#else
#if HEVC_USE_SIGN_HIDING
void setSignDataHidingEnabledFlag( bool b ) { m_signDataHidingEnabledFlag = b; }
bool getSignDataHidingEnabledFlag() const { return m_signDataHidingEnabledFlag; }
#endif
#endif
void setCabacInitPresentFlag( bool flag ) { m_cabacInitPresentFlag = flag; }
bool getCabacInitPresentFlag() const { return m_cabacInitPresentFlag; }
void setDeblockingFilterControlPresentFlag( bool val ) { m_deblockingFilterControlPresentFlag = val; }
......@@ -1518,11 +1493,9 @@ private:
int m_aiNumRefIdx [NUM_REF_PIC_LIST_01]; // for multiple reference of current slice
bool m_pendingRasInit;
#if JVET_K0072
bool m_depQuantEnabledFlag;
#if HEVC_USE_SIGN_HIDING
bool m_signDataHidingEnabledFlag;
#endif
#endif
bool m_bCheckLDC;
......@@ -1717,13 +1690,11 @@ public:
void setMaxBTSize(int i) { m_uiMaxBTSize = i; }
uint32_t getMaxBTSize() const { return m_uiMaxBTSize; }
#if JVET_K0072
void setDepQuantEnabledFlag( bool b ) { m_depQuantEnabledFlag = b; }
bool getDepQuantEnabledFlag() const { return m_depQuantEnabledFlag; }
#if HEVC_USE_SIGN_HIDING
void setSignDataHidingEnabledFlag( bool b ) { m_signDataHidingEnabledFlag = b; }
bool getSignDataHidingEnabledFlag() const { return m_signDataHidingEnabledFlag; }
#endif
#endif
void initEqualRef();
......
......@@ -51,9 +51,7 @@
#include <memory.h>
#include "QuantRDOQ.h"
#if JVET_K0072
#include "DepQuant.h"
#endif
#if RExt__DECODER_DEBUG_TOOL_STATISTICS
#include "CommonLib/CodingStatistics.h"
......@@ -270,9 +268,6 @@ void TrQuant::init( const Quant* otherQuant,
const bool bUseRDOQTS,
#if T0196_SELECTIVE_RDOQ
const bool useSelectiveRDOQ,
#endif
#if JVET_K0072
#else
#endif
const bool bEnc,
const bool useTransformSkipFast,
......@@ -287,27 +282,16 @@ void TrQuant::init( const Quant* otherQuant,
delete m_quant;
m_quant = nullptr;
#if JVET_K0072
if( bUseRDOQ || !bEnc )
{
m_quant = new DepQuant( otherQuant, bEnc );
}
#else
if( bUseRDOQ )
{
m_quant = new QuantRDOQ( otherQuant );
}
#endif
else
m_quant = new Quant( otherQuant );
if( m_quant )
{
#if JVET_K0072
m_quant->init( uiMaxTrSize, bUseRDOQ, bUseRDOQTS, useSelectiveRDOQ );
#else
m_quant->init( uiMaxTrSize, bUseRDOQ, bUseRDOQTS, useSelectiveRDOQ );
#endif
}
}
......
......@@ -73,9 +73,6 @@ public:
const bool bUseRDOQTS = false,
#if T0196_SELECTIVE_RDOQ
const bool useSelectiveRDOQ = false,
#endif
#if JVET_K0072
#else
#endif
const bool bEnc = false,
const bool useTransformSkipFast = false,
......
......@@ -59,7 +59,6 @@
#define JVET_K0072 1
#define JVET_K0122 1 // CE3-related: Alternative techniques for DC mode without division
// Test 2: Samples are taken only along with a longer side
......@@ -182,7 +181,7 @@
#define HEVC_VPS 1
#define HEVC_DEPENDENT_SLICES 1
#define HEVC_TILES_WPP 1
#elif JVET_K0072
#else
#define HEVC_USE_SIGN_HIDING 1
#endif
......
......@@ -180,17 +180,9 @@ unsigned BinDecoderBase::decodeBinsEP( unsigned numBins )
return bins;
}
#if JVET_K0072
unsigned BinDecoderBase::decodeRemAbsEP( unsigned goRicePar, bool useLimitedPrefixLength, int maxLog2TrDynamicRange )
#else
unsigned BinDecoderBase::decodeRemAbsEP( unsigned goRicePar, bool useLimitedPrefixLength, int maxLog2TrDynamicRange, bool altRC )
#endif
{
#if JVET_K0072
unsigned cutoff = g_auiGoRiceRange[ goRicePar ];
#else
unsigned cutoff = altRC ? g_auiGoRiceRange[ goRicePar ] : COEF_REMAIN_BIN_REDUCTION;
#endif
unsigned prefix = 0;
if( useLimitedPrefixLength )
{
......
......@@ -71,11 +71,7 @@ public:
public:
unsigned decodeBinEP ();
unsigned decodeBinsEP ( unsigned numBins );
#if JVET_K0072
unsigned decodeRemAbsEP ( unsigned goRicePar, bool useLimitedPrefixLength, int maxLog2TrDynamicRange );
#else
unsigned decodeRemAbsEP ( unsigned goRicePar, bool useLimitedPrefixLength, int maxLog2TrDynamicRange, bool altRC = false );
#endif
unsigned decodeBinTrm ();
unsigned decodeBinsPCM ( unsigned numBins );
void align ();
......
This diff is collapsed.
......@@ -113,17 +113,9 @@ public:
// transform tree (clause 7.3.8.8)
void transform_tree ( CodingStructure& cs, Partitioner& pm, CUCtx& cuCtx, ChromaCbfs& chromaCbfs );
#if ENABLE_BMS
#if JVET_K0072
bool cbf_comp ( CodingStructure& cs, const CompArea& area, unsigned depth, const bool prevCbCbf = false );
#else
bool cbf_comp ( CodingStructure& cs, const CompArea& area, unsigned depth );
#endif
#else
#if JVET_K0072
bool cbf_comp ( CodingStructure& cs, const CompArea& area, const bool prevCbCbf = false );
#else
bool cbf_comp ( CodingStructure& cs, const CompArea& area );
#endif
#endif
// mvd coding (clause 7.3.8.9)
......@@ -147,11 +139,7 @@ public:
void emt_cu_flag ( CodingUnit& cu );
void explicit_rdpcm_mode ( TransformUnit& tu, ComponentID compID );
int last_sig_coeff ( CoeffCodingContext& cctx );
#if JVET_K0072
void residual_coding_subblock ( CoeffCodingContext& cctx, TCoeff* coeff, const int stateTransTable, int& state );
#else
void residual_coding_subblock ( CoeffCodingContext& cctx, TCoeff* coeff );
#endif
// cross component prediction (clause 7.3.8.12)
void cross_comp_pred ( TransformUnit& tu, ComponentID compID );
......