Changeset 229 in 3DVCSoftware for branches/HTM-5.1-dev1-HHI


Ignore:
Timestamp:
25 Jan 2013, 14:45:24 (11 years ago)
Author:
hhi-htm
Message:

bug fix

Location:
branches/HTM-5.1-dev1-HHI/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev1-HHI/source/Lib/TLibDecoder/TDecSbac.cpp

    r228 r229  
    763763
    764764#if HHI_QTLPC_RAU_OFF_C0160
    765   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
     765  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    766766  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
    767767#else
     
    810810
    811811#if HHI_QTLPC_RAU_OFF_C0160
    812   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
     812  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    813813  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
    814814#else
  • branches/HTM-5.1-dev1-HHI/source/Lib/TLibEncoder/TEncCu.cpp

    r228 r229  
    459459
    460460#if HHI_QTLPC_RAU_OFF_C0160
    461   Bool rapPic     = (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
     461  Bool rapPic     = (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    462462#endif
    463463
     
    11191119      if ( !bEarlySkip
    11201120#if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    1121         || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
     1121        || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
    11221122#endif
    11231123        )
     
    11301130          rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0
    11311131#if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    1132           || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
     1132          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
    11331133#endif           
    11341134          ) && !bFullyRenderedSec ) // avoid very complex intra if it is unlikely
     
    11391139          rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0     
    11401140#if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    1141           || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
     1141          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
    11421142#endif     
    11431143          ) // avoid very complex intra if it is unlikely
  • branches/HTM-5.1-dev1-HHI/source/Lib/TLibEncoder/TEncSbac.cpp

    r228 r229  
    626626 
    627627#if HHI_QTLPC_RAU_OFF_C0160
    628   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
     628  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    629629  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC() && pcCU->getPic()->getReduceBitsFlag())
    630630#else
     
    930930
    931931#if HHI_QTLPC_RAU_OFF_C0160
    932   Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
     932  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    933933  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC() && pcCU->getPic()->getReduceBitsFlag())
    934934#else
Note: See TracChangeset for help on using the changeset viewer.