Ticket #840: wpp_840_slice_length.patch

File wpp_840_slice_length.patch, 1.4 KB (added by stworrall, 11 years ago)

Patch for original ticket 840 patch

  • TEncSlice.cpp

     
    15651565      uiBoundingCUAddrSlice    = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU();
    15661566      break;
    15671567    }
    1568     // set the slice end address to the end of the SCU row if the slice does not start at the beginning of an SCU row
    1569     if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0))
    1570     {
    1571       uiBoundingCUAddrSlice = uiStartCUAddrSlice - (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU())) + (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU());
    1572     }
     1568
    15731569    pcSlice->setSliceCurEndCUAddr( uiBoundingCUAddrSlice );
    15741570  }
    15751571  else
    … …  
    16051601      uiBoundingCUAddrSlice    = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU();
    16061602      break;
    16071603    }
    1608     // set the slice end address to the end of the SCU row if the slice does not start at the beginning of an SCU row
    1609     if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0))
    1610     {
    1611       uiBoundingCUAddrSlice = uiStartCUAddrSlice - (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU())) + (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU());
    1612     }
     1604
    16131605    pcSlice->setSliceCurEndCUAddr( uiBoundingCUAddrSlice );
    16141606  }
    16151607