components/encumbered/x265/patches/common_quant.patch

   1 $NetBSD: patch-common_quant.cpp,v 1.2 2019/01/25 09:01:13 adam Exp $
   2
   3 Use enable512 as a global, not through detect512
   4
   5 --- a/source/common/quant.cpp.orig      2019-01-23 09:47:18.000000000 +0000
   6 +++ a/source/common/quant.cpp
   7 @@ -724,7 +724,6 @@ uint32_t Quant::rdoQuant(const CUData& c
   8              uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
   9              uint32_t blkPos      = codeParams.scan[scanPosBase];
  10  #if X265_ARCH_X86
  11 -            bool enable512 = detect512();
  12              if (enable512)
  13                  primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
  14              else
  15 @@ -811,7 +810,6 @@ uint32_t Quant::rdoQuant(const CUData& c
  16              if (usePsyMask)
  17              {
  18  #if X265_ARCH_X86
  19 -                bool enable512 = detect512();
  20                  if (enable512)
  21                      primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
  22                  else