Changeset 295 in SHVCSoftware for branches/SHM-2.1-dev/source


Ignore:
Timestamp:
19 Jun 2013, 03:08:33 (12 years ago)
Author:
seregin
Message:

fix reference layer idc for inter-layer motion prediction

Location:
branches/SHM-2.1-dev/source/Lib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r292 r295  
    14091409  {
    14101410    UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
    1411     if (getMotionPredEnabledFlag(refLayerIdc))
     1411    if( getMotionPredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) ) )
    14121412    {
    14131413      if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
    14141414      {
    1415         ilpPic = m_cIlpPic[i];
     1415        ilpPic = m_cIlpPic[refLayerIdc];
    14161416        break;
    14171417      }

  • branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r292 r295  
    30643064  {
    30653065    UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
    3066     if (m_pcEncTop->getMotionPredEnabledFlag(refLayerIdc))
     3066    if( m_pcEncTop->getMotionPredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) ) )
    30673067    {
    30683068      if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
    30693069      {
    3070         ilpPic = m_pcEncTop->getIlpList()[i];
     3070        ilpPic = m_pcEncTop->getIlpList()[refLayerIdc];
    30713071        break;
    30723072      }
Note: See TracChangeset for help on using the changeset viewer.