Skip to content

GitLab

V
VVCSoftware_BMS
Commit 6f68026f authored by Frank Bossen's avatar Frank Bossen
Browse files
Options

Merge branch 'K0206-Integration' into 'master' 

allow VTM compilation in case of #define HEVC_USE_SIGN_HIDING 0

See merge request !114
parents daf0108a 05070df7
Pipeline #124 passed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 2 deletions
    source/Lib/DecoderLib/CABACReader.cpp
    View file @ 6f68026f
    ......@@ -2818,7 +2818,7 @@ void CABACReader::cu_chroma_qp_offset( CodingUnit& cu )
    void CABACReader::residual_coding( TransformUnit& tu, ComponentID compID )
    {
    #if ENABLE_TRACING || HEVC_USE_SIGN_HIDING || JEM_TOOLS
    #if ENABLE_TRACING || HEVC_USE_SIGN_HIDING || JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
    const CodingUnit& cu = *tu.cu;
    #endif
    DTRACE( g_trace_ctx, D_SYNTAX, "residual_coding() etype=%d pos=(%d,%d) size=%dx%d predMode=%d\n", tu.blocks[compID].compID, tu.blocks[compID].x, tu.blocks[compID].y, tu.blocks[compID].width, tu.blocks[compID].height, cu.predMode );
    ......
    source/Lib/EncoderLib/CABACWriter.cpp
    View file @ 6f68026f
    ......@@ -2963,7 +2963,7 @@ void CABACWriter::cu_chroma_qp_offset( const CodingUnit& cu )
    void CABACWriter::residual_coding( const TransformUnit& tu, ComponentID compID )
    {
    #if ENABLE_TRACING || HEVC_USE_SIGN_HIDING || JEM_TOOLS
    #if ENABLE_TRACING || HEVC_USE_SIGN_HIDING || JEM_TOOLS || JVET_K1000_SIMPLIFIED_EMT
    const CodingUnit& cu = *tu.cu;
    #endif
    DTRACE( g_trace_ctx, D_SYNTAX, "residual_coding() etype=%d pos=(%d,%d) size=%dx%d predMode=%d\n", tu.blocks[compID].compID, tu.blocks[compID].x, tu.blocks[compID].y, tu.blocks[compID].width, tu.blocks[compID].height, cu.predMode );
    ......
    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