contrib: Update to x265 r12666 681c05e83.

5 files changed, 2 insertions, 91 deletions

diff --git a/contrib/x265_8bit/A01-limit-tu_fix.patch b/contrib/x265_8bit/A01-limit-tu_fix.patch
deleted file mode 100644
index 435e3bda7..000000000
--- a/contrib/x265_8bit/A01-limit-tu_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Aruna Matheswaran <[email protected]>
-# Date 1573207250 -19800
-# Branch Release_3.2
-# Node ID 09f3b1d9349ac84d74f14f99297f9418bc8b2b02
-# Parent  b5c86a64bbbede216b25092def72272ecde5523a
-limit-tu: Fix bug in loading co-located CU's TU depth
-
-diff --git a/source/encoder/analysis.cpp b/source/encoder/analysis.cpp
---- a/source/encoder/analysis.cpp
-+++ b/source/encoder/analysis.cpp
-@@ -375,12 +375,12 @@
-     CUData* neighbourCU;
-     uint8_t count = 0;
-     int32_t maxTUDepth = -1;
--    neighbourCU = m_slice->m_refFrameList[0][0]->m_encData->m_picCTU;
-+    neighbourCU = &m_slice->m_refFrameList[0][0]->m_encData->m_picCTU[parentCTU.m_cuAddr];
-     predDepth += neighbourCU->m_refTuDepth[cuGeom.geomRecurId];
-     count++;
-     if (m_slice->isInterB())
-     {
--        neighbourCU = m_slice->m_refFrameList[1][0]->m_encData->m_picCTU;
-+        neighbourCU = &m_slice->m_refFrameList[1][0]->m_encData->m_picCTU[parentCTU.m_cuAddr];
-         predDepth += neighbourCU->m_refTuDepth[cuGeom.geomRecurId];
-         count++;
-     }
diff --git a/contrib/x265_8bit/A02-2pass_fix.patch b/contrib/x265_8bit/A02-2pass_fix.patch
deleted file mode 100644
index 2e5f53933..000000000
--- a/contrib/x265_8bit/A02-2pass_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Niranjan <[email protected]>
-# Date 1574665937 -19800
-# Node ID f0fe46ce379dbdf21ee255146796dbf5c4e02ac7
-# Parent  4a29e0c5bfaf30aaed2c5224bcba1f464d68de83
-Fix pass 2 encode failure (Issue #524)
-
-diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp
---- a/source/encoder/ratecontrol.cpp
-+++ b/source/encoder/ratecontrol.cpp
-@@ -53,7 +53,7 @@
- {\
-     bErr = 0;\
-     p = strstr(opts, opt "=");\
--    char* q = strstr(opts, "no-" opt);\
-+    char* q = strstr(opts, "no-" opt " ");\
-     if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\
-         bErr = 1;\
-     else if (!param_val && !q && !p)\
diff --git a/contrib/x265_8bit/A03-vbv-macroblocking.patch b/contrib/x265_8bit/A03-vbv-macroblocking.patch
deleted file mode 100644
index f5a8b8644..000000000
--- a/contrib/x265_8bit/A03-vbv-macroblocking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# HG changeset patch
-# User Kirithika <[email protected]>
-# Date 1577092232 -19800
-# Branch Release_3.2
-# Node ID b4b2ecac21f666af2664b679c4122a930c07475b
-# Parent  09f3b1d9349ac84d74f14f99297f9418bc8b2b02
-Fix VBV macroblocking that comes up with the last Intra frame
-
-This patch enables the VBV Lookahead computation of an I Slice to consider the
-last MiniGop frames available in the lookahead,hence fixing the VBV macroblocking
-issue that comes due to lack of frames in the Lookahead at the end of the video.
-
-diff --git a/source/encoder/slicetype.cpp b/source/encoder/slicetype.cpp
---- a/source/encoder/slicetype.cpp
-+++ b/source/encoder/slicetype.cpp
-@@ -1748,7 +1748,7 @@
-     if (m_param->bBPyramid && curNonB - prevNonB > 1)
-         curBRef = (prevNonB + curNonB + 1) / 2;
-     int miniGopEnd = keyframe ? prevNonB : curNonB;
--    while (curNonB < numFrames + !keyframe)
-+    while (curNonB <= numFrames)
-     {
-         /* P/I cost: This shouldn't include the cost of nextNonB */
-         if (nextNonB != curNonB)
diff --git a/contrib/x265_8bit/A04-threads-priority.patch b/contrib/x265_8bit/A04-threads-priority.patch
deleted file mode 100644
index 1dedf86bb..000000000
--- a/contrib/x265_8bit/A04-threads-priority.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
-index 2db7a146b..4ed534d6b 100644
---- a/source/common/threadpool.cpp
-+++ b/source/common/threadpool.cpp
-@@ -115,12 +115,6 @@ void WorkerThread::threadMain()
- {
-     THREAD_NAME("Worker", m_id);
- 
--#if _WIN32
--    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
--#else
--    __attribute__((unused)) int val = nice(10);
--#endif
--
-     m_pool.setCurrentThreadAffinity();
- 
-     sleepbitmap_t idBit = (sleepbitmap_t)1 << m_id;
-
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index d2d56dcd3..8492986a4 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -2,10 +2,8 @@ __deps__ :=
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 
-X265_8.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.2.1.tar.gz
-X265_8.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
-X265_8.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
-X265_8.EXTRACT.tarbase = x265_3.2.1
+X265_8.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265-snapshot-20210203-12666.tar.gz
+X265_8.FETCH.sha256  = a4a712c9fbe724c263f4506e19aeca74e0259b33126d2e60c813352483f5110c
 
 X265_8.build_dir             = 8bit
 X265_8.CONFIGURE.exe         = cmake