From 059f73fc861195cf4c56e232ed6e606f97ccf64d Mon Sep 17 00:00:00 2001
From: Cheung Auyeung <cauyeung@tencent.com>
Date: Tue, 4 Feb 2020 13:10:22 -0800
Subject: [PATCH] Use enum ChromaFormat to indicate how monochrome or color
planes are intended to be coded.
---
source/Lib/CommonLib/TypeDef.h | 4 ++++
source/Lib/DecoderLib/VLCReader.cpp | 4 ++--
source/Lib/EncoderLib/VLCWriter.cpp | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index c6e7b899b..3b04022b9 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -461,7 +461,11 @@ enum SliceType
NUMBER_OF_SLICE_TYPES = 3
};
+#if JVET_Q0265
+/// chroma formats (according to how the monochrome or the color planes are intended to be coded)
+#else
/// chroma formats (according to semantics of chroma_format_idc)
+#endif
enum ChromaFormat
{
CHROMA_400 = 0,
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index e60ab7047..788b5ea42 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1490,7 +1490,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
#if JVET_Q0147_JCCR_SIGNALLING
#if JVET_Q0265
- if (chromaArrayType != 0)
+ if (chromaArrayType != CHROMA_400)
#else
if (pcSPS->getChromaFormatIdc() != CHROMA_400)
#endif
@@ -1643,7 +1643,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
}
#if JVET_Q0265
- if (chromaArrayType == 3)
+ if (chromaArrayType == CHROMA_444)
#else
if (pcSPS->getChromaFormatIdc() == CHROMA_444)
#endif
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 4c34aa78a..78030d791 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -956,7 +956,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
#if JVET_Q0147_JCCR_SIGNALLING
#if JVET_Q0265
- if (chromaArrayType != 0)
+ if (chromaArrayType != CHROMA_400)
#else
if (pcSPS->getChromaFormatIdc() != CHROMA_400)
#endif
--
GitLab