Ticket #105: suggested_fix.diff

File suggested_fix.diff, 1.3 KB (added by ruoyang, 5 years ago)

suggested_patch

  • source/Lib/DecoderLib/CABACReader.cpp 

    diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp
index d53cf46..c4e092d 100644
    a b void CABACReader::triangle_mode( CodingUnit& cu ) 
    18681868  {
    18691869    return;
    18701870  }
    1871  
     1871
     1872#if JVET_L0054_MMVD
     1873  if ( cu.firstPU->mmvdMergeFlag || cu.mmvdSkip )
     1874  {
     1875    return;
     1876  }
     1877#endif
     1878
     1879#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
     1880  if ( cu.firstPU->mhIntraFlag )
     1881  {
     1882    return;
     1883  }
     1884#endif
     1885
    18721886  unsigned flag_idx = DeriveCtx::CtxTriangleFlag( cu );
    18731887  cu.triangle = m_BinDecoder.decodeBin( Ctx::TriangleFlag(flag_idx) );
    18741888

  • source/Lib/EncoderLib/CABACWriter.cpp 

    diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index 8fe9427..8b88ab4 100644
    a b void CABACWriter::triangle_mode( const CodingUnit& cu ) 
    18191819    return;
    18201820  }
    18211821
     1822#if JVET_L0054_MMVD
     1823  if ( cu.firstPU->mmvdMergeFlag || cu.mmvdSkip )
     1824  {
     1825    return;
     1826  }
     1827#endif
     1828
     1829#if JVET_L0100_MULTI_HYPOTHESIS_INTRA
     1830  if ( cu.firstPU->mhIntraFlag )
     1831  {
     1832    return;
     1833  }
     1834#endif
     1835
    18221836  unsigned flag_idx     = DeriveCtx::CtxTriangleFlag( cu );
    18231837
    18241838  m_BinEncoder.encodeBin( cu.triangle, Ctx::TriangleFlag(flag_idx) );