Ignore:
Timestamp:
21 Oct 2013, 18:20:56 (11 years ago)
Author:
tech
Message:

Added missing parts of merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComSlice.cpp

    r651 r652  
    832832  {
    833833    pocCRA = getPOC();
     834    associatedIRAPType = getNalUnitType();
    834835  }
    835836  else if ( getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
     
    13151316      else
    13161317      {
     1318        Int pocCycle = 1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC();
     1319        Int curPoc = rpcPic->getPicSym()->getSlice(0)->getPOC() & (pocCycle-1);
     1320        Int refPoc = pReferencePictureSet->getPOC(i) & (pocCycle-1);
     1321        if(rpcPic->getIsLongTerm() && curPoc == refPoc)
    13171322        {
    13181323          isReference = 1;
     
    13741379      else
    13751380      {
     1381        Int pocCycle = 1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC();
     1382        Int curPoc = rpcPic->getPicSym()->getSlice(0)->getPOC() & (pocCycle-1);
     1383        Int refPoc = pReferencePictureSet->getPOC(i) & (pocCycle-1);
     1384        if(rpcPic->getIsLongTerm() && curPoc == refPoc && rpcPic->getSlice(0)->isReferenced())
    13761385        {
    13771386          isAvailable = 1;
Note: See TracChangeset for help on using the changeset viewer.