x265: updated to 3.0

Version 3.0

New features
option:: ‘–dolby-vision-profile <integer|float>’ generates bitstreams confirming to the specified Dolby Vision profile. Currently profile 5, profile 8.1 and profile 8.2 enabled, Default 0 (disabled)
option:: ‘–dolby-vision-rpu’ File containing Dolby Vision RPU metadata. If given, x265’s Dolby Vision metadata parser will fill the RPU field of input pictures with the metadata
read from the file. The library will interleave access units with RPUs in the bitstream. Default NULL (disabled).
option:: ‘–zonefile <filename>’ specifies a text file which contains the boundaries of the zones where each of zones are configurable.
option:: ‘–qp-adaptation-range’ Delta-QP range by QP adaptation based on a psycho-visual model. Default 1.0.
option:: ‘–refine-ctu-distortion <0/1>’ store/normalize ctu distortion in analysis-save/load. Default 0.
Experimental feature option:: ‘–hevc-aq’ enables adaptive quantization
It scales the quantization step size according to the spatial activity of one coding unit relative to frame average spatial activity. This AQ method utilizes the minimum variance of sub-unit in each coding unit to represent the coding unit’s spatial complexity.

Encoder enhancements
Preset: change param defaults for veryslow and slower preset. Replace slower preset with defaults used in veryslow preset and change param defaults in veryslow preset as per experimental results.
AQ: change default AQ mode to auto-variance
Cutree offset reuse: restricted to analysis reuse-level 10 for analysis-save -> analysis-load
Tune: introduce –tune animation option which improves encode quality for animated content
Reuse CU depth for B frame and allow I, P frame to follow x265 depth decision

Bug fixes
RC: fix rowStat computation in const-vbv
Dynamic-refine: fix memory reset size.
Fix linking issue on non x86 platform
Encoder: Do not include CLL SEI message if empty
Fix build error in VMAF lib

5 files changed, 20 insertions, 21 deletions

diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index d53d5793eff..f665763fcf1 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2018/10/06 12:12:48 adam Exp $
+# $NetBSD: Makefile,v 1.25 2019/01/25 09:01:13 adam Exp $
 
-DISTNAME=	x265_2.9
+DISTNAME=	x265_3.0
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/
diff --git a/multimedia/x265/PLIST b/multimedia/x265/PLIST
index d16ad6dc8ee..5b8451dad80 100644
--- a/multimedia/x265/PLIST
+++ b/multimedia/x265/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2018/10/06 12:12:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2019/01/25 09:01:13 adam Exp $
 bin/x265
 include/x265.h
 include/x265_config.h
 lib/libx265.a
 lib/libx265.so
-lib/libx265.so.165
+lib/libx265.so.169
 lib/pkgconfig/x265.pc
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index c450392953a..de98fbd2d33 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.27 2018/12/11 17:55:56 jklos Exp $
+$NetBSD: distinfo,v 1.28 2019/01/25 09:01:13 adam Exp $
 
-SHA1 (x265_2.9.tar.gz) = 3c005b4ab409c6f996b36ad88d780ff85fbc9abf
-RMD160 (x265_2.9.tar.gz) = ea6772ec426c141eb1756cdf6bb2def3d6319f47
-SHA512 (x265_2.9.tar.gz) = 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
-Size (x265_2.9.tar.gz) = 1385848 bytes
+SHA1 (x265_3.0.tar.gz) = 5eeacc607e6fe6bca61f9cf355b34ef135987696
+RMD160 (x265_3.0.tar.gz) = 6f866d290f0df0356f5a10a898fedf64fda53f0f
+SHA512 (x265_3.0.tar.gz) = bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
+Size (x265_3.0.tar.gz) = 1398519 bytes
 SHA1 (patch-CMakeLists.txt) = fbf4d08133a48b342a060f1b45bab0253455a1b1
-SHA1 (patch-common_cpu.cpp) = 78ca000d57dba65bd0bf6d6c4d3bd878ae3387e7
+SHA1 (patch-common_cpu.cpp) = 86dd8d4a3f9cf51312cd93695beace4c4becb8c6
 SHA1 (patch-common_cpu.h) = 33e3bb9bc9cb60735aa09efa185c474ebd3e6af5
-SHA1 (patch-common_quant.cpp) = 8cbaf6f00c1799ffaa503ffa372f05b76e97ae3b
+SHA1 (patch-common_quant.cpp) = 810ba9af4ec6a767af18fe59a10feb0bca626777
 SHA1 (patch-encoder_encoder.cpp) = 907db18c8e9afd51684ed886da70c23ac3d3652a
diff --git a/multimedia/x265/patches/patch-common_cpu.cpp b/multimedia/x265/patches/patch-common_cpu.cpp
index 7478f0ff9ce..b955ca79ccf 100644
--- a/multimedia/x265/patches/patch-common_cpu.cpp
+++ b/multimedia/x265/patches/patch-common_cpu.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-common_cpu.cpp,v 1.1 2018/12/11 17:55:56 jklos Exp $
+$NetBSD: patch-common_cpu.cpp,v 1.2 2019/01/25 09:01:13 adam Exp $
 
 Retire detect512, make enable512 a global.
 
---- common/cpu.cpp.orig	2018-10-05 12:14:40.000000000 +0000
+--- common/cpu.cpp.orig	2019-01-23 09:47:18.000000000 +0000
 +++ common/cpu.cpp
 @@ -58,7 +58,7 @@ static void sigill_handler(int sig)
  #endif // if X265_ARCH_ARM
@@ -21,6 +21,6 @@ Retire detect512, make enable512 a global.
 -{
 -    return(enable512);
 -}
+ 
  uint32_t cpu_detect(bool benableavx512 )
  {
- 
diff --git a/multimedia/x265/patches/patch-common_quant.cpp b/multimedia/x265/patches/patch-common_quant.cpp
index df5627db5f8..c63e9428303 100644
--- a/multimedia/x265/patches/patch-common_quant.cpp
+++ b/multimedia/x265/patches/patch-common_quant.cpp
@@ -1,23 +1,22 @@
-$NetBSD: patch-common_quant.cpp,v 1.1 2018/12/11 17:55:56 jklos Exp $
+$NetBSD: patch-common_quant.cpp,v 1.2 2019/01/25 09:01:13 adam Exp $
 
 Use enable512 as a global, not through detect512
 
---- common/quant.cpp.orig	2018-10-05 12:14:40.000000000 +0000
+--- common/quant.cpp.orig	2019-01-23 09:47:18.000000000 +0000
 +++ common/quant.cpp
-@@ -723,7 +723,6 @@ uint32_t Quant::rdoQuant(const CUData& c
-             X265_CHECK(coeffNum[cgScanPos] == 0, "count of coeff failure\n");
+@@ -724,7 +724,6 @@ uint32_t Quant::rdoQuant(const CUData& c
              uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
              uint32_t blkPos      = codeParams.scan[scanPosBase];
+ #if X265_ARCH_X86
 -            bool enable512 = detect512();
              if (enable512)
                  primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
              else
-@@ -805,8 +804,6 @@ uint32_t Quant::rdoQuant(const CUData& c
-             uint32_t blkPos = codeParams.scan[scanPosBase];
+@@ -811,7 +810,6 @@ uint32_t Quant::rdoQuant(const CUData& c
              if (usePsyMask)
              {
+ #if X265_ARCH_X86
 -                bool enable512 = detect512();
--
                  if (enable512)
                      primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
                  else