From d04491c7ef520394c0c0389817f3ab03f0c8eadb Mon Sep 17 00:00:00 2001
From: Alican Nalci <analci@qti.qualcomm.com>
Date: Thu, 6 Feb 2020 02:45:07 +0100
Subject: [PATCH] Fix #856: chroma BDPCM for monochrome
---
source/Lib/DecoderLib/CABACReader.cpp | 2 +-
source/Lib/EncoderLib/CABACWriter.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index 1d27c4866..8460ee86b 100644
--- a/source/Lib/DecoderLib/CABACReader.cpp
+++ b/source/Lib/DecoderLib/CABACReader.cpp
@@ -1219,7 +1219,7 @@ void CABACReader::cu_pred_data( CodingUnit &cu )
#endif
intra_luma_pred_modes( cu );
#if JVET_Q0110_Q0785_CHROMA_BDPCM_420
- if( !cu.Y().valid() || ( !cu.isSepTree() && cu.Y().valid() ) )
+ if( ( !cu.Y().valid() || (!cu.isSepTree() && cu.Y().valid() ) ) && isChromaEnabled(cu.chromaFormat) )
{
bdpcm_mode(cu, ComponentID(CHANNEL_TYPE_CHROMA));
}
diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 73158c746..a867f1691 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -885,7 +885,7 @@ void CABACWriter::cu_pred_data( const CodingUnit& cu )
intra_luma_pred_modes ( cu );
#if JVET_Q0110_Q0785_CHROMA_BDPCM_420
- if( !cu.Y().valid() || ( !cu.isSepTree() && cu.Y().valid() ) )
+ if( ( !cu.Y().valid() || ( !cu.isSepTree() && cu.Y().valid() ) ) && isChromaEnabled(cu.chromaFormat) )
{
bdpcm_mode( cu, ComponentID(CHANNEL_TYPE_CHROMA) );
}
--
GitLab