Changeset 946 in SHVCSoftware for branches/SHM-upgrade


Ignore:
Timestamp:
31 Dec 2014, 07:41:23 (10 years ago)
Author:
seregin
Message:

fix to the ticket #40

Location:
branches/SHM-upgrade/source/Lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-upgrade/source/Lib/TLibCommon/TComPrediction.cpp

    r916 r946  
    860860
    861861#if SVC_EXTENSION
     862#if O0215_PHASE_ALIGNMENT_REMOVAL
     863Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic )
     864{
     865  m_cUsf.upsampleBasePic( currSlice, refLayerIdc, pcUsPic, pcBasePic, pcTempPic );
     866}
     867#else
    862868#if O0215_PHASE_ALIGNMENT
    863869#if O0194_JOINT_US_BITSHIFT
    … …  
    892898#endif
    893899#endif
     900#endif
    894901#endif //SVC_EXTENSION
    895902//! \}

  • branches/SHM-upgrade/source/Lib/TLibCommon/TComPrediction.h

    r916 r946  
    146146
    147147#if SVC_EXTENSION
     148#if O0215_PHASE_ALIGNMENT_REMOVAL
     149Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic );
     150#else
    148151#if O0215_PHASE_ALIGNMENT
    149152#if O0194_JOINT_US_BITSHIFT
    … …  
    163166#endif
    164167#endif
     168#endif
    165169#endif //SVC_EXTENSION
    166170};

  • branches/SHM-upgrade/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r916 r946  
    5151}
    5252
     53#if O0215_PHASE_ALIGNMENT_REMOVAL
     54Void TComUpsampleFilter::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic )
     55#else
    5356#if O0215_PHASE_ALIGNMENT
    5457#if O0194_JOINT_US_BITSHIFT
    … …  
    6669#else
    6770Void TComUpsampleFilter::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window )
     71#endif
    6872#endif
    6973#endif

  • branches/SHM-upgrade/source/Lib/TLibCommon/TComUpsampleFilter.h

    r849 r946  
    4242  TComUpsampleFilter(void);
    4343  ~TComUpsampleFilter(void);
    44 
     44#if O0215_PHASE_ALIGNMENT_REMOVAL
     45  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic );
     46#else
    4547#if O0215_PHASE_ALIGNMENT
    4648#if O0194_JOINT_US_BITSHIFT
    … …  
    6062#endif
    6163#endif
     64#endif
    6265
    6366};

  • branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h

    r945 r946  
    4545#if SVC_EXTENSION
    4646#define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
    47 
     47#define O0215_PHASE_ALIGNMENT_REMOVAL    1
    4848#define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
    4949#define SIGNALLING_BITRATE_PICRATE_FIX   1      ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R1008
    … …  
    213213#define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
    214214#define N0065_LAYER_POC_ALIGNMENT        1
    215 
     215#if !O0215_PHASE_ALIGNMENT_REMOVAL
    216216#define O0215_PHASE_ALIGNMENT            1      ///< JCTVC_O0215: signal a flag to specify phase alignment case, 0: zero-position-aligned, 1: central-position-aligned,
     217#endif
    217218#define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
    218219#define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures

  • branches/SHM-upgrade/source/Lib/TLibDecoder/TDecTop.cpp

    r928 r946  
    20122012          if( m_ppcTDecTop[m_layerId]->getSamplePredEnabledFlag(refLayerId) )
    20132013          {
     2014#if O0215_PHASE_ALIGNMENT_REMOVAL
     2015            m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec());
     2016#else
    20142017#if O0215_PHASE_ALIGNMENT
    20152018#if O0194_JOINT_US_BITSHIFT
    … …  
    20462049#else
    20472050            m_cPrediction.upsampleBasePic( refLayerIdc, m_pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), m_pcPic->getPicYuvRec(), scalEL );
     2051#endif
    20482052#endif
    20492053#endif

  • branches/SHM-upgrade/source/Lib/TLibEncoder/TEncGOP.cpp

    r926 r946  
    13781378            }
    13791379#endif
     1380#if O0215_PHASE_ALIGNMENT_REMOVAL
     1381            m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec() );
     1382#else
    13801383#if O0215_PHASE_ALIGNMENT
    13811384#if O0194_JOINT_US_BITSHIFT
    … …  
    14081411#else
    14091412            m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
     1413#endif
    14101414#endif
    14111415#endif
Note: See TracChangeset for help on using the changeset viewer.