Changeset 562 in SHVCSoftware for branches/SHM-5.0-dev/source


Ignore:
Timestamp:
27 Jan 2014, 17:40:23 (11 years ago)
Author:
seregin
Message:

remove M0457_COL_PICTURE_SIGNALING macro

Location:
branches/SHM-5.0-dev/source/Lib
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r540 r562  
    34383438
    34393439  // use coldir.
    3440 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    3441   TComPic *pColPic;
    3442   if (m_layerId > 0 && getSlice()->getAltColIndicationFlag())
    3443   {
    3444     pColPic = getSlice()->getMotionPredIlp();
    3445   }
    3446   else
    3447   {
    3448     pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx());
    3449   }
    3450 #else
    34513440  TComPic *pColPic = getSlice()->getRefPic( RefPicList(getSlice()->isInterB() ? 1-getSlice()->getColFromL0Flag() : 0), getSlice()->getColRefIdx());
    3452 #endif
    34533441  TComDataCU *pColCU = pColPic->getCU( uiCUAddr );
    34543442  if(pColCU->getPic()==0||pColCU->getPartitionSize(uiPartUnitIdx)==SIZE_NONE)

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.cpp

    r561 r562  
    124124  m_numILRRefIdx = 0;
    125125#endif
    126 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    127   m_altColIndicationFlag = false;
    128   m_colRefLayerIdx       = 0;
    129 #endif
    130126#endif //SVC_EXTENSION
    131127
    … …  
    453449    {
    454450#if REF_IDX_MFM
    455 #if M0457_COL_PICTURE_SIGNALING
    456451      if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && getMFMEnabledFlag())
    457 #else
    458       if(!(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) && m_pcSPS->getMFMEnabledFlag())
    459 #endif
    460452      {
    461453        ilpPic[refLayerIdc]->copyUpsampledMvField( refLayerIdc, m_pcBaseColPic[refLayerIdc] );

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h

    r561 r562  
    13241324#if SVC_EXTENSION
    13251325  UInt m_layerId;
    1326 
    1327 #if REF_IDX_MFM
    1328 #if !M0457_COL_PICTURE_SIGNALING
    1329   Bool m_bMFMEnabledFlag;
    1330 #endif
    1331 #endif
    13321326  UInt        m_numScaledRefLayerOffsets;
    13331327#if O0098_SCALED_REF_LAYER_ID
    … …  
    14901484  Void     setLayerId(UInt layerId) { m_layerId = layerId; }
    14911485  UInt     getLayerId() { return m_layerId; }
    1492 #if REF_IDX_MFM
    1493 #if !M0457_COL_PICTURE_SIGNALING
    1494   Void     setMFMEnabledFlag(Bool flag) {m_bMFMEnabledFlag = flag;}
    1495   Bool     getMFMEnabledFlag()          {return m_bMFMEnabledFlag;}
    1496 #endif
    1497 #endif
    14981486  UInt     getNumScaledRefLayerOffsets()  { return m_numScaledRefLayerOffsets; }
    14991487  Void     setNumScaledRefLayerOffsets(Int x)  { m_numScaledRefLayerOffsets = x; }
    … …  
    18751863  TComPic*    m_pcBaseColPic[MAX_LAYERS];
    18761864  TComPicYuv* m_pcFullPelBaseRec[MAX_LAYERS];
    1877 #if M0457_COL_PICTURE_SIGNALING
    18781865  Int         m_numMotionPredRefLayers;
    18791866#if REF_IDX_MFM
    … …  
    18821869  Bool        m_altColIndicationFlag;
    18831870  TComPic*    m_pcIlpPic;
    1884 #endif
    18851871#endif
    18861872
    … …  
    21692155#endif
    21702156
    2171 #if M0457_COL_PICTURE_SIGNALING
    21722157  Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }
    21732158  Int       getNumMotionPredRefLayers()                 { return m_numMotionPredRefLayers; }
    … …  
    21842169#endif
    21852170#endif
    2186 #endif
    21872171
    21882172  TComPic* getRefPic(TComList<TComPic*>& rcListPic, Int poc) { return xGetRefPic( rcListPic, poc ); }

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TypeDef.h

    r561 r562  
    167167#if REF_IDX_MFM
    168168#define REMOVE_COL_PICTURE_SIGNALING     1      ///< JCTVC-N0107: remove alternative collocated picture signalling
    169 #define M0457_COL_PICTURE_SIGNALING      1
    170169#define N0139_POSITION_ROUNDING_OFFSET   1      ///< JCTVC-N0139: offset for collocated block in motion mapping
    171170#endif

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r561 r562  
    756756  }
    757757  READ_FLAG( uiCode, "sps_temporal_mvp_enable_flag" );            pcSPS->setTMVPFlagsPresent(uiCode);
    758 #if REF_IDX_MFM
    759 #if !M0457_COL_PICTURE_SIGNALING
    760   if(pcSPS->getLayerId() > 0)
    761   {
    762     READ_FLAG( uiCode, "sps_enh_mfm_enable_flag" );
    763     pcSPS->setMFMEnabledFlag( uiCode ? true : false );
    764   }
    765 #endif
    766 #endif
    767758  READ_FLAG( uiCode, "sps_strong_intra_smoothing_enable_flag" );  pcSPS->setUseStrongIntraSmoothing(uiCode);
    768759
    … …  
    23482339    if ( rpcSlice->getEnableTMVPFlag() )
    23492340    {
    2350 #if M0457_COL_PICTURE_SIGNALING
    23512341#if REMOVE_COL_PICTURE_SIGNALING
    23522342      rpcSlice->setMFMEnabledFlag( ( rpcSlice->getNumMotionPredRefLayers() > 0 && rpcSlice->getActiveNumILRRefIdx() ) ? true : false );
    … …  
    23692359      {
    23702360#endif //REMOVE_COL_PICTURE_SIGNALING
    2371 #endif
    23722361      if ( rpcSlice->getSliceType() == B_SLICE )
    23732362      {
    … …  
    23912380        rpcSlice->setColRefIdx(0);
    23922381      }
    2393 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    2394       }
    2395 #endif
    23962382    }
    23972383    if ( (pps->getUseWP() && rpcSlice->getSliceType()==P_SLICE) || (pps->getWPBiPred() && rpcSlice->getSliceType()==B_SLICE) )

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

    r560 r562  
    848848  setRefLayerParams(m_apcSlicePilot->getVPS());
    849849#endif
    850 #if M0457_COL_PICTURE_SIGNALING
    851850  m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
    852 #endif
    853851#endif
    854852  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
    … …  
    14751473
    14761474#if REF_IDX_MFM
    1477 #if M0457_COL_PICTURE_SIGNALING
    14781475      if( pcSlice->getMFMEnabledFlag() )
    1479 #else
    1480       if( pcSlice->getSPS()->getMFMEnabledFlag() )
    1481 #endif
    14821476      {
    14831477        pcSlice->setRefPOCListILP(m_ppcTDecTop[m_layerId]->m_cIlpPic, pcSlice->getBaseColPic());
    1484 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    1485         pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
    1486 #endif
    14871478      }
    14881479      pcSlice->setRefPicList( m_cListPic, false, m_cIlpPic);
    … …  
    20172008#endif
    20182009
    2019 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    2020 TComPic* TDecTop::getMotionPredIlp(TComSlice* pcSlice)
    2021 {
    2022   TComPic* ilpPic = NULL;
    2023   Int activeMotionPredReflayerIdx = 0;
    2024 
    2025   for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
    2026   {
    2027     UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
    2028     if( getMotionPredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) ) )
    2029     {
    2030       if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
    2031       {
    2032         ilpPic = m_cIlpPic[refLayerIdc];
    2033         break;
    2034       }
    2035       else
    2036       {
    2037         activeMotionPredReflayerIdx++;
    2038       }
    2039     }
    2040   }
    2041 
    2042   assert(ilpPic != NULL);
    2043 
    2044   return ilpPic;
    2045 }
    2046 #endif
    20472010#if OUTPUT_LAYER_SET_INDEX
    20482011Void TDecTop::checkValueOfOutputLayerSetIdx(TComVPS *vps)

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.h

    r560 r562  
    242242  Void      xDecodePPS();
    243243  Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
    244 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    245   TComPic*  getMotionPredIlp(TComSlice* pcSlice);
    246 #endif
    247244
    248245#if NO_CLRAS_OUTPUT_FLAG

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r561 r562  
    579579  }
    580580  WRITE_FLAG( pcSPS->getTMVPFlagsPresent()  ? 1 : 0,           "sps_temporal_mvp_enable_flag" );
    581 #if REF_IDX_MFM
    582 #if !M0457_COL_PICTURE_SIGNALING
    583   if( pcSPS->getLayerId() > 0 )
    584   {
    585     WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
    586   }
    587 #endif
    588 #endif
    589581  WRITE_FLAG( pcSPS->getUseStrongIntraSmoothing(),             "sps_strong_intra_smoothing_enable_flag" );
    590582
    … …  
    17671759    if ( pcSlice->getEnableTMVPFlag() )
    17681760    {
    1769 #if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    1770       if ( !pcSlice->getIdrPicFlag() && pcSlice->getLayerId() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 && pcSlice->getNumMotionPredRefLayers() > 0 )
    1771       {
    1772         WRITE_FLAG( pcSlice->getAltColIndicationFlag() ? 1 : 0, "alt_collocated_indication_flag" );
    1773         if (pcSlice->getAltColIndicationFlag() && pcSlice->getNumMotionPredRefLayers() > 1)
    1774         {
    1775           WRITE_UVLC(0, "collocated_ref_layer_idx");
    1776         }
    1777       }
    1778       else
    1779       {
    1780 #endif
    17811761      if ( pcSlice->getSliceType() == B_SLICE )
    17821762      {
    … …  
    17901770        WRITE_UVLC( pcSlice->getColRefIdx(), "collocated_ref_idx" );
    17911771      }
    1792 #if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    1793       }
    1794 #endif
    17951772    }
    17961773    if ( (pcSlice->getPPS()->getUseWP() && pcSlice->getSliceType()==P_SLICE) || (pcSlice->getPPS()->getWPBiPred() && pcSlice->getSliceType()==B_SLICE) )

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

    r559 r562  
    690690      pcSlice->setActiveNumILRRefIdx(0);
    691691      pcSlice->setInterLayerPredEnabledFlag(false);
    692 #if M0457_COL_PICTURE_SIGNALING
    693692      pcSlice->setMFMEnabledFlag(false);
    694693#if !REMOVE_COL_PICTURE_SIGNALING
    695694      pcSlice->setAltColIndicationFlag(false);
    696 #endif
    697695#endif
    698696    }
    … …  
    11911189
    11921190#if SVC_EXTENSION
    1193 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    1194     if ( pcSlice->getSliceType() == B_SLICE && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
    1195 #else
    11961191    if( pcSlice->getSliceType() == B_SLICE )
    1197 #endif
    11981192    {
    11991193      pcSlice->setColFromL0Flag(1-uiColDir);
    … …  
    12101204      pcSlice->setILRPic( m_pcEncTop->getIlpList() );
    12111205#if REF_IDX_MFM
    1212 #if M0457_COL_PICTURE_SIGNALING
    12131206      if( pcSlice->getMFMEnabledFlag() )
    1214 #else
    1215       if( pcSlice->getSPS()->getMFMEnabledFlag() )
    1216 #endif
    12171207      {
    12181208        pcSlice->setRefPOCListILP(m_pcEncTop->getIlpList(), pcSlice->getBaseColPic());
    1219 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    1220         pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
    1221 #endif
    12221209      }
    12231210#else
    … …  
    12291216
    12301217#if REF_IDX_MFM
    1231 #if M0457_COL_PICTURE_SIGNALING
    12321218#if REMOVE_COL_PICTURE_SIGNALING
    12331219      if( pcSlice->getMFMEnabledFlag() )
    12341220#else
    12351221      if( pcSlice->getMFMEnabledFlag() && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
    1236 #endif
    1237 #else
    1238       if( pcSlice->getSPS()->getMFMEnabledFlag() )
    12391222#endif
    12401223      {
    … …  
    20502033            startCUAddrSliceSegmentIdx++;
    20512034          }
    2052 #if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING
     2035#if SVC_EXTENSION
    20532036          pcSlice->setNumMotionPredRefLayers(m_pcEncTop->getNumMotionPredRefLayers());
    20542037#endif
    … …  
    37343717  free(rowSAD);
    37353718}
    3736 
    3737 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    3738 TComPic* TEncGOP::getMotionPredIlp(TComSlice* pcSlice)
    3739 {
    3740   TComPic* ilpPic = NULL;
    3741   Int activeMotionPredReflayerIdx = 0;
    3742 
    3743   for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ )
    3744   {
    3745     UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
    3746     if( m_pcEncTop->getMotionPredEnabledFlag( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) ) )
    3747     {
    3748       if (activeMotionPredReflayerIdx == pcSlice->getColRefLayerIdx())
    3749       {
    3750         ilpPic = m_pcEncTop->getIlpList()[refLayerIdc];
    3751         break;
    3752       }
    3753       else
    3754       {
    3755         activeMotionPredReflayerIdx++;
    3756       }
    3757     }
    3758   }
    3759 
    3760   assert(ilpPic != NULL);
    3761 
    3762   return ilpPic;
    3763 }
    3764 #endif
    3765 
    37663719//! \}

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncGOP.h

    r442 r562  
    210210#endif
    211211  Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
    212 #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    213   TComPic* getMotionPredIlp(TComSlice* pcSlice);
    214 #endif
    215212};// END CLASS DEFINITION TEncGOP
    216213

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

    r540 r562  
    536536    rpcSlice->setNumILRRefIdx( rpcSlice->getVPS()->getNumDirectRefLayers( layerId ) );
    537537#endif
    538 #if M0457_COL_PICTURE_SIGNALING
    539538    rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[layerId]->getMFMEnabledFlag());
    540539#if !REMOVE_COL_PICTURE_SIGNALING
    541540    rpcSlice->setAltColIndicationFlag(rpcSlice->getMFMEnabledFlag());
    542 #endif
    543541#endif
    544542  }

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r549 r562  
    934934#if SVC_EXTENSION
    935935  m_cSPS.setLayerId(m_layerId);
    936 #if REF_IDX_MFM
    937 #if !M0457_COL_PICTURE_SIGNALING
    938   m_cSPS.setMFMEnabledFlag(m_bMFMEnabledFlag);
    939 #endif
    940 #endif
    941936  m_cSPS.setNumScaledRefLayerOffsets(m_numScaledRefLayerOffsets);
    942937  for(Int i = 0; i < m_cSPS.getNumScaledRefLayerOffsets(); i++)
Note: See TracChangeset for help on using the changeset viewer.