Changeset 189 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSlice.cpp


Ignore:
Timestamp:
18 Nov 2012, 22:11:37 (12 years ago)
Author:
tech
Message:

Reintegrated branch 4.1-dev0 Rev. 188.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncSlice.cpp

    r120 r189  
    3838#include "TEncTop.h"
    3939#include "TEncSlice.h"
    40 #if HHI_VSO_SPEEDUP_A0033
    4140#include "../../App/TAppEncoder/TAppEncTop.h"
    42 #endif
    4341#include <math.h>
    4442
     
    191189  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());
    192190#endif
    193 
     191#if LGE_ILLUCOMP_B0045
     192  rpcSlice->setApplyIC(false);
     193#endif
    194194  // set mutliview parameters
    195195  rpcSlice->initMultiviewSlice( pcPic->getCodedScale(), pcPic->getCodedOffset() );
     
    648648  TComSlice* pcSlice            = rpcPic->getSlice(getSliceIdx());
    649649  xDetermineStartAndBoundingCUAddr ( uiStartCUAddr, uiBoundingCUAddr, rpcPic, false );
    650 #if LG_ZEROINTRADEPTHRESI_M26039
     650#if LG_ZEROINTRADEPTHRESI_A0087
    651651  rpcPic->setIntraPeriod(this->m_pcCfg->getIntraPeriod());
    652652#endif
     
    657657  m_uiPicDist       = 0;
    658658 
    659 #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     659#if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG
    660660  Bool bReset =(pcSlice->getPOC() == 0) ||
    661661    (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     
    769769  UInt uiTilesAcross  = 0;
    770770
     771#if LGE_ILLUCOMP_B0045
     772  if (pcEncTop->getViewId() != 0 && !pcEncTop->isDepthCoder() && pcEncTop->getUseIC())   // DCP of ViewID 0 is not available
     773  {
     774    pcSlice ->xSetApplyIC();
     775  }
     776#endif
     777
    771778  if( m_pcCfg->getUseSBACRD() )
    772779  {
     
    814821  UInt uiTileLCUX     = 0;
    815822
    816 #if HHI_VSO_SPEEDUP_A0033
    817823  Int iLastPosY = -1;
    818 #endif
    819824
    820825  // for every CU in slice
     
    829834    pcCU->initCU( rpcPic, uiCUAddr );
    830835
    831 #if HHI_VSO_SPEEDUP_A0033
    832836    if ( m_pcRdCost->getUseRenModel() )
    833837    {
     
    843847      }
    844848    }   
    845 #endif
    846 
    847 #if OL_DEPTHLIMIT_A0044 //stop dumping partition information
    848     m_bDumpPartInfo = 0;
    849     pcCU->setPartDumpFlag(m_bDumpPartInfo);
    850 #endif
    851849
    852850    // inherit from TR if necessary, select substream to use.
     
    13071305    }
    13081306
     1307#if OL_QTLIMIT_PREDCODING_B0068
     1308    rpcPic->setReduceBitsFlag(true);
     1309#endif
     1310
    13091311    TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );   
    1310 #if OL_DEPTHLIMIT_A0044
    1311     pcCU->setPartDumpFlag(m_bDumpPartInfo);
    1312     pcCU->resetPartInfo();
    1313 #endif
    13141312#if !REMOVE_TILE_DEPENDENCE
    13151313    if( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
     
    13991397    }
    14001398#endif
     1399
     1400#if OL_QTLIMIT_PREDCODING_B0068
     1401    rpcPic->setReduceBitsFlag(false);
     1402#endif
     1403
    14011404  }
    14021405
Note: See TracChangeset for help on using the changeset viewer.