Ignore:
Timestamp:
7 Feb 2013, 06:01:05 (11 years ago)
Author:
sony
Message:

JCT2-C0115 Inter-view vector scaling for TMVP & flag
The macro is INTER_VIEW_VECTOR_SCALING_C0115.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev2-Sony/source/Lib/TLibDecoder/TDecTop.cpp

    r254 r262  
    254254  m_iMaxRefPicNum = 0;
    255255  m_uiValidPS = 0;
    256 #if SONY_COLPIC_AVAILABILITY
    257   m_iViewOrderIdx = 0;
    258 #endif
    259256#if ENC_DEC_TRACE
    260257  g_hTrace = fopen( "TraceDec.txt", "wb" );
     
    687684  }
    688685
    689 #if SONY_COLPIC_AVAILABILITY
    690   m_apcSlicePilot->setViewOrderIdx( m_apcSlicePilot->getSPS()->getViewOrderIdx());
    691 #endif
    692 
    693686#if NAL_REF_FLAG
    694687  m_apcSlicePilot->setReferenced(nalu.m_nalRefFlag);
     
    768761    xGetNewPicBuffer (m_apcSlicePilot, pcPic);
    769762
    770 #if SONY_COLPIC_AVAILABILITY
    771     pcPic->setViewOrderIdx( m_apcSlicePilot->getSPS()->getViewOrderIdx() );
    772 #endif
    773 
     763#if INTER_VIEW_VECTOR_SCALING_C0115
     764    pcPic->setViewOrderIdx( m_apcSlicePilot->getVPS()->getViewOrderIdx(nalu.m_layerId) );    // will be changed to view_id
     765#endif
    774766    /* transfer any SEI messages that have been received to the picture */
    775767    pcPic->setSEIs(m_SEIs);
     
    996988#endif
    997989
    998 #if SONY_COLPIC_AVAILABILITY
     990#if INTER_VIEW_VECTOR_SCALING_C0115
    999991#if VIDYO_VPS_INTEGRATION
    1000     pcSlice->setViewOrderIdx( pcSlice->getVPS()->getViewOrderIdx(nalu.m_layerId) );
     992    pcSlice->setViewOrderIdx( pcSlice->getVPS()->getViewOrderIdx(nalu.m_layerId) );        // will be changed to view_id
    1001993#else
    1002994    pcSlice->setViewOrderIdx( pcPic->getViewOrderIdx() );
    1003995#endif
     996#endif
     997
     998#if INTER_VIEW_VECTOR_SCALING_C0115
     999    pcSlice->setIVScalingFlag( pcSlice->getVPS()->getIVScalingFlag());
    10041000#endif
    10051001
Note: See TracChangeset for help on using the changeset viewer.