Commit 2b31d76e authored by Frederic Barbier's avatar Frederic Barbier

Cleanup trailing whitespaces

parent 52b839f6
......@@ -554,7 +554,7 @@ protected:
std::string m_decodeBitstreams[2]; ///< filename for decode bitstreams.
#if JVET_M0055_DEBUG_CTU
int m_debugCTU;
#endif
#endif
int m_switchPOC; ///< dbg poc.
int m_switchDQP; ///< switch DQP.
int m_fastForwardToPOC; ///< get to encoding the specified POC as soon as possible by skipping temporal layers irrelevant for the specified POC
......
......@@ -67,7 +67,7 @@ private:
/// CU-level deblocking function
void xDeblockCU ( CodingUnit& cu, const DeblockEdgeDir edgeDir );
#endif
// set / get functions
void xSetLoopfilterParam ( const CodingUnit& cu );
......
......@@ -990,7 +990,7 @@ private:
int m_LadfQpOffset[MAX_LADF_INTERVALS];
int m_LadfIntervalLowerBound[MAX_LADF_INTERVALS];
#endif
#if !JVET_M0483_IBC
unsigned m_IBCMode;
#endif
......@@ -1249,7 +1249,7 @@ public:
void setMaxSbtSize( uint8_t val ) { m_MaxSbtSize = val; }
uint8_t getMaxSbtSize() const { return m_MaxSbtSize; }
#endif
void setAMVREnabledFlag ( bool b ) { m_AMVREnabledFlag = b; }
bool getAMVREnabledFlag () const { return m_AMVREnabledFlag; }
void setUseAffine ( bool b ) { m_Affine = b; }
......@@ -1294,7 +1294,7 @@ public:
void setLadfIntervalLowerBound( int value, int idx ) { m_LadfIntervalLowerBound[ idx ] = value; }
int getLadfIntervalLowerBound( int idx ) const { return m_LadfIntervalLowerBound[ idx ]; }
#endif
void setUseMHIntra ( bool b ) { m_MHIntra = b; }
bool getUseMHIntra () const { return m_MHIntra; }
void setUseTriangle ( bool b ) { m_Triangle = b; }
......
......@@ -52,9 +52,9 @@
#define JCTVC_Y0038_PARAMS 1
#define JVET_M0600_RATE_CTRL 1 //frame level bit allocation by qdf
#define JVET_M0600_RATE_CTRL 1 //frame level bit allocation by qdf
#define JVET_M0451_INTEROPERABILITY_POINT_SYNTAX 1
#define JVET_M0451_INTEROPERABILITY_POINT_SYNTAX 1
#define JVET_M0428_ENC_DB_OPT 1 // Encoder optimization with deblocking filter
......
......@@ -563,7 +563,7 @@ template<X86_VEXT vext>
static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recDst, const CPelUnitBuf& recSrc, const Area& blk, const ComponentID compId, short* filterSet, const ClpRng& clpRng, CodingStructure& cs )
#else
static void simdFilter7x7Blk( AlfClassifier** classifier, const PelUnitBuf &recDst, const CPelUnitBuf& recSrc, const Area& blk, const ComponentID compId, short* filterSet, const ClpRng& clpRng )
#endif
#endif
{
static const unsigned char mask0[16] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 6, 7, 4, 5, 2, 3 };
static const unsigned char mask00[16] = { 2, 3, 0, 1, 0, 0, 0, 0, 8, 9, 0, 0, 0, 0, 0, 1 };
......
......@@ -805,7 +805,7 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
// Mv mv[3];
CHECK( pu.refIdx[eRefList] < 0, "Unexpected negative refIdx." );
#if JVET_M0246_AFFINE_AMVR
#if !JVET_M0055_DEBUG_CTU
#if !JVET_M0055_DEBUG_CTU
Mv tmpMvd[3];
memcpy( tmpMvd, pu.mvdAffi[eRefList], 3 * sizeof( Mv ) );
#endif
......@@ -835,7 +835,7 @@ void DecCu::xDeriveCUMV( CodingUnit &cu )
}
#if !JVET_M0055_DEBUG_CTU //th this leads to different interpretation of mvdAffi at encoder and decoder
memcpy( pu.mvdAffi[eRefList], tmpMvd, 3 * sizeof( Mv ) );
#endif
#endif
#else
Mv mvLT = affineAMVPInfo.mvCandLT[mvp_idx] + pu.mvdAffi[eRefList][0];
Mv mvRT = affineAMVPInfo.mvCandRT[mvp_idx] + pu.mvdAffi[eRefList][1];
......
......@@ -70,7 +70,7 @@ void DecSlice::init( CABACDecoder* cabacDecoder, DecCu* pcCuDecoder )
m_pcCuDecoder = pcCuDecoder;
}
#if JVET_M0055_DEBUG_CTU
#if JVET_M0055_DEBUG_CTU
void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream, int debugCTU )
#else
void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
......@@ -235,8 +235,8 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
cs.slice->resetMotionLUTs();
}
#if JVET_M0055_DEBUG_CTU
#if JVET_M0055_DEBUG_CTU
if( ctuRsAddr == debugCTU )
{
isLastCtuOfSliceSegment = true; // get out here
......
......@@ -1104,7 +1104,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
#if JVET_M0427_INLOOP_RESHAPER
READ_FLAG(uiCode, "sps_reshaper_enable_flag"); pcSPS->setUseReshaper(uiCode == 1);
#endif
#if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET
READ_FLAG( uiCode, "sps_ladf_enabled_flag" ); pcSPS->setLadfEnabled( uiCode != 0 );
if ( pcSPS->getLadfEnabled() )
......@@ -1120,7 +1120,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
}
#endif
// KJS: reference picture sets to be replaced
READ_UVLC( uiCode, "num_short_term_ref_pic_sets" );
CHECK(uiCode > 64, "Invalid code");
......
......@@ -4403,7 +4403,7 @@ void EncCu::xCalDebCost( CodingStructure &cs, Partitioner &partitioner, bool cal
{
const CompArea& compArea = areaLeft.block(compId);
picDbBuf.getBuf( compArea ).copyFrom( cs.picture->getRecoBuf( compArea ) );
#if JVET_M0427_INLOOP_RESHAPER
#if JVET_M0427_INLOOP_RESHAPER
if ( cs.slice->getReshapeInfo().getUseSliceReshaper() && m_pcReshape->getSliceReshaperInfo().getUseSliceReshaper() && isLuma( compId ) )
{
picDbBuf.getBuf( compArea ).rspSignal( m_pcReshape->getInvLUT() );
......
......@@ -2519,7 +2519,7 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
m_pcEncLib->setParamSetChanged(pcSlice->getSPS()->getSPSId(), pcSlice->getPPS()->getPPSId());
}
actualTotalBits += xWriteParameterSets(accessUnit, pcSlice, writePS);
if (writePS)
#else
actualTotalBits += xWriteParameterSets( accessUnit, pcSlice, m_bSeqFirst );
......
......@@ -777,7 +777,7 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner )
{
uiRdModeList.resize( std::min<size_t>( uiRdModeList.size(), 2 ) );
#if JVET_M0102_INTRA_SUBPARTITIONS
extendRefList.resize( std::min<size_t>( extendRefList.size(), 2 ) );
extendRefList.resize( std::min<size_t>( extendRefList.size(), 2 ) );
if( nOptionsForISP > 1 )
{
m_rdModeListWithoutMrlHor.resize( std::min<size_t>( m_rdModeListWithoutMrlHor.size(), 2 ) );
......@@ -834,8 +834,8 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner )
uiRdModeList.insert( uiRdModeList.begin() + 1, secondIspList->begin(), secondIspList->end() );
uiRdModeList.insert( uiRdModeList.begin() + 1, firstIspList->begin() , firstIspList->end() );
extendRefList.insert( extendRefList.begin() + 1, secondIspList->size(), MRL_NUM_REF_LINES + ispOptions[2] );
extendRefList.insert( extendRefList.begin() + 1, firstIspList->size() , MRL_NUM_REF_LINES + ispOptions[1] );
extendRefList.insert( extendRefList.begin() + 1, secondIspList->size(), MRL_NUM_REF_LINES + ispOptions[2] );
extendRefList.insert( extendRefList.begin() + 1, firstIspList->size() , MRL_NUM_REF_LINES + ispOptions[1] );
}
else
{
......
......@@ -94,7 +94,7 @@ struct TRCParameter
double m_beta;
int m_validPix;
#if JVET_M0600_RATE_CTRL
double m_skipRatio;
double m_skipRatio;
#endif
};
......
......@@ -631,7 +631,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
WRITE_UVLC( pcSPS->getBitDepth(CHANNEL_TYPE_LUMA) - 8, "bit_depth_luma_minus8" );
const bool chromaEnabled = isChromaEnabled(format);
WRITE_UVLC( chromaEnabled ? (pcSPS->getBitDepth(CHANNEL_TYPE_CHROMA) - 8):0, "bit_depth_chroma_minus8" );
......@@ -679,7 +679,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_UVLC(g_aucLog2[pcSPS->getMaxTTSizeIChroma()] - g_aucLog2[pcSPS->getMinQTSize(I_SLICE, CHANNEL_TYPE_CHROMA)], "sps_log2_diff_max_tt_min_qt_intra_tile_group_chroma");
}
}
// KJS: does not exist anymore -> remove?
WRITE_UVLC( pcSPS->getQuadtreeTULog2MinSize() - 2, "log2_min_luma_transform_block_size_minus2" );
WRITE_UVLC( pcSPS->getQuadtreeTULog2MaxSize() - pcSPS->getQuadtreeTULog2MinSize(), "log2_diff_max_min_luma_transform_block_size" );
......@@ -761,7 +761,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
// KJS: sps_ciip_enabled_flag
WRITE_FLAG( pcSPS->getUseMHIntra() ? 1 : 0, "mhintra_flag" );
WRITE_FLAG( pcSPS->getUseTriangle() ? 1: 0, "triangle_flag" );
// KJS: not in draft yet
......@@ -780,7 +780,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
#if JVET_M0427_INLOOP_RESHAPER
WRITE_FLAG(pcSPS->getUseReshaper() ? 1 : 0, "sps_reshaper_enable_flag");
#endif
#if LUMA_ADAPTIVE_DEBLOCKING_FILTER_QP_OFFSET
WRITE_FLAG( pcSPS->getLadfEnabled() ? 1 : 0, "sps_ladf_enabled_flag" );
if ( pcSPS->getLadfEnabled() )
......@@ -832,7 +832,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
}
#endif
// KJS: no VUI defined yet
WRITE_FLAG( pcSPS->getVuiParametersPresentFlag(), "vui_parameters_present_flag" );
if (pcSPS->getVuiParametersPresentFlag())
......
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