Commit 25f06c56 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'fixDeltaQpParsingForMultipleTUs' into 'master'

Fix of the DQP signaling with multiple TUs (Ticket #181)

See merge request jvet/VVCSoftware_VTM!280
parents e704b84f 169c2f78
......@@ -2655,7 +2655,11 @@ void CABACReader::transform_unit( TransformUnit& tu, CUCtx& cuCtx, ChromaCbfs& c
CodingUnit& cu = *tu.cu;
bool lumaOnly = ( cu.chromaFormat == CHROMA_400 || !tu.blocks[COMPONENT_Cb].valid() );
bool cbfLuma = ( tu.cbf[ COMPONENT_Y ] != 0 );
#if JVET_M0102_INTRA_SUBPARTITIONS
bool cbfChroma = ( lumaOnly ? false : ( chromaCbfs.Cb || chromaCbfs.Cr ) );
#else
bool cbfChroma = ( cu.chromaFormat == CHROMA_400 ? false : ( chromaCbfs.Cb || chromaCbfs.Cr ) );
#endif
if( cbfLuma || cbfChroma )
{
......
......@@ -2485,7 +2485,11 @@ void CABACWriter::transform_unit( const TransformUnit& tu, CUCtx& cuCtx, ChromaC
bool cbfLuma = ( cbf[ COMPONENT_Y ] != 0 );
bool cbfChroma = false;
#if JVET_M0102_INTRA_SUBPARTITIONS
if( !lumaOnly )
#else
if( cu.chromaFormat != CHROMA_400 )
#endif
{
if( tu.blocks[COMPONENT_Cb].valid() )
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment