From 2262436f58a176e7dc18c36eace8c7edb1fe7faa Mon Sep 17 00:00:00 2001
From: Cheung Auyeung <cauyeung@tencent.com>
Date: Fri, 31 Jan 2020 11:36:48 -0800
Subject: [PATCH] VET-Q0265: Cleanup for monochrome and independently coded
color planes in SPS.
---
.cproject | 14 +++++++-------
source/Lib/CommonLib/TypeDef.h | 2 ++
source/Lib/DecoderLib/VLCReader.cpp | 12 ++++++++++++
source/Lib/EncoderLib/VLCWriter.cpp | 15 +++++++++++++++
4 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/.cproject b/.cproject
index b21a40200..2a49f8c85 100644
--- a/.cproject
+++ b/.cproject
@@ -15,17 +15,17 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
- <configuration artifactName="NextSoftware" buildProperties="" description="" id="0.1016432906" name="Debug" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+ <configuration artifactName="NextSoftware" buildProperties="" description="" id="0.1016432906" name="Debug" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<folderInfo id="0.1016432906." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.933479584" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.933479584.1459403248" name=""/>
- <builder autoBuildTarget="all" cleanBuildTarget="clean-d" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.570174842" incrementalBuildTarget="debug" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" stopOnErr="true" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+ <builder autoBuildTarget="all" buildPath="${workspace_loc:/NextSoftware/build}" cleanBuildTarget="clean-d" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.570174842" incrementalBuildTarget="debug" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" stopOnErr="true" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.828348670" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.583631412" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1384928355" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.583506013" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
- <option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1674294823" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
+ <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.incpaths.1674294823" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value=""${workspace_loc:/NextSoftware/NextSoftware/include}""/>
<listOptionValue builtIn="false" value=""${workspace_loc:/NextSoftware/BoostBuild/include}""/>
<listOptionValue builtIn="false" value="../../Boost_1_63_0-c++11"/>
@@ -34,7 +34,7 @@
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.167080493" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1616619761" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
- <option id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.451371083" name="Undefined Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
+ <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.undef.incpaths.451371083" name="Undefined Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.undef.incpaths" valueType="undefIncludePath">
<listOptionValue builtIn="false" value="/home/guether/projects/Boost_1_44_0"/>
<listOptionValue builtIn="false" value="/home/guether/projects/Boost_1_46_0"/>
</option>
@@ -66,7 +66,7 @@
<folderInfo id="0.1016432906.1790096921." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.201675184" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.201675184.1563434207" name=""/>
- <builder autoBuildTarget="all" cleanBuildTarget="clean-r" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1492684152" incrementalBuildTarget="release" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+ <builder autoBuildTarget="all" buildPath="${workspace_loc:/NextSoftware/build}" cleanBuildTarget="clean-r" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1492684152" incrementalBuildTarget="release" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1412840482" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.199978809" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.191977596" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -132,10 +132,10 @@
<configuration configurationName="DebugShared">
<resource resourceType="PROJECT" workspacePath="/NextSoftware"/>
</configuration>
- <configuration configurationName="ReleaseShared">
+ <configuration configurationName="RelWithDebInfo">
<resource resourceType="PROJECT" workspacePath="/NextSoftware"/>
</configuration>
- <configuration configurationName="RelWithDebInfo">
+ <configuration configurationName="ReleaseShared">
<resource resourceType="PROJECT" workspacePath="/NextSoftware"/>
</configuration>
<configuration configurationName="Debug">
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index b81ae1120..c6e7b899b 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -67,6 +67,8 @@
#define JVET_Q0512_ENC_CHROMA_TS_ACT 1 // JVET-Q0512: encoder-side improvement on enabling chroma transform-skip for ACT
#define JVET_Q0446_MIP_CONST_SHIFT_OFFSET 1 // JVET-Q0446: MIP with constant shift and offset
+#define JVET_Q0265 1 // JVET-Q0265: Cleanup for monochrome and independently coded color planes
+
#define JVET_Q0447_WP_PARAM_ESTIM 1 // JVET-Q0447: Add search iterations for method 2,3 and 4
#define JVET_Q0820_ACT 1 // JVET-Q0820: ACT bug fixes and reversible ACT transform
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index dc99e15ee..31c279b8d 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1190,6 +1190,10 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG( uiCode, "ref_pic_resampling_enabled_flag" ); pcSPS->setRprEnabledFlag( uiCode );
#endif
+#if JVET_Q0265
+ const uint32_t chromaArrayType = (int) pcSPS->getSeparateColourPlaneFlag() ? 0 : pcSPS->getChromaFormatIdc();
+#endif
+
READ_UVLC( uiCode, "pic_width_max_in_luma_samples" ); pcSPS->setMaxPicWidthInLumaSamples( uiCode );
READ_UVLC( uiCode, "pic_height_max_in_luma_samples" ); pcSPS->setMaxPicHeightInLumaSamples( uiCode );
@@ -1485,7 +1489,11 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG( uiCode, "sps_max_luma_transform_size_64_flag"); pcSPS->setLog2MaxTbSize( (uiCode ? 1 : 0) + 5 );
#if JVET_Q0147_JCCR_SIGNALLING
+#if JVET_Q0265
+ if (chromaArrayType != 0)
+#else
if (pcSPS->getChromaFormatIdc() != CHROMA_400)
+#endif
{
READ_FLAG(uiCode, "sps_joint_cbcr_enabled_flag"); pcSPS->setJointCbCrEnabledFlag(uiCode ? true : false);
#else
@@ -1634,7 +1642,11 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setProfControlPresentFlag( false );
}
}
+#if JVET_Q0265
+ if (chromaArrayType == 3)
+#else
if (pcSPS->getChromaFormatIdc() == CHROMA_444)
+#endif
{
#if JVET_Q0820_ACT
if (pcSPS->getLog2MaxTbSize() != 6)
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index e630c7978..4c34aa78a 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -774,10 +774,21 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_CODE(int(pcSPS->getChromaFormatIdc ()), 2, "chroma_format_idc");
const ChromaFormat format = pcSPS->getChromaFormatIdc();
+#if JVET_Q0265
+ const uint32_t separate_colour_plane_flag = pcSPS->getSeparateColourPlaneFlag();
+ if( format == CHROMA_444 )
+ {
+ CHECK(separate_colour_plane_flag != 0, "separate_colour_plane_flag is not '0'");
+ WRITE_FLAG( separate_colour_plane_flag, "separate_colour_plane_flag");
+ }
+
+ const uint32_t chromaArrayType = separate_colour_plane_flag ? 0 : format;
+#else
if( format == CHROMA_444 )
{
WRITE_FLAG( 0, "separate_colour_plane_flag");
}
+#endif
#if JVET_Q0043_RPR_and_Subpics
WRITE_FLAG( pcSPS->getRprEnabledFlag(), "res_change_in_clvs_allowed_flag" );
@@ -944,7 +955,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG( (pcSPS->getLog2MaxTbSize() - 5) ? 1 : 0, "sps_max_luma_transform_size_64_flag" );
#if JVET_Q0147_JCCR_SIGNALLING
+#if JVET_Q0265
+ if (chromaArrayType != 0)
+#else
if (pcSPS->getChromaFormatIdc() != CHROMA_400)
+#endif
{
WRITE_FLAG(pcSPS->getJointCbCrEnabledFlag(), "sps_joint_cbcr_enabled_flag");
#else
--
GitLab