Changeset 332 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSbac.cpp


Ignore:
Timestamp:
21 Apr 2013, 19:13:11 (11 years ago)
Author:
tech
Message:

Merged branch 6.1-Cleanup@329.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecSbac.cpp

    r296 r332  
    707707  UInt uiSymbol;
    708708
    709 #if OL_QTLIMIT_PREDCODING_B0068
     709#if H3D_QTL
    710710  Bool bParseSplitFlag    = true;
    711711
     
    715715  Bool bIntraSliceDetect  = (pcCU->getSlice()->getSliceType() == I_SLICE);
    716716
    717 #if HHI_QTLPC_RAU_OFF_C0160
    718717  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    719718  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
    720 #else
    721   if(bDepthMapDetect && !bIntraSliceDetect && sps->getUseQTLPC())
    722 #endif
    723719  {
    724720    TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
     
    733729    DTRACE_CABAC_VL( g_nSymbolCounter++ )
    734730    DTRACE_CABAC_T( "\tSplitFlag\n" )
    735 #if OL_QTLIMIT_PREDCODING_B0068
     731#if H3D_QTL
    736732  }
    737733  else
     
    755751  PartSize eMode;
    756752
    757 #if OL_QTLIMIT_PREDCODING_B0068
     753#if H3D_QTL
    758754  Bool bParsePartSize    = true;
    759755  TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
     
    762758  Bool bIntraSliceDetect = (pcCU->getSlice()->getSliceType() == I_SLICE);
    763759
    764 #if HHI_QTLPC_RAU_OFF_C0160
    765760  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
    766761  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
    767 #else
    768   if(bDepthMapDetect && !bIntraSliceDetect && sps->getUseQTLPC())
    769 #endif
    770762  {
    771763    TComDataCU *pcTextureCU = pcTexture->getCU(pcCU->getAddr());
     
    781773  if ( pcCU->isIntra( uiAbsPartIdx ) )
    782774  {
    783 #if OL_QTLIMIT_PREDCODING_B0068
     775#if H3D_QTL
    784776    if(bParsePartSize)
    785777    {
     
    791783      }
    792784      eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN;
    793 #if OL_QTLIMIT_PREDCODING_B0068
     785#if H3D_QTL
    794786    }
    795787#endif
     
    809801  else
    810802  {
    811 #if OL_QTLIMIT_PREDCODING_B0068
     803#if H3D_QTL
    812804    if(bParsePartSize)
    813805    {
     
    849841        }
    850842      }
    851 #if OL_QTLIMIT_PREDCODING_B0068
     843#if H3D_QTL
    852844    }
    853845#endif
Note: See TracChangeset for help on using the changeset viewer.