[x265] cudata: remove default argument

Steve Borho steve at borho.org
Fri Nov 7 04:58:30 CET 2014


On 11/07, Satoshi Nakagawa wrote:
> # HG changeset patch
> # User Satoshi Nakagawa <nakagawa424 at oki.com>
> # Date 1415328195 -32400
> #      Fri Nov 07 11:43:15 2014 +0900
> # Node ID f4853d3e81678e487b16a8c6f716a8f9418d6aad
> # Parent  0ebd0b00bf9bc447d89892ef935bc017b186fa9d
> cudata: remove default argument

queued, thanks

> diff -r 0ebd0b00bf9b -r f4853d3e8167 source/common/cudata.cpp
> --- a/source/common/cudata.cpp	Thu Nov 06 19:37:39 2014 -0600
> +++ b/source/common/cudata.cpp	Fri Nov 07 11:43:15 2014 +0900
> @@ -546,7 +546,7 @@
>      return m_cuLeft;
>  }
>  
> -const CUData* CUData::getPUAbove(uint32_t& aPartUnitIdx, uint32_t curPartUnitIdx, bool planarAtCTUBoundary) const
> +const CUData* CUData::getPUAbove(uint32_t& aPartUnitIdx, uint32_t curPartUnitIdx) const
>  {
>      uint32_t absPartIdx = g_zscanToRaster[curPartUnitIdx];
>  
> @@ -557,15 +557,10 @@
>          if (isEqualRow(absPartIdx, absZorderCUIdx, s_numPartInCUSize))
>              return m_encData->getPicCTU(m_cuAddr);
>          else
> -        {
>              aPartUnitIdx -= m_absIdxInCTU;
> -            return this;
> -        }
> +        return this;
>      }
>  
> -    if (planarAtCTUBoundary)
> -        return NULL;
> -
>      aPartUnitIdx = g_rasterToZscan[absPartIdx + NUM_CU_PARTITIONS - s_numPartInCUSize];
>      return m_cuAbove;
>  }
> @@ -853,7 +848,7 @@
>      leftIntraDir = (tempCU && tempCU->isIntra(tempPartIdx)) ? tempCU->m_lumaIntraDir[tempPartIdx] : DC_IDX;
>  
>      // Get intra direction of above PU
> -    tempCU = getPUAbove(tempPartIdx, m_absIdxInCTU + absPartIdx, true);
> +    tempCU = g_zscanToPelY[m_absIdxInCTU + absPartIdx] > 0 ? getPUAbove(tempPartIdx, m_absIdxInCTU + absPartIdx) : NULL;
>  
>      aboveIntraDir = (tempCU && tempCU->isIntra(tempPartIdx)) ? tempCU->m_lumaIntraDir[tempPartIdx] : DC_IDX;
>  
> diff -r 0ebd0b00bf9b -r f4853d3e8167 source/common/cudata.h
> --- a/source/common/cudata.h	Thu Nov 06 19:37:39 2014 -0600
> +++ b/source/common/cudata.h	Fri Nov 07 11:43:15 2014 +0900
> @@ -222,7 +222,7 @@
>      void     getTUEntropyCodingParameters(TUEntropyCodingParameters &result, uint32_t absPartIdx, uint32_t log2TrSize, bool bIsLuma) const;
>  
>      const CUData* getPULeft(uint32_t& lPartUnitIdx, uint32_t curPartUnitIdx) const;
> -    const CUData* getPUAbove(uint32_t& aPartUnitIdx, uint32_t curPartUnitIdx, bool planarAtCTUBoundary = false) const;
> +    const CUData* getPUAbove(uint32_t& aPartUnitIdx, uint32_t curPartUnitIdx) const;
>      const CUData* getPUAboveLeft(uint32_t& alPartUnitIdx, uint32_t curPartUnitIdx) const;
>      const CUData* getPUAboveRight(uint32_t& arPartUnitIdx, uint32_t curPartUnitIdx) const;
>      const CUData* getPUBelowLeft(uint32_t& blPartUnitIdx, uint32_t curPartUnitIdx) const;
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel

-- 
Steve Borho


More information about the x265-devel mailing list