Ignore:
Timestamp:
14 Feb 2013, 23:41:41 (12 years ago)
Author:
tech
Message:

Integration of branch dev 2.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r231 r280  
    113113, m_numEntryPointOffsets          ( 0 )
    114114#endif
    115 #if SONY_COLPIC_AVAILABILITY
    116 , m_iViewOrderIdx                 ( 0 )
    117 #endif
    118115#if LGE_ILLUCOMP_B0045
    119116, m_bApplyIC                      ( false )
     117#endif
     118#if INTER_VIEW_VECTOR_SCALING_C0115
     119, m_bIVScalingFlag                (false)
     120, m_iViewOrderIdx                 ( 0 )        // will be changed to view_id
    120121#endif
    121122{
     
    198199#if TILES_WPP_ENTRY_POINT_SIGNALLING
    199200  m_numEntryPointOffsets = 0;
     201#endif
     202#if QC_TMVP_MRG_REFIDX_C0047
     203  m_aiNewRefIdx[0]                  = -1;
     204  m_aiNewRefIdx[1]                  = -1;
    200205#endif
    201206}
     
    419424    }
    420425  }
     426#if QC_TMVP_MRG_REFIDX_C0047
     427  Int  iCurrPOC = this->getPOC();
     428  for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )//just to get one updated ref idx for merge in each L0/L1 direction, if it is not avaialbe, it is still -1
     429  {       
     430    if ( this->getNumRefIdx( RefPicList( uiRefListIdx ) ) == 0)
     431        continue;
     432
     433    Bool bZeroIdxInterViewFlag =  ( this->getRefPic(RefPicList(uiRefListIdx), 0)->getPOC() == iCurrPOC ) ? true : false;
     434    for(Int i = 1; i < this->getNumRefIdx(RefPicList(uiRefListIdx)); i++ )
     435    {
     436      if ( (bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() != iCurrPOC ) ||
     437           (!bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() == iCurrPOC ) )
     438      {
     439        this->setNewRefIdx(RefPicList(uiRefListIdx),i);
     440        break;
     441      }
     442    }
     443  }
     444
     445#endif
    421446}
    422447
     
    698723  m_iPOC                 = pSrc->m_iPOC;
    699724  m_viewId               = pSrc->m_viewId;
    700 #if SONY_COLPIC_AVAILABILITY
    701   m_iViewOrderIdx        = pSrc->m_iViewOrderIdx;
     725#if INTER_VIEW_VECTOR_SCALING_C0115   
     726  m_iViewOrderIdx        = pSrc->m_iViewOrderIdx;// will be changed to view_id
     727  m_bIVScalingFlag       = pSrc->m_bIVScalingFlag;
    702728#endif
    703729  m_eNalUnitType         = pSrc->m_eNalUnitType;
Note: See TracChangeset for help on using the changeset viewer.