From 0e1cbfb302af7e167824b5b5dc1e9fdb258438ac Mon Sep 17 00:00:00 2001
From: rickxu <lidong.xu@intel.com>
Date: Mon, 3 Jun 2019 23:08:31 -0700
Subject: [PATCH] Fixed code indentation issue
---
source/App/Parcat/parcat.cpp | 4 +--
source/Lib/CommonLib/Slice.h | 32 ++++++++++----------
source/Lib/EncoderLib/EncGOP.cpp | 6 ++--
source/Lib/EncoderLib/VLCWriter.cpp | 46 ++++++++++++++---------------
source/Lib/EncoderLib/VLCWriter.h | 4 +--
5 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/source/App/Parcat/parcat.cpp b/source/App/Parcat/parcat.cpp
index c53674ccb..0ae950d18 100644
--- a/source/App/Parcat/parcat.cpp
+++ b/source/App/Parcat/parcat.cpp
@@ -377,9 +377,9 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
if( inp_nalu.m_nalUnitType == NAL_UNIT_SPS )
{
SPS* sps = new SPS();
- HLSReader.setBitstream( &inp_nalu.getBitstream() );
+ HLSReader.setBitstream(&inp_nalu.getBitstream());
#if JVET_N0276_CONSTRAINT_FLAGS
- HLSReader.parseSPS( sps, ¶meterSetManager );
+ HLSReader.parseSPS(sps, ¶meterSetManager);
#else
HLSReader.parseSPS( sps );
#endif
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 009d48a2f..6892cde9e 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -257,42 +257,42 @@ public:
, m_maxChromaFormatConstraintIdc(CHROMA_420)
, m_noQtbttDualTreeIntraConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noPartitionConstraintsOverrideConstraintFlag(false)
+ , m_noPartitionConstraintsOverrideConstraintFlag(false)
#endif
, m_noSaoConstraintFlag (false)
, m_noAlfConstraintFlag (false)
, m_noPcmConstraintFlag (false)
, m_noRefWraparoundConstraintFlag(false)
, m_noTemporalMvpConstraintFlag(false)
- , m_noSbtmvpConstraintFlag (false)
- , m_noAmvrConstraintFlag (false)
- , m_noBdofConstraintFlag (false)
+ , m_noSbtmvpConstraintFlag(false)
+ , m_noAmvrConstraintFlag(false)
+ , m_noBdofConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noDmvrConstraintFlag (false)
+ , m_noDmvrConstraintFlag(false)
#endif
- , m_noCclmConstraintFlag (false)
- , m_noMtsConstraintFlag (false)
+ , m_noCclmConstraintFlag(false)
+ , m_noMtsConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noSbtConstraintFlag (false)
+ , m_noSbtConstraintFlag(false)
#endif
, m_noAffineMotionConstraintFlag(false)
- , m_noGbiConstraintFlag (false)
+ , m_noGbiConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noIbcConstraintFlag (false)
+ , m_noIbcConstraintFlag(false)
#endif
- , m_noMhIntraConstraintFlag (false)
+ , m_noMhIntraConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noFPelMmvdConstraintFlag (false)
+ , m_noFPelMmvdConstraintFlag(false)
#endif
- , m_noTriangleConstraintFlag (false)
- , m_noLadfConstraintFlag (false)
+ , m_noTriangleConstraintFlag(false)
+ , m_noLadfConstraintFlag(false)
#if JVET_N0276_CONSTRAINT_FLAGS
- , m_noTransformSkipConstraintFlag(false)
+ , m_noTransformSkipConstraintFlag(false)
#endif
#if !JVET_N0276_CONSTRAINT_FLAGS
, m_noCurrPicRefConstraintFlag(false)
#endif
- , m_noQpDeltaConstraintFlag (false)
+ , m_noQpDeltaConstraintFlag(false)
, m_noDepQuantConstraintFlag (false)
, m_noSignDataHidingConstraintFlag(false)
{}
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 0cfa0bcfe..7ea06d27c 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -293,15 +293,15 @@ int EncGOP::xWriteParameterSets (AccessUnit &accessUnit, Slice *slice, const boo
{
CHECK(!(bSeqFirst), "Unspecified error"); // Implementations that use more than 1 SPS need to be aware of activation issues.
#if JVET_N0276_CONSTRAINT_FLAGS
- actualTotalBits += xWriteSPS(accessUnit, slice->getSPS(), m_pcEncLib->getDPS()->getProfileTierLevel().getConstraintInfo());
+ actualTotalBits += xWriteSPS(accessUnit, slice->getSPS(), m_pcEncLib->getDPS()->getProfileTierLevel().getConstraintInfo());
#else
- actualTotalBits += xWriteSPS(accessUnit, slice->getSPS());
+ actualTotalBits += xWriteSPS(accessUnit, slice->getSPS());
#endif
}
if (m_pcEncLib->PPSNeedsWriting(slice->getPPS()->getPPSId())) // Note this assumes that all changes to the PPS are made at the EncLib level prior to picture creation (EncLib::xGetNewPicBuffer).
{
#if JVET_N0276_CONSTRAINT_FLAGS
- actualTotalBits += xWritePPS(accessUnit, slice->getPPS(), m_pcEncLib->getDPS()->getProfileTierLevel().getConstraintInfo());
+ actualTotalBits += xWritePPS(accessUnit, slice->getPPS(), m_pcEncLib->getDPS()->getProfileTierLevel().getConstraintInfo());
#else
actualTotalBits += xWritePPS(accessUnit, slice->getPPS());
#endif
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index d967dc214..bc3ff85b0 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -234,7 +234,7 @@ void HLSWriter::codePPS( const PPS* pcPPS )
if (!cinfo->getNoTransformSkipConstraintFlag())
{
#endif
- WRITE_FLAG(pcPPS->getUseTransformSkip() ? 1 : 0, "transform_skip_enabled_flag");
+ WRITE_FLAG(pcPPS->getUseTransformSkip() ? 1 : 0, "transform_skip_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -243,7 +243,7 @@ void HLSWriter::codePPS( const PPS* pcPPS )
if (!cinfo->getNoQpDeltaConstraintFlag())
{
#endif
- WRITE_FLAG(pcPPS->getUseDQP() ? 1 : 0, "cu_qp_delta_enabled_flag");
+ WRITE_FLAG(pcPPS->getUseDQP() ? 1 : 0, "cu_qp_delta_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -974,7 +974,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoQtbttDualTreeIntraConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseDualITree(), "qtbtt_dual_tree_intra_flag");
+ WRITE_FLAG(pcSPS->getUseDualITree(), "qtbtt_dual_tree_intra_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -984,7 +984,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoPartitionConstraintsOverrideConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getSplitConsOverrideEnabledFlag(), "partition_constraints_override_enabled_flag");
+ WRITE_FLAG(pcSPS->getSplitConsOverrideEnabledFlag(), "partition_constraints_override_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1021,7 +1021,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoSaoConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getSAOEnabledFlag(), "sps_sao_enabled_flag");
+ WRITE_FLAG(pcSPS->getSAOEnabledFlag(), "sps_sao_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1030,7 +1030,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoAlfConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getALFEnabledFlag(), "sps_alf_enabled_flag");
+ WRITE_FLAG(pcSPS->getALFEnabledFlag(), "sps_alf_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1039,7 +1039,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoPcmConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getPCMEnabledFlag() ? 1 : 0, "sps_pcm_enabled_flag");
+ WRITE_FLAG(pcSPS->getPCMEnabledFlag() ? 1 : 0, "sps_pcm_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1057,7 +1057,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoRefWraparoundConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getWrapAroundEnabledFlag() ? 1 : 0, "sps_ref_wraparound_enabled_flag");
+ WRITE_FLAG(pcSPS->getWrapAroundEnabledFlag() ? 1 : 0, "sps_ref_wraparound_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1071,7 +1071,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoTemporalMvpConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getSPSTemporalMVPEnabledFlag() ? 1 : 0, "sps_temporal_mvp_enabled_flag");
+ WRITE_FLAG(pcSPS->getSPSTemporalMVPEnabledFlag() ? 1 : 0, "sps_temporal_mvp_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1089,7 +1089,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoAmvrConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getAMVREnabledFlag() ? 1 : 0, "sps_amvr_enabled_flag");
+ WRITE_FLAG(pcSPS->getAMVREnabledFlag() ? 1 : 0, "sps_amvr_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1098,7 +1098,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoBdofConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getBDOFEnabledFlag() ? 1 : 0, "sps_bdof_enabled_flag");
+ WRITE_FLAG(pcSPS->getBDOFEnabledFlag() ? 1 : 0, "sps_bdof_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1107,7 +1107,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoAmvrConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getAffineAmvrEnabledFlag() ? 1 : 0, "sps_affine_amvr_enabled_flag");
+ WRITE_FLAG(pcSPS->getAffineAmvrEnabledFlag() ? 1 : 0, "sps_affine_amvr_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1116,7 +1116,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoDmvrConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseDMVR() ? 1 : 0, "sps_dmvr_enable_flag");
+ WRITE_FLAG(pcSPS->getUseDMVR() ? 1 : 0, "sps_dmvr_enable_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1129,7 +1129,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoCclmConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseLMChroma() ? 1 : 0, "lm_chroma_enabled_flag");
+ WRITE_FLAG(pcSPS->getUseLMChroma() ? 1 : 0, "lm_chroma_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1143,7 +1143,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoMtsConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseMTS() ? 1 : 0, "mts_enabled_flag");
+ WRITE_FLAG(pcSPS->getUseMTS() ? 1 : 0, "mts_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1163,7 +1163,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoAffineMotionConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseAffine() ? 1 : 0, "affine_flag");
+ WRITE_FLAG(pcSPS->getUseAffine() ? 1 : 0, "affine_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1176,7 +1176,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoGbiConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseGBi() ? 1 : 0, "gbi_flag");
+ WRITE_FLAG(pcSPS->getUseGBi() ? 1 : 0, "gbi_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1185,7 +1185,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoIbcConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getIBCFlag() ? 1 : 0, "ibc_flag");
+ WRITE_FLAG(pcSPS->getIBCFlag() ? 1 : 0, "ibc_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1195,7 +1195,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoMhIntraConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseMHIntra() ? 1 : 0, "mhintra_flag");
+ WRITE_FLAG(pcSPS->getUseMHIntra() ? 1 : 0, "mhintra_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1217,7 +1217,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoTriangleConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseTriangle() ? 1 : 0, "triangle_flag");
+ WRITE_FLAG(pcSPS->getUseTriangle() ? 1 : 0, "triangle_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1230,7 +1230,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoSbtConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getUseSBT() ? 1 : 0, "sbt_enable_flag");
+ WRITE_FLAG(pcSPS->getUseSBT() ? 1 : 0, "sbt_enable_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1250,7 +1250,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if (!cinfo->getNoLadfConstraintFlag())
{
#endif
- WRITE_FLAG(pcSPS->getLadfEnabled() ? 1 : 0, "sps_ladf_enabled_flag");
+ WRITE_FLAG(pcSPS->getLadfEnabled() ? 1 : 0, "sps_ladf_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
@@ -1834,7 +1834,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
if(!cinfo->getNoDepQuantConstraintFlag())
{
#endif
- WRITE_FLAG(pcSlice->getDepQuantEnabledFlag() ? 1 : 0, "dep_quant_enabled_flag");
+ WRITE_FLAG(pcSlice->getDepQuantEnabledFlag() ? 1 : 0, "dep_quant_enabled_flag");
#if JVET_N0276_CONSTRAINT_FLAGS
}
#endif
diff --git a/source/Lib/EncoderLib/VLCWriter.h b/source/Lib/EncoderLib/VLCWriter.h
index faabe0922..5f306134c 100644
--- a/source/Lib/EncoderLib/VLCWriter.h
+++ b/source/Lib/EncoderLib/VLCWriter.h
@@ -124,8 +124,8 @@ public:
uint32_t getNumberOfWrittenBits () { return m_pcBitIf->getNumberOfWrittenBits(); }
void codeVUI ( const VUI *pcVUI, const SPS* pcSPS );
#if JVET_N0276_CONSTRAINT_FLAGS
- void codeSPS(const SPS* pcSPS, const ConstraintInfo* cinfo );
- void codePPS(const PPS* pcPPS, const ConstraintInfo* cinfo );
+ void codeSPS (const SPS* pcSPS, const ConstraintInfo* cinfo );
+ void codePPS (const PPS* pcPPS, const ConstraintInfo* cinfo );
#else
void codeSPS ( const SPS* pcSPS );
void codePPS ( const PPS* pcPPS );
--
GitLab