Wrong derivation condition of modified qP, rectNonTsFlag, bdShift in 8.7.3 Scaling process for transform coefficients

[tsukuba.takeshi]

In current spec text D7 v10, the modified qP, rectNonTsFlag,and bdShift are derived as follows:

The quantization parameter qP is modified and the variables rectNonTsFlag, and bdShift are derived as follows:
–If transform_skip_flag[ xTbY ][ yTbY ][ cIdx ] is equal to 0, the following applies:

qP = qP − ( cu_act_enabled_flag[ xTbY ][ yTbY ] ? 5 : 0 ) (8-938)
rectNonTsFlag = 0 (8-939)
bdShift = 10 (8-940)

–Otherwise, if transform_skip_flag[ xTbY ][ yTbY ][ cIdx ] is equal to 1, the following applies:

qP = Max( QpPrimeTsMin, qP ) − ( cu_act_enabled_flag[ xTbY ][ yTbY ] ? 5 : 0 ) (8-941)
rectNonTsFlag = ( ( ( Log2( nTbW ) + Log2( nTbH ) ) & 1 ) = = 1 (8-942)
bdShift = BitDepth + ( rectNonTsFlag ? 1 : 0 ) + ( ( Log2( nTbW ) + Log2( nTbH ) ) / 2 ) − 5 + pic_dep_quant_enabled_flag (8-943)

However, as implemented in VTM SW, it should be as bellow:
The quantization parameter qP is modified and the variables rectNonTsFlag, and bdShift are derived as follows:
–If transform_skip_flag[ xTbY ][ yTbY ][ cIdx ] is equal to 10, the following applies:

qP = Max(QpPrimeTsMin, qP )− ( cu_act_enabled_flag[ xTbY ][ yTbY ] ? 5 : 0 ) (8-938)
rectNonTsFlag = 0 (8-939)
bdShift = 10 (8-940)

–Otherwise, if transform_skip_flag[ xTbY ][ yTbY ][ cIdx ] is equal to 01, the following applies:

qP = Max( QpPrimeTsMin, qP ) qP − ( cu_act_enabled_flag[ xTbY ][ yTbY ] ? 5 : 0 ) (8-941)
rectNonTsFlag = ( ( ( Log2( nTbW ) + Log2( nTbH ) ) & 1 ) = = 1 (8-942)
bdShift = BitDepth + ( rectNonTsFlag ? 1 : 0 ) + ( ( Log2( nTbW ) + Log2( nTbH ) ) / 2 ) − 5 + pic_dep_quant_enabled_flag (8-943)

[bbross]

Thanks for reporting.

This will be fixed JVET-P2001-vB.