Changeset 693 in SHVCSoftware for branches/SHM-6-dev


Ignore:
Timestamp:
18 Apr 2014, 03:38:04 (11 years ago)
Author:
samsung
Message:

code related to Q0200_CONFORMANCE_BL_SIZE has been updated

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

Legend:

Unmodified
Added
Removed

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

    r688 r693  
    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
    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 );
     770Void 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 );
    781773}
    782774#else

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

    r688 r693  
    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
    124 #if Q0200_CONFORMANCE_BL_SIZE
    125 , const Window confBL
    126 #endif
    127 , Bool phaseAlignFlag );
     123  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
    128124#else
    129125  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );

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

    r688 r693  
    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
    102 #if Q0200_CONFORMANCE_BL_SIZE
    103 , const Window confBL
    104 #endif
    105 , bool phaseAlignFlag )
     101Void TComUpsampleFilter::upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
    106102#else
    107103Void TComUpsampleFilter::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
    … …  
    131127  Int strideEL  = pcUsPic->getStride();
    132128#if Q0200_CONFORMANCE_BL_SIZE
     129const Window &confBL = currSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
    133130widthBL-= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
    134131heightBL-=(confBL.getWindowBottomOffset()+confBL.getWindowTopOffset());

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

    r688 r693  
    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
    48 #if Q0200_CONFORMANCE_BL_SIZE
    49 , const Window confBL
    50 #endif
    51 , Bool phaseAlignFlag );
     47  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
    5248#else
    5349  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );

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

    r690 r693  
    4949#define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
    5050
    51 #define Q0200_CONFORMANCE_BL_SIZE        0       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs
     51#define Q0200_CONFORMANCE_BL_SIZE        1       ///< JCTVC-Q0200; use conformance picture size in re-sampling processs
    5252#define P0312_VERT_PHASE_ADJ             1      ///< JCTVC-P0312: vertical phase adjustment in re-sampling process (BoG report)
    5353#if P0312_VERT_PHASE_ADJ

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

    r691 r693  
    15411541        Int widthBL   = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth();
    15421542        Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();
    1543 
     1543#if Q0200_CONFORMANCE_BL_SIZE
     1544const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
     1545widthBL   -= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
     1546heightBL  -= (confBL.getWindowTopOffset()+confBL.getWindowBottomOffset());
     1547#endif
    15441548        Int widthEL   = pcPic->getPicYuvRec()->getWidth()  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
    15451549        Int heightEL  = pcPic->getPicYuvRec()->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();

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

    r684 r693  
    943943        Int widthBL   = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth();
    944944        Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();
    945 
     945#if Q0200_CONFORMANCE_BL_SIZE
     946const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
     947widthBL   -= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
     948heightBL  -= (confBL.getWindowTopOffset()+confBL.getWindowBottomOffset());
     949#endif
    946950        Int widthEL   = pcPic->getPicYuvRec()->getWidth()  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
    947951        Int heightEL  = pcPic->getPicYuvRec()->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();
Note: See TracChangeset for help on using the changeset viewer.