Changeset 688 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibCommon


Ignore:
Timestamp:
17 Apr 2014, 04:52:55 (11 years ago)
Author:
samsung
Message:

JCTVC-Q0200 is integrated. Related macro "Q0200_CONFORMANCE_BL_SIZE"

Location:
branches/SHM-6-dev/source/Lib/TLibCommon
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r675 r688  
    35033503  Int leftStartL = baseColPic->getSlice(0)->getSPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowLeftOffset();
    35043504  Int topStartL  = baseColPic->getSlice(0)->getSPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowTopOffset();
     3505#if Q0200_CONFORMANCE_BL_SIZE
     3506leftStartL+=baseColPic->getConformanceWindow().getWindowLeftOffset();
     3507topStartL+=baseColPic->getConformanceWindow().getWindowTopOffset();
     3508#endif
    35053509#else
    35063510  Int leftStartL = baseColPic->getSlice(0)->getSPS()->getScaledRefLayerWindow(refLayerIdc).getWindowLeftOffset();

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

    r652 r688  
    768768#if O0215_PHASE_ALIGNMENT
    769769#if O0194_JOINT_US_BITSHIFT
    770 Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag )
    771 {
    772   m_cUsf.upsampleBasePic( currSlice, refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window, phaseAlignFlag );
     770Void TComPrediction::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window
     771#if Q0200_CONFORMANCE_BL_SIZE
     772, const Window confBL
     773#endif
     774, Bool phaseAlignFlag )
     775{
     776  m_cUsf.upsampleBasePic( currSlice, refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window
     777#if Q0200_CONFORMANCE_BL_SIZE
     778,  confBL
     779#endif
     780, phaseAlignFlag );
    773781}
    774782#else

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

    r644 r688  
    121121#if O0215_PHASE_ALIGNMENT
    122122#if O0194_JOINT_US_BITSHIFT
    123   Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
     123  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window
     124#if Q0200_CONFORMANCE_BL_SIZE
     125, const Window confBL
     126#endif
     127, Bool phaseAlignFlag );
    124128#else
    125129  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );

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

    r686 r688  
    9999#if O0215_PHASE_ALIGNMENT
    100100#if O0194_JOINT_US_BITSHIFT
    101 Void TComUpsampleFilter::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
     101Void TComUpsampleFilter::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window
     102#if Q0200_CONFORMANCE_BL_SIZE
     103, const Window confBL
     104#endif
     105, bool phaseAlignFlag )
    102106#else
    103107Void TComUpsampleFilter::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
    … …  
    126130  Int heightEL  = pcUsPic->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();
    127131  Int strideEL  = pcUsPic->getStride();
    128 
     132#if Q0200_CONFORMANCE_BL_SIZE
     133widthBL-= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
     134heightBL-=(confBL.getWindowBottomOffset()+confBL.getWindowTopOffset());
     135#endif
    129136#if P0312_VERT_PHASE_ADJ
    130137  Bool vertPhasePositionEnableFlag = scalEL.getVertPhasePositionEnableFlag();
    … …  
    317324    Int bottomEndL = pcUsPic->getHeight() - scalEL.getWindowBottomOffset();
    318325    Int leftOffset = leftStartL > 0 ? leftStartL : 0;
    319 
     326#if Q0200_CONFORMANCE_BL_SIZE
     327leftStartL+= confBL.getWindowLeftOffset()<<4;
     328topStartL+= confBL.getWindowTopOffset()<<4;
     329#endif
    320330#if N0214_INTERMEDIATE_BUFFER_16BITS
    321331#if O0194_JOINT_US_BITSHIFT
    … …  
    411421    widthBL   = pcBasePic->getWidth ();
    412422    heightBL  = pcBasePic->getHeight();
    413 
     423#if Q0200_CONFORMANCE_BL_SIZE
     424widthBL-= confBL.getWindowLeftOffset()+confBL.getWindowRightOffset();
     425heightBL-=confBL.getWindowBottomOffset()+confBL.getWindowTopOffset();
     426#endif
    414427    widthEL   = pcUsPic->getWidth () - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
    415428    heightEL  = pcUsPic->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();
    … …  
    431444    Int bottomEndC = (pcUsPic->getHeight() >> 1) - (scalEL.getWindowBottomOffset() >> 1);
    432445    leftOffset = leftStartC > 0 ? leftStartC : 0;
    433 
     446#if Q0200_CONFORMANCE_BL_SIZE
     447leftStartC+= (confBL.getWindowLeftOffset()>>1)<<4;
     448topStartC+= (confBL.getWindowTopOffset()>>1)<<4;
     449#endif
    434450    shiftX = 16;
    435451    shiftY = 16;

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComUpsampleFilter.h

    r644 r688  
    4545#if O0215_PHASE_ALIGNMENT
    4646#if O0194_JOINT_US_BITSHIFT
    47   Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
     47  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window
     48#if Q0200_CONFORMANCE_BL_SIZE
     49, const Window confBL
     50#endif
     51, Bool phaseAlignFlag );
    4852#else
    4953  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );

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

    r686 r688  
    4242
    4343#define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]
    44 
     44#define Q0200_CONFORMANCE_BL_SIZE        1       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs
    4545#if SVC_EXTENSION
    4646#define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
Note: See TracChangeset for help on using the changeset viewer.