From dc2716e0c43a7d986bce2288462e0f4d5b25e7fb Mon Sep 17 00:00:00 2001
From: YCSun <yuchen.s@alibaba-inc.com>
Date: Fri, 23 Nov 2018 21:46:33 -0800
Subject: [PATCH] Fix typo: JVET_L0553_PCM. It should be JVET_L0209_PCM.
---
source/Lib/CommonLib/TypeDef.h | 2 +-
source/Lib/DecoderLib/CABACReader.cpp | 14 +++++++-------
source/Lib/DecoderLib/CABACReader.h | 2 +-
source/Lib/DecoderLib/DecCu.cpp | 4 ++--
source/Lib/EncoderLib/CABACWriter.cpp | 14 +++++++-------
source/Lib/EncoderLib/CABACWriter.h | 2 +-
source/Lib/EncoderLib/EncCu.cpp | 8 ++++----
source/Lib/EncoderLib/IntraSearch.cpp | 8 ++++----
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 0705deb6..f19bfbe7 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -78,7 +78,7 @@
#define JVET_L0265_AFF_MINIMUM4X4 1 //Affine 4x4 chroma subblock
#define JVET_L0111 1 // Max Tx size for skip
-#define JVET_L0553_PCM 1 // PCM mode
+#define JVET_L0209_PCM 1 // PCM mode
#define JVET_L0553_FIX_INITQP 1
#define JVET_L0053_L0272_DM 1 // use center position of luma block to derive DM
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index bdd834d3..1eed004d 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -708,7 +708,7 @@ bool CABACReader::coding_unit( CodingUnit &cu, Partitioner &partitioner, CUCtx&
// --> create PUs
CU::addPUs( cu );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
{
@@ -726,7 +726,7 @@ bool CABACReader::coding_unit( CodingUnit &cu, Partitioner &partitioner, CUCtx&
extend_ref_line( cu );
#endif
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
{
@@ -834,14 +834,14 @@ void CABACReader::pred_mode( CodingUnit& cu )
}
}
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
void CABACReader::pcm_flag( CodingUnit& cu, Partitioner &partitioner )
#else
void CABACReader::pcm_flag( CodingUnit& cu )
#endif
{
const SPS& sps = *cu.cs->sps;
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
if( !sps.getUsePCM() || partitioner.currArea().lwidth() > (1 << sps.getPCMLog2MaxSize()) || partitioner.currArea().lwidth() < (1 << sps.getPCMLog2MinSize())
|| partitioner.currArea().lheight() > (1 << sps.getPCMLog2MaxSize()) || partitioner.currArea().lheight() < (1 << sps.getPCMLog2MinSize()) )
#else
@@ -1912,18 +1912,18 @@ void CABACReader::pcm_samples( TransformUnit& tu )
{
CHECK( !tu.cu->ipcm, "pcm mode expected" );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
const CodingStructure *cs = tu.cs;
const ChannelType chType = tu.chType;
#endif
const SPS& sps = *tu.cu->cs->sps;
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
const ComponentID maxCompId = ( tu.chromaFormat == CHROMA_400 ? COMPONENT_Y : COMPONENT_Cr );
#endif
tu.depth = 0;
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
ComponentID compStr = (CS::isDualITree(*cs) && !isLuma(chType)) ? COMPONENT_Cb: COMPONENT_Y;
ComponentID compEnd = (CS::isDualITree(*cs) && isLuma(chType)) ? COMPONENT_Y : COMPONENT_Cr;
for( ComponentID compID = compStr; compID <= compEnd; compID = ComponentID(compID+1) )
diff --git a/source/Lib/DecoderLib/CABACReader.h b/source/Lib/DecoderLib/CABACReader.h
index b0f46995..58f3802c 100644
--- a/source/Lib/DecoderLib/CABACReader.h
+++ b/source/Lib/DecoderLib/CABACReader.h
@@ -78,7 +78,7 @@ public:
void cu_transquant_bypass_flag ( CodingUnit& cu );
void cu_skip_flag ( CodingUnit& cu );
void pred_mode ( CodingUnit& cu );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
void pcm_flag ( CodingUnit& cu, Partitioner& pm );
#else
void pcm_flag ( CodingUnit& cu );
diff --git a/source/Lib/DecoderLib/DecCu.cpp b/source/Lib/DecoderLib/DecCu.cpp
index d1df4c4c..53efe55a 100644
--- a/source/Lib/DecoderLib/DecCu.cpp
+++ b/source/Lib/DecoderLib/DecCu.cpp
@@ -260,7 +260,7 @@ void DecCu::xDecodePCMTexture(TransformUnit &tu, const ComponentID compID)
*/
void DecCu::xReconPCM(TransformUnit &tu)
{
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
const CodingStructure *cs = tu.cs;
const ChannelType chType = tu.chType;
@@ -271,7 +271,7 @@ void DecCu::xReconPCM(TransformUnit &tu)
for (uint32_t ch = 0; ch < tu.blocks.size(); ch++)
#endif
{
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
ComponentID compID = ComponentID(ch);
#endif
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 72cb6ba4..f4a0afc2 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -631,7 +631,7 @@ void CABACWriter::coding_unit( const CodingUnit& cu, Partitioner& partitioner, C
return;
}
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
{
@@ -651,7 +651,7 @@ void CABACWriter::coding_unit( const CodingUnit& cu, Partitioner& partitioner, C
extend_ref_line(cu);
#endif
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
{
@@ -706,13 +706,13 @@ void CABACWriter::pred_mode( const CodingUnit& cu )
m_BinEncoder.encodeBin( ( CU::isIntra( cu ) ), Ctx::PredMode() );
}
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
void CABACWriter::pcm_data( const CodingUnit& cu, Partitioner& partitioner )
#else
void CABACWriter::pcm_data( const CodingUnit& cu )
#endif
{
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
pcm_flag( cu, partitioner );
#else
pcm_flag( cu );
@@ -724,14 +724,14 @@ void CABACWriter::pcm_data( const CodingUnit& cu )
}
}
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
void CABACWriter::pcm_flag( const CodingUnit& cu, Partitioner& partitioner )
#else
void CABACWriter::pcm_flag( const CodingUnit& cu )
#endif
{
const SPS& sps = *cu.cs->sps;
- #if JVET_L0553_PCM
+ #if JVET_L0209_PCM
if( !sps.getUsePCM() || partitioner.currArea().lwidth() > (1 << sps.getPCMLog2MaxSize()) || partitioner.currArea().lwidth() < (1 << sps.getPCMLog2MinSize())
|| partitioner.currArea().lheight() > (1 << sps.getPCMLog2MaxSize()) || partitioner.currArea().lheight() < (1 << sps.getPCMLog2MinSize()) )
#else
@@ -1868,7 +1868,7 @@ void CABACWriter::pcm_samples( const TransformUnit& tu )
const SPS& sps = *tu.cu->cs->sps;
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
const CodingStructure *cs = tu.cs;
const ChannelType chType = tu.chType;
diff --git a/source/Lib/EncoderLib/CABACWriter.h b/source/Lib/EncoderLib/CABACWriter.h
index 85311a0b..58297747 100644
--- a/source/Lib/EncoderLib/CABACWriter.h
+++ b/source/Lib/EncoderLib/CABACWriter.h
@@ -90,7 +90,7 @@ public:
void cu_transquant_bypass_flag ( const CodingUnit& cu );
void cu_skip_flag ( const CodingUnit& cu );
void pred_mode ( const CodingUnit& cu );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
void pcm_data ( const CodingUnit& cu, Partitioner& pm );
void pcm_flag ( const CodingUnit& cu, Partitioner& pm );
#else
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index c65884ec..49e10e1f 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -1507,7 +1507,7 @@ void EncCu::xCheckRDCostIntra( CodingStructure *&tempCS, CodingStructure *&bestC
m_CABACEstimator->extend_ref_line( cu );
#endif
m_CABACEstimator->cu_pred_data ( cu );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
m_CABACEstimator->pcm_data ( cu, partitioner );
#else
m_CABACEstimator->pcm_data ( cu );
@@ -1557,7 +1557,7 @@ void EncCu::xCheckIntraPCM(CodingStructure *&tempCS, CodingStructure *&bestCS, P
{
tempCS->initStructData( encTestMode.qp, encTestMode.lossless );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
CodingUnit &cu = tempCS->addCU( CS::getArea( *tempCS, tempCS->area, partitioner.chType ), partitioner.chType );
#else
CodingUnit &cu = tempCS->addCU( tempCS->area, partitioner.chType );
@@ -1579,7 +1579,7 @@ void EncCu::xCheckIntraPCM(CodingStructure *&tempCS, CodingStructure *&bestCS, P
cu.qp = encTestMode.qp;
cu.ipcm = true;
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
tempCS->addPU( CS::getArea( *tempCS, tempCS->area, partitioner.chType ), partitioner.chType );
tempCS->addTU( CS::getArea( *tempCS, tempCS->area, partitioner.chType ), partitioner.chType );
@@ -1609,7 +1609,7 @@ void EncCu::xCheckIntraPCM(CodingStructure *&tempCS, CodingStructure *&bestCS, P
m_CABACEstimator->cu_skip_flag ( cu );
}
m_CABACEstimator->pred_mode ( cu );
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
m_CABACEstimator->pcm_data ( cu, partitioner );
#else
m_CABACEstimator->pcm_data ( cu );
diff --git a/source/Lib/EncoderLib/IntraSearch.cpp b/source/Lib/EncoderLib/IntraSearch.cpp
index 36309d1f..4368391d 100644
--- a/source/Lib/EncoderLib/IntraSearch.cpp
+++ b/source/Lib/EncoderLib/IntraSearch.cpp
@@ -1031,7 +1031,7 @@ void IntraSearch::estIntraPredChromaQT(CodingUnit &cu, Partitioner &partitioner)
void IntraSearch::IPCMSearch(CodingStructure &cs, Partitioner& partitioner)
{
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
ComponentID compStr = (CS::isDualITree(cs) && !isLuma(partitioner.chType)) ? COMPONENT_Cb: COMPONENT_Y;
ComponentID compEnd = (CS::isDualITree(cs) && isLuma(partitioner.chType)) ? COMPONENT_Y : COMPONENT_Cr;
for( ComponentID compID = compStr; compID <= compEnd; compID = ComponentID(compID+1) )
@@ -1039,7 +1039,7 @@ void IntraSearch::IPCMSearch(CodingStructure &cs, Partitioner& partitioner)
for (uint32_t ch = 0; ch < getNumberValidTBlocks( *cs.pcv ); ch++)
#endif
{
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
const ComponentID compID = ComponentID(ch);
#endif
@@ -1055,7 +1055,7 @@ void IntraSearch::IPCMSearch(CodingStructure &cs, Partitioner& partitioner)
cs.cost = 0;
cs.setDecomp(cs.area);
-#if !JVET_L0553_PCM
+#if !JVET_L0209_PCM
cs.picture->getRecoBuf(cs.area).copyFrom(cs.getRecoBuf());
#endif
}
@@ -1121,7 +1121,7 @@ void IntraSearch::xEncIntraHeader(CodingStructure &cs, Partitioner &partitioner,
#endif
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
{
-#if JVET_L0553_PCM
+#if JVET_L0209_PCM
m_CABACEstimator->pcm_data( cu, partitioner );
#else
m_CABACEstimator->pcm_data( cu );
--
GitLab