Commit 4f6ca586 authored by Karsten Suehring's avatar Karsten Suehring

compile fixes for clang/xcode

parent 43455878
......@@ -226,7 +226,7 @@ CoeffCodingContext::CoeffCodingContext(const TransformUnit& tu, ComponentID comp
, m_heightInGroups (m_height >> m_log2CGHeight)
, m_log2BlockWidth (g_aucLog2[m_width])
, m_log2BlockHeight (g_aucLog2[m_height])
#if JEM_TOOLS
#if JEM_TOOLS && HEVC_USE_MDCS
, m_log2WidthInGroups (g_aucLog2[m_widthInGroups])
, m_log2HeightInGroups (g_aucLog2[m_heightInGroups])
#endif
......
......@@ -353,7 +353,7 @@ private:
const unsigned m_heightInGroups;
const unsigned m_log2BlockWidth;
const unsigned m_log2BlockHeight;
#if JEM_TOOLS
#if JEM_TOOLS && HEVC_USE_MDCS
const unsigned m_log2WidthInGroups;
const unsigned m_log2HeightInGroups;
#endif
......
......@@ -375,7 +375,6 @@ Void LoopFilter::xSetEdgefilterMultipleSubPu(const CodingUnit& cu,
void LoopFilter::xSetLoopfilterParam( const CodingUnit& cu )
{
const Slice& slice = *cu.slice;
const PPS& pps = *cu.cs->pps;
if( slice.getDeblockingFilterDisable() )
{
......
......@@ -1828,7 +1828,9 @@ SPS::SPS()
#if HEVC_USE_SCALING_LISTS
, m_scalingListEnabledFlag (false)
#endif
#if HEVC_USE_INTRA_SMOOTHING_T32 || HEVC_USE_INTRA_SMOOTHING_T64
, m_useStrongIntraSmoothing (false)
#endif
, m_vuiParametersPresentFlag (false)
, m_vuiParameters ()
, m_spsNextExtension (*this)
......
......@@ -1159,7 +1159,9 @@ private:
UInt m_uiMaxDecPicBuffering[MAX_TLAYER];
UInt m_uiMaxLatencyIncreasePlus1[MAX_TLAYER];
#if HEVC_USE_INTRA_SMOOTHING_T32 || HEVC_USE_INTRA_SMOOTHING_T64
Bool m_useStrongIntraSmoothing;
#endif
Bool m_vuiParametersPresentFlag;
VUI m_vuiParameters;
......
......@@ -130,8 +130,6 @@ Void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
#endif
#if HEVC_TILES_WPP
const int startCtuRsAddr = tileMap.getCtuTsToRsAddrMap(startCtuTsAddr);
#else
const int startCtuRsAddr = startCtuTsAddr;
#endif
const unsigned numCtusInFrame = cs.pcv->sizeInCtus;
const unsigned widthInCtus = cs.pcv->widthInCtus;
......@@ -166,8 +164,6 @@ Void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
// This calculates the common offset for all substreams in this slice.
#if HEVC_DEPENDENT_SLICES
const unsigned subStreamOffset = tileMap.getSubstreamForCtuAddr( startCtuRsAddr, true, slice );
#else
const unsigned subStreamOffset = 0;
#endif
#if HEVC_DEPENDENT_SLICES
......
......@@ -1102,8 +1102,8 @@ void EncCu::xCheckModeSplit(CodingStructure *&tempCS, CodingStructure *&bestCS,
{
#if HEVC_TILES_WPP
const TileMap& tileMap = *tempCS->picture->tileMap;
#endif
const UInt CtuAddr = CU::getCtuAddr( *bestCS->getCU( partitioner.chType ) );
#endif
const Bool isEndOfSlice = slice.getSliceMode() == FIXED_NUMBER_OF_BYTES
&& ((slice.getSliceBits() + CS::getEstBits(*bestCS)) > slice.getSliceArgument() << 3)
#if HEVC_TILES_WPP
......
......@@ -2194,7 +2194,6 @@ Void EncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, PicList& rcListPic,
const UInt curSliceEnd = pcSlice->getSliceCurEndCtuTsAddr();
if(curSliceEnd < numberOfCtusInFrame)
{
const UInt sliceBits = pcSlice->getSliceBits();
UInt independentSliceIdx = pcSlice->getIndependentSliceIdx();
pcPic->allocateNewSlice();
m_pcSliceEncoder->setSliceSegmentIdx (uiNumSliceSegments);
......
......@@ -1631,13 +1631,13 @@ Void EncLib::xInitPPSforTiles(PPS &pps)
Void EncCfg::xCheckGSParameters()
{
#if HEVC_TILES_WPP
Int iWidthInCU = ( m_iSourceWidth%m_maxCUWidth ) ? m_iSourceWidth/m_maxCUWidth + 1 : m_iSourceWidth/m_maxCUWidth;
Int iHeightInCU = ( m_iSourceHeight%m_maxCUHeight ) ? m_iSourceHeight/m_maxCUHeight + 1 : m_iSourceHeight/m_maxCUHeight;
UInt uiCummulativeColumnWidth = 0;
UInt uiCummulativeRowHeight = 0;
//check the column relative parameters
#if HEVC_TILES_WPP
if( m_iNumColumnsMinus1 >= (1<<(LOG2_MAX_NUM_COLUMNS_MINUS1+1)) )
{
EXIT( "The number of columns is larger than the maximum allowed number of columns." );
......
......@@ -1919,12 +1919,14 @@ Void EncSlice::calculateBoundingCtuTsAddrForSlice(UInt &startCtuTSAddrSlice, UIn
Picture* pcPic, const Int sliceMode, const Int sliceArgument)
#endif
{
Slice* pcSlice = pcPic->slices[getSliceSegmentIdx()];
#if HEVC_TILES_WPP
Slice* pcSlice = pcPic->slices[getSliceSegmentIdx()];
const TileMap& tileMap = *(pcPic->tileMap);
#endif
const UInt numberOfCtusInFrame = pcPic->cs->pcv->sizeInCtus;
#if HEVC_TILES_WPP
const PPS &pps=*(pcSlice->getPPS());
#endif
boundingCtuTSAddrSlice=0;
#if HEVC_TILES_WPP
haveReachedTileBoundary=false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment