Changeset 944 in SHVCSoftware


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

remove phase alignment, ticket #40, patch was provided by Elena Alshina <elena_a.alshina@…>

Location:
branches/SHM-dev
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-1.5x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 600         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 600         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 600         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-1.5x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-Birthday-b10-1x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-Birthday-b8-2x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b10-1x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b8-2x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b10-1x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b8-2x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-Parakeets-b10-1x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 250         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-Parakeets-b8-2x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 250         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-TableCar-b10-1x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/CGS-TableCar-b8-2x.cfg

    r941 r944  
    22FrameSkip                     : 0           # Number of frames to be skipped in input
    33FramesToBeEncoded             : 300         # Number of frames to be coded
    4 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     4#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    55#Level                         : 4.1
    66#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Cactus-1.5x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Cactus-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Cactus-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 500         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4.1
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Kimono-1.5x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Kimono-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Kimono-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/ParkScene-1.5x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/ParkScene-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/ParkScene-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 240         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 4
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/PeopleOnStreet-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 150         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 5
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/PeopleOnStreet-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 150         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 5
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Traffic-2x.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 150         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 5
    55#This is level of the whole bitstream

  • branches/SHM-dev/cfg/per-sequence-svc/Traffic-SNR.cfg

    r941 r944  
    11FrameSkip                     : 0           # Number of frames to be skipped in input
    22FramesToBeEncoded             : 150         # Number of frames to be coded
    3 PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
     3#PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
    44#Level                         : 5
    55#This is level of the whole bitstream

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

    r849 r944  
    782782
    783783#if SVC_EXTENSION
     784#if O0215_PHASE_ALIGNMENT_REMOVAL
     785Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic )
     786{
     787  m_cUsf.upsampleBasePic( currSlice, refLayerIdc, pcUsPic, pcBasePic, pcTempPic );
     788}
     789#else
    784790#if O0215_PHASE_ALIGNMENT
    785791#if O0194_JOINT_US_BITSHIFT
    … …  
    814820#endif
    815821#endif
     822#endif
    816823#endif //SVC_EXTENSION
    817824//! \}

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

    r849 r944  
    118118
    119119#if SVC_EXTENSION
     120#if O0215_PHASE_ALIGNMENT_REMOVAL
     121Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic );
     122#else
    120123#if O0215_PHASE_ALIGNMENT
    121124#if O0194_JOINT_US_BITSHIFT
    … …  
    135138#endif
    136139#endif
     140#endif
    137141#endif //SVC_EXTENSION
    138142};

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

    r849 r944  
    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-dev/source/Lib/TLibCommon/TComUpsampleFilter.h

    r849 r944  
    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-dev/source/Lib/TLibCommon/TypeDef.h

    r941 r944  
    4343#if SVC_EXTENSION
    4444#define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
    45 
     45#define O0215_PHASE_ALIGNMENT_REMOVAL    1
    4646#define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
    4747#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
    … …  
    214214#define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
    215215#define N0065_LAYER_POC_ALIGNMENT        1
    216 
     216#if !O0215_PHASE_ALIGNMENT_REMOVAL
    217217#define O0215_PHASE_ALIGNMENT            1      ///< JCTVC_O0215: signal a flag to specify phase alignment case, 0: zero-position-aligned, 1: central-position-aligned,
     218#endif
    218219#define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
    219220#define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures

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

    r941 r944  
    21922192          if( m_ppcTDecTop[m_layerId]->getSamplePredEnabledFlag(refLayerId) )
    21932193          {
     2194#if O0215_PHASE_ALIGNMENT_REMOVAL
     2195            m_cPrediction.upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec());
     2196#else
    21942197#if O0215_PHASE_ALIGNMENT
    21952198#if O0194_JOINT_US_BITSHIFT
    … …  
    22262229#else
    22272230            m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
     2231#endif
    22282232#endif
    22292233#endif

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

    r923 r944  
    13431343            }
    13441344#endif
     1345#if O0215_PHASE_ALIGNMENT_REMOVAL
     1346            m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec() );
     1347#else
    13451348#if O0215_PHASE_ALIGNMENT
    13461349#if O0194_JOINT_US_BITSHIFT
    … …  
    13731376#else
    13741377            m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
     1378#endif
    13751379#endif
    13761380#endif
Note: See TracChangeset for help on using the changeset viewer.