Skip to content

GitLab

V
VVCSoftware_VTM
Commit fed53bb6 authored by Remy Foray's avatar Remy Foray
Browse files
Options

Fix mismatch with spec on condition to write/read lfnst_idx after !1106 

lfnst_idx shall be parsed when IntraSubPartitionsSplitType ==
ISP_NO_SPLIT, whereas the opposite is done currently.
parent d8f67be5
Pipeline #3275 passed with stage
    in 10 minutes and 14 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 4 additions and 4 deletions
    source/Lib/DecoderLib/CABACReader.cpp
    View file @ fed53bb6
    ......@@ -3530,7 +3530,7 @@ void CABACReader::residual_lfnst_mode( CodingUnit& cu, CUCtx& cuCtx )
    const bool isTrSkip = TU::getCbf(*cu.firstTU, COMPONENT_Y) && cu.firstTU->mtsIdx == MTS_SKIP;
    #endif
    #if JVET_P1026_ISP_LFNST_COMBINATION
    if ((!cuCtx.lfnstLastScanPos && !cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isTrSkip)
    if ((!cuCtx.lfnstLastScanPos && cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isTrSkip)
    #else
    if( !cuCtx.lfnstLastScanPos || nonZeroCoeffNonTsCorner8x8 || isTrSkip )
    #endif
    ......@@ -3541,7 +3541,7 @@ void CABACReader::residual_lfnst_mode( CodingUnit& cu, CUCtx& cuCtx )
    const bool isNonDCT2 = (TU::getCbf(*cu.firstTU, ComponentID(COMPONENT_Y)) && cu.firstTU->mtsIdx != MTS_DCT2_DCT2);
    #endif
    #if JVET_P1026_ISP_LFNST_COMBINATION
    if ((!cuCtx.lfnstLastScanPos && !cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isNonDCT2)
    if ((!cuCtx.lfnstLastScanPos && cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isNonDCT2)
    #else
    if( !cuCtx.lfnstLastScanPos || nonZeroCoeffNonTsCorner8x8 || isNonDCT2 )
    #endif
    ......
    source/Lib/EncoderLib/CABACWriter.cpp
    View file @ fed53bb6
    ......@@ -3223,7 +3223,7 @@ void CABACWriter::residual_lfnst_mode( const CodingUnit& cu, CUCtx& cuCtx )
    const bool isTrSkip = TU::getCbf(*cu.firstTU, COMPONENT_Y) && cu.firstTU->mtsIdx == MTS_SKIP;
    #endif
    #if JVET_P1026_ISP_LFNST_COMBINATION
    if( (!cuCtx.lfnstLastScanPos && !cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isTrSkip )
    if( (!cuCtx.lfnstLastScanPos && cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isTrSkip )
    #else
    if( !cuCtx.lfnstLastScanPos || nonZeroCoeffNonTsCorner8x8 || isTrSkip )
    #endif
    ......@@ -3234,7 +3234,7 @@ void CABACWriter::residual_lfnst_mode( const CodingUnit& cu, CUCtx& cuCtx )
    const bool isNonDCT2 = (TU::getCbf(*cu.firstTU, ComponentID(COMPONENT_Y)) && cu.firstTU->mtsIdx != MTS_DCT2_DCT2);
    #endif
    #if JVET_P1026_ISP_LFNST_COMBINATION
    if( (!cuCtx.lfnstLastScanPos && !cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isNonDCT2 )
    if( (!cuCtx.lfnstLastScanPos && cu.ispMode) || nonZeroCoeffNonTsCorner8x8 || isNonDCT2 )
    #else
    if( !cuCtx.lfnstLastScanPos || nonZeroCoeffNonTsCorner8x8 || isNonDCT2 )
    #endif
    ......
    Markdown is supported
    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