Ignore:
Timestamp:
19 Nov 2012, 21:15:40 (12 years ago)
Author:
mitsubishi-htm
Message:

A second release, as planned

  • Migrate to HTM 4.1
  • Move VSP related switches to cfg file instead of #define in the source code
  • A few bug fixes
  • For VC project files, only VC9 file is updated

TODO

  • Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r166 r193  
    7676  if( ucVspMergePos == VSP_MERGE_POS )
    7777  {
    78 #if VSP_TEXT_ONLY
    79     if( !getSlice()->getSPS()->isDepth() )
     78#if VSP_CFG
     79    if( getSlice()->getSPS()->getVspDepthPresentFlag() || !getSlice()->getSPS()->isDepth() )
     80#else
     81    if( !getSlice()->getVspDepthDisableFlag() || !getSlice()->getSPS()->isDepth() )
    8082#endif
    8183    if( getSlice()->getSPS()->getViewId()!=0 && !bVspMvZeroDone )
     
    150152  m_pcTrCoeffCr        = NULL;
    151153#if ADAPTIVE_QP_SELECTION 
     154#if FIX_MEM_LEAKS
     155  m_ArlCoeffIsAliasedAllocation = false;
    152156  m_pcArlCoeffY        = NULL;
    153157  m_pcArlCoeffCb       = NULL;
    154158  m_pcArlCoeffCr       = NULL;
     159#endif
    155160#endif
    156161 
     
    211216  m_piEdgeDeltaDC1      = NULL;
    212217#endif
     218#endif
     219#if OL_DEPTHLIMIT_A0044
     220  //add a variable to store the partition information
     221  //a 2D array in part_symbol, uidepth format
     222  //initialize m_partInfo to OL_END_CU
     223  for (Int i=0; i < OL_PART_BUF_SIZE; i++)
     224  {
     225    for (Int j=0; j < 2; j++)
     226    {
     227      m_uiPartInfo[i][j] = OL_END_CU;
     228    }
     229  }
    213230#endif
    214231}
     
    295312      m_pcArlCoeffCb       = m_pcGlbArlCoeffCb;
    296313      m_pcArlCoeffCr       = m_pcGlbArlCoeffCr;
     314#if FIX_MEM_LEAKS
     315      m_ArlCoeffIsAliasedAllocation = true;
     316#endif
    297317    }
    298318    else
     
    410430    if ( m_pcTrCoeffCr        ) { xFree(m_pcTrCoeffCr);         m_pcTrCoeffCr       = NULL; }
    411431#if ADAPTIVE_QP_SELECTION
     432#if FIX_MEM_LEAKS
     433    if (!m_ArlCoeffIsAliasedAllocation)
     434    {
     435      xFree(m_pcArlCoeffY); m_pcArlCoeffY = 0;
     436      xFree(m_pcArlCoeffCb); m_pcArlCoeffCb = 0;
     437      xFree(m_pcArlCoeffCr); m_pcArlCoeffCr = 0;
     438    }
     439#endif
    412440    if ( m_pcGlbArlCoeffY     ) { xFree(m_pcGlbArlCoeffY);      m_pcGlbArlCoeffY    = NULL; }
    413441    if ( m_pcGlbArlCoeffCb    ) { xFree(m_pcGlbArlCoeffCb);     m_pcGlbArlCoeffCb   = NULL; }
     
    516544Void TComDataCU::initCU( TComPic* pcPic, UInt iCUAddr )
    517545{
     546#if OL_DEPTHLIMIT_A0044
     547  TComDataCU* pcCU     = pcPic->getCU(iCUAddr);
     548#endif
    518549
    519550  m_pcPic              = pcPic;
     
    732763    m_apcCUColocated[1] = getSlice()->getRefPic( REF_PIC_LIST_1, 0)->getCU( m_uiCUAddr );
    733764  }
     765#if OL_DEPTHLIMIT_A0044
     766  setPartDumpFlag (pcCU->getPartDumpFlag());
     767#endif
    734768}
    735769
     
    10611095  memcpy(m_uiSliceStartCU,pcCU->m_uiSliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition);
    10621096  memcpy(m_uiEntropySliceStartCU,pcCU->m_uiEntropySliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition);
     1097#if OL_DEPTHLIMIT_A0044
     1098  setPartDumpFlag (pcCU->getPartDumpFlag());
     1099#endif
    10631100}
    10641101
     
    23462383#if H0204_QP_PREDICTION
    23472384  UInt        lPartIdx, aPartIdx;
     2385#if FIX_COMP_WARNING_INIT
     2386  lPartIdx = 0;
     2387  aPartIdx = 0;
     2388#endif
    23482389  TComDataCU* cULeft  = getQpMinCuLeft ( lPartIdx, m_uiAbsIdxInLCU + uiCurrAbsIdxInLCU );
    23492390  TComDataCU* cUAbove = getQpMinCuAbove( aPartIdx, m_uiAbsIdxInLCU + uiCurrAbsIdxInLCU );
     
    31463187    RefPicList eRefList = uiRefIdx ? REF_PIC_LIST_1 : REF_PIC_LIST_0;
    31473188    Int iBestRefIdx = getCUMvField(eRefList)->getRefIdx(uiPartAddr);
    3148     if(iBestRefIdx >= 0 && getSlice()->getViewId() == getSlice()->getRefViewId(eRefList, iBestRefIdx))
     3189    if(iBestRefIdx >= 0 && getSlice()->getViewId() == getSlice()->getRefViewId(eRefList, iBestRefIdx)
     3190#if VSP_N
     3191                        && getSlice()->getPOC() != getSlice()->getRefPOC(eRefList, iBestRefIdx)
     3192#endif
     3193      )
    31493194      iAddResiShift++;
    31503195  }
     
    46144659#endif
    46154660  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
    4616 #if VSP_N
    4617   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4618 #endif
    46194661  {
    46204662    for(Int iList = 0; iList < (getSlice()->isInterB() ? 2: 1); iList ++)
     
    46254667      {
    46264668        Int refViewIdx  = pcTmpCU->getSlice()->getRefViewId( eRefPicList, refId);
     4669#if VSP_N & VSP_BUGFIX
     4670        Int refPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId);
     4671        //if( !pcTmpCU->isVspRef( eRefPicList, refId ) )
     4672        if ( refViewIdx!= m_pcSlice->getViewId() || refPOC != m_pcSlice->getPOC())
     4673#else
    46274674        if (refViewIdx!= m_pcSlice->getViewId())
     4675#endif
    46284676        {
    46294677           TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    46434691
    46444692  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    4645 #if VSP_N
    4646   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4647 #endif
    46484693  {
    46494694    for(Int iList = 0; iList < (getSlice()->isInterB() ? 2: 1); iList ++)
     
    46544699      {
    46554700        Int refViewIdx  = pcTmpCU->getSlice()->getRefViewId( eRefPicList, refId);
     4701#if VSP_N & VSP_BUGFIX
     4702        Int refPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId);
     4703        //if( !pcTmpCU->isVspRef( eRefPicList, refId ) )
     4704        if ( refViewIdx!= m_pcSlice->getViewId() || refPOC != m_pcSlice->getPOC())
     4705#else
    46564706        if (refViewIdx!= m_pcSlice->getViewId())
     4707#endif
    46574708        {
    46584709           TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    46724723#endif
    46734724  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
    4674 #if VSP_N
    4675   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4676 #endif
    46774725  {
    46784726    for(Int iList = 0; iList < (getSlice()->isInterB() ? 2: 1); iList ++)
     
    46834731      {
    46844732        Int refViewIdx  = pcTmpCU->getSlice()->getRefViewId( eRefPicList, refId);
     4733#if VSP_N & VSP_BUGFIX
     4734        Int refPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId);
     4735        //if( !pcTmpCU->isVspRef( eRefPicList, refId ) )
     4736        if ( refViewIdx!= m_pcSlice->getViewId() || refPOC != m_pcSlice->getPOC())
     4737#else
    46854738        if (refViewIdx!= m_pcSlice->getViewId())
     4739#endif
    46864740        {
    46874741           TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    47004754#endif
    47014755  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    4702 #if VSP_N
    4703   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4704 #endif
    47054756  {
    47064757    for(Int iList = 0; iList < (getSlice()->isInterB() ? 2: 1); iList ++)
     
    47114762      {
    47124763        Int refViewIdx  = pcTmpCU->getSlice()->getRefViewId( eRefPicList, refId);
     4764#if VSP_N & VSP_BUGFIX
     4765        Int refPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId);
     4766        //if( !pcTmpCU->isVspRef( eRefPicList, refId ) )
     4767        if ( refViewIdx!= m_pcSlice->getViewId() || refPOC != m_pcSlice->getPOC())
     4768#else
    47134769        if (refViewIdx!= m_pcSlice->getViewId())
     4770#endif
    47144771        {
    47154772           TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    47314788#endif
    47324789  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    4733 #if VSP_N
    4734   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4735 #endif
    47364790  {
    47374791    for(Int iList = 0; iList < (getSlice()->isInterB() ? 2: 1); iList ++)
     
    47424796      {
    47434797        Int refViewIdx  = pcTmpCU->getSlice()->getRefViewId( eRefPicList, refId);
     4798#if VSP_N & VSP_BUGFIX
     4799        Int refPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId);
     4800        //if( !pcTmpCU->isVspRef( eRefPicList, refId ) )
     4801        if ( refViewIdx!= m_pcSlice->getViewId() || refPOC != m_pcSlice->getPOC())
     4802#else
    47444803        if (refViewIdx!= m_pcSlice->getViewId())
     4804#endif
    47454805        {
    47464806           TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    49655025  UInt uiLeftPartIdx = uiIdx;
    49665026  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
    4967 #if VSP_N
    4968   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    4969 #endif
    49705027  {
    49715028    bTmpIsSkipped = pcTmpCU->isSkipped( uiIdx );
     
    49855042          return;
    49865043        }
     5044#if VSP_N & VSP_BUGFIX
     5045        else if (pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId) != m_pcSlice->getPOC()) // MCP
     5046#else
    49875047        else // MCP
     5048#endif
    49885049        {
    49895050          cTmpMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    50065067
    50075068  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    5008 #if VSP_N
    5009   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    5010 #endif
    50115069  {
    50125070    bTmpIsSkipped = pcTmpCU->isSkipped( uiIdx );
     
    50265084          return;
    50275085        }
     5086#if VSP_N & VSP_BUGFIX
     5087        else if (pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId) != m_pcSlice->getPOC()) // MCP
     5088#else
    50285089        else // MCP
     5090#endif
    50295091        {
    50305092          cTmpMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    50465108#endif
    50475109  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
    5048 #if VSP_N
    5049   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    5050 #endif
    50515110  {
    50525111    bTmpIsSkipped = pcTmpCU->isSkipped( uiIdx );
     
    50665125          return;
    50675126        }
    5068         else  // MCP
     5127#if VSP_N & VSP_BUGFIX
     5128        else if (pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId) != m_pcSlice->getPOC()) // MCP
     5129#else
     5130        else // MCP
     5131#endif
    50695132        {
    50705133          cTmpMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    50865149#endif
    50875150  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    5088 #if VSP_N
    5089   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    5090 #endif
    50915151  {
    50925152    bTmpIsSkipped = pcTmpCU->isSkipped( uiIdx );
     
    51065166          return;
    51075167        }
     5168#if VSP_N & VSP_BUGFIX
     5169        else if (pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId) != m_pcSlice->getPOC()) // MCP
     5170#else
    51085171        else // MCP
     5172#endif
    51095173        {
    51105174          cTmpMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    51285192#endif
    51295193  if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
    5130 #if VSP_N
    5131   if(pcTmpCU->getSlice()->getViewId() != NUM_VIEW_VSP)
    5132 #endif
    51335194  {
    51345195    bTmpIsSkipped = pcTmpCU->isSkipped( uiIdx );
     
    51485209          return;
    51495210        }
     5211#if VSP_N & VSP_BUGFIX
     5212        else if (pcTmpCU->getSlice()->getRefPOC( eRefPicList, refId) != m_pcSlice->getPOC()) // MCP
     5213#else
    51505214        else // MCP
     5215#endif
    51515216        {
    51525217          cTmpMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
     
    57535818  {
    57545819    aiRefIdx[iList] = getCUMvField( RefPicList(iList) )->getRefIdx( uiPartIdx );
    5755     if( aiRefIdx[iList] >= 0 && getSlice()->getRefViewId( RefPicList(iList), aiRefIdx[iList] ) == NUM_VIEW_VSP )
     5820    if( aiRefIdx[iList] >= 0 && isVspRef( RefPicList(iList), aiRefIdx[iList] ) )
    57565821    {
    57575822      iRet |= (iList ? 0x02 : 0x01); // L0=1, L1=2, BI=3
     
    58025867  return iRet;
    58035868}
     5869
     5870Bool TComDataCU::isVspRef ( RefPicList e, Int iRefIdx )
     5871{
     5872  if( iRefIdx < 0 ) return false;
     5873
     5874  if( getSlice()->getRefPic( e, iRefIdx )->getViewId() == getSlice()->getViewId()
     5875   && getSlice()->getRefPic( e, iRefIdx )->getPOC()    == getSlice()->getPOC()   )
     5876  {
     5877    return true;
     5878  }
     5879
     5880  return false;
     5881}
    58045882#endif
    58055883
     
    58665944 
    58675945#if AMVP_VSP_UNAVAILABLE
    5868   if( pcTmpCU != NULL && pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0 && pcTmpCU->getSlice()->getRefViewId( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) == NUM_VIEW_VSP )
     5946  if( pcTmpCU != NULL && pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0 && pcTmpCU->isVspRef( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) )
    58695947  {
    58705948    return false;
     
    59085986      return false;
    59095987    }
     5988#if VSP_N ///
     5989    if( pcTmpCU->isVspRef( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) )
     5990      return false;
     5991#endif
    59105992    iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) );
    59115993    if( iNeibRefPOC == iCurrRefPOC ) // Same Reference Frame But Diff List//
     
    60356117
    60366118#if AMVP_VSP_UNAVAILABLE
    6037   if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0 && pcTmpCU->getSlice()->getRefViewId( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) == NUM_VIEW_VSP )
     6119  if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0 && pcTmpCU->isVspRef( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) )
    60386120  {
    60396121    return false;
     
    60616143    if( pcTmpCU->getSlice()->getRefViewId( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) != m_pcSlice->getRefViewId( eRefPicList, iRefIdx ) )
    60626144      return false;
     6145#if VSP_N ///
     6146    if( pcTmpCU->isVspRef( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) )
     6147      return false;
     6148#endif
    60636149    if( iNeibRefPOC == iCurrRefPOC ) // Same Reference Frame But Diff List//
    60646150    {
     
    60846170      return false;
    60856171    }
     6172#if VSP_N ///
     6173    if( pcTmpCU->isVspRef( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) )
     6174      return false;
     6175#endif
    60866176
    60876177#if VSP_N
    6088     if( pcTmpCU->getSlice()->getRefViewId( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) == NUM_VIEW_VSP )
     6178    if( pcTmpCU->isVspRef( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ) )
    60896179    {
    60906180      bRefVsp = true;
     
    61196209      return false;
    61206210    }
     6211#if VSP_N ///
     6212    if( pcTmpCU->isVspRef( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) )
     6213      return false;
     6214#endif
    61216215
    61226216#if VSP_N
    6123     if( pcTmpCU->getSlice()->getRefViewId( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) == NUM_VIEW_VSP )
     6217    if( pcTmpCU->isVspRef( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) )
    61246218    {
    61256219      bRefVsp = true;
     
    61616255  Int iColViewIdx, iColRefViewIdx;
    61626256  TComPic *pColPic = getSlice()->getRefPic( eRefPicList, refidx);
    6163 #if VSP_MV_ZERO // shimizu
     6257#if VSP_N
     6258  if( pColPic->getSlice(0)->getViewId() == getSlice()->getViewId() && pColPic->getSlice(0)->getPOC() == getSlice()->getPOC() )
     6259  {
     6260    return false;
     6261  }
     6262#endif
    61646263  TComDataCU *pColCU = pColPic->getCU( uiCUAddr );
    61656264  iColViewIdx = pColCU->getSlice()->getViewId();
    6166 #if VSP_N
    6167   if( iColViewIdx == NUM_VIEW_VSP )
    6168   {
    6169     return false;
    6170   }
    6171 #endif
    6172 #else 
    6173 #if VSP_N
    6174   if( pColPic->getSlice(0)->getViewId() == NUM_VIEW_VSP )
    6175   {
    6176     return false;
    6177   }
    6178 #endif
    6179   TComDataCU *pColCU = pColPic->getCU( uiCUAddr );
    6180   iColViewIdx = pColCU->getSlice()->getViewId();
    6181 #endif
     6265
    61826266
    61836267  if (pColCU->getPic()==0||pColCU->getPartitionSize(uiPartUnitIdx)==SIZE_NONE||pColCU->isIntra(uiAbsPartAddr))
     
    62076291    iColRefViewIdx = pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx)->getViewId();
    62086292#if VSP_N
    6209     if( iColRefViewIdx == NUM_VIEW_VSP )
     6293    if( iColRefViewIdx == pColCU->getSlice()->getViewId() && pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx)->getPOC() == pColCU->getSlice()->getPOC() )
    62106294    {
    62116295      continue;
     
    63516435//  UInt uiColRefViewId = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewId();
    63526436  UInt uiCurRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId();
    6353   if( uiCurRefViewId == NUM_VIEW_VSP )
     6437  if( uiCurRefViewId == m_pcSlice->getViewId() && m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC() == m_pcSlice->getPOC() )
    63546438    iScale = 4096;
    63556439  else
     
    63686452  {
    63696453#if VSP_MV_ZERO
    6370     if( uiCurRefViewId == NUM_VIEW_VSP )
     6454    if( uiCurRefViewId == m_pcSlice->getViewId() && m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC() == m_pcSlice->getPOC() )
    63716455      rcMv.setZero();
    63726456    else
     
    64816565    return false;
    64826566  }
     6567#if VSP_N ///
     6568  if( isVspRef( eRefPicList, iRefIdx ) )
     6569  {
     6570    return false;
     6571  }
     6572#endif
    64836573
    64846574  // Prefer a vector crossing us.  Prefer shortest.
     
    64956585    }
    64966586    int iColRefPOC = pColCU->getSlice()->getRefPOC(RefPicList(l), iColRefIdx);
     6587#if VSP_N ///
     6588    Bool bColVsp    = pColCU->isVspRef( RefPicList(getSlice()->isInterB() ? getSlice()->getColDir() : 0), getSlice()->getColRefIdx() );
     6589    Bool bColRefVsp = pColCU->isVspRef( RefPicList(l), iColRefIdx );
     6590    if( ( bColRefVsp && !bColVsp) || (!bColRefVsp &&  bColVsp) )
     6591#endif
    64976592    if( pColCU->getSlice()->getRefViewId( RefPicList(l), iColRefIdx ) != pColCU->getSlice()->getViewId() )
    64986593    {
Note: See TracChangeset for help on using the changeset viewer.