Ticket #1379: ticket1379.patch

File ticket1379.patch, 850 bytes (added by libin, 10 years ago)

  • Lib/TLibEncoder/TEncSearch.cpp

     
    50815081  {
    50825082    if( uiLog2TrSize <= pcCU->getSlice()->getSPS()->getQuadtreeTULog2MaxSize() && uiLog2TrSize > pcCU->getQuadtreeTULog2MinSizeInCU(uiAbsPartIdx) )
    50835083    {
    5084       m_pcEntropyCoder->encodeTransformSubdivFlag( bSubdiv, 5 - uiLog2TrSize );
     5084      if((pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && pcCU->isInter(uiAbsPartIdx) && (pcCU->getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N))
     5085      {
     5086        assert(bSubdiv);
     5087      }
     5088      else
     5089      {
     5090        m_pcEntropyCoder->encodeTransformSubdivFlag( bSubdiv, 5 - uiLog2TrSize );
     5091      }
    50855092    }
    50865093
    50875094    assert( !pcCU->isIntra(uiAbsPartIdx) );