x265: Backport some patches from x265_git master

Signed-off-by: Zoltán Böszörményi <[email protected]>

Author: zboszor

recipes-support/x265/files/0001-Fix-error-message-for-x265-check-when-StrictCbr-is-e.patch

@@ -0,0 +1,27 @@
+From 825b5da5c15d48f42ea88319b975cbffba689694 Mon Sep 17 00:00:00 2001
+From: Uthayakumar Muthu <[email protected]>
+Date: Tue, 3 Dec 2024 18:04:43 +0530
+Subject: [PATCH 01/13] Fix error message for x265 check when StrictCbr is
+ enabled
+
+Upstream-Status: Backport
+---
+ source/common/param.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/common/param.cpp b/source/common/param.cpp
+index a35b06339..7d934b351 100755
+--- a/source/common/param.cpp
++++ b/source/common/param.cpp
+@@ -1870,7 +1870,7 @@ int x265_check_params(x265_param* param)
+     CHECK(param->rc.rateControlMode == X265_RC_CQP && param->rc.bStatRead,
+           "Constant QP is incompatible with 2pass");
+     CHECK(param->rc.bStrictCbr && (param->rc.bitrate <= 0 || param->rc.vbvBufferSize <=0),
+-          "Strict-cbr cannot be applied without specifying target bitrate or vbv bufsize");
++          "Strict-cbr cannot be applied without specifying both target bitrate and vbv bufsize");
+     CHECK(strlen(param->analysisSave) && (param->analysisSaveReuseLevel < 0 || param->analysisSaveReuseLevel > 10),
+         "Invalid analysis save refine level. Value must be between 1 and 10 (inclusive)");
+     CHECK(strlen(param->analysisLoad) && (param->analysisLoadReuseLevel < 0 || param->analysisLoadReuseLevel > 10),
+-- 
+2.48.1
+

recipes-support/x265/files/0002-Fix-memory-leak-if-no-command-line-option.patch

@@ -0,0 +1,43 @@
+From 35e750ed50d91036e3ee9c05be978bd95bc7cb7f Mon Sep 17 00:00:00 2001
+From: Min Chen <[email protected]>
+Date: Wed, 11 Dec 2024 03:10:16 -0800
+Subject: [PATCH 02/13] Fix memory leak if no command line option
+
+Upstream-Status: Backport
+---
+ source/x265cli.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source/x265cli.cpp b/source/x265cli.cpp
+index 6ca6fb495..0f3fc3070 100755
+--- a/source/x265cli.cpp
++++ b/source/x265cli.cpp
+@@ -617,6 +617,12 @@ namespace X265_NS {
+ 
+     bool CLIOptions::parse(int argc, char **argv)
+     {
++        if (argc <= 1)
++        {
++            x265_log(NULL, X265_LOG_ERROR, "No input file. Run x265 --help for a list of options.\n");
++            return true;
++        }
++
+         bool bError = false;
+         int bShowHelp = false;
+         int inputBitDepth = 8;
+@@ -636,12 +642,6 @@ namespace X265_NS {
+         int svtEnabled = 0;
+         argCnt = argc;
+ 
+-        if (argc <= 1)
+-        {
+-            x265_log(NULL, X265_LOG_ERROR, "No input file. Run x265 --help for a list of options.\n");
+-            return true;
+-        }
+-
+         /* Presets are applied before all other options. */
+         for (optind = 0;;)
+         {
+-- 
+2.48.1
+

recipes-support/x265/files/0003-Fix-SEI-buffer-memory-leaks.patch

@@ -0,0 +1,47 @@
+From 56f7026cbdc3eb2c55078b22cb76817294419bd0 Mon Sep 17 00:00:00 2001
+From: Min Chen <[email protected]>
+Date: Thu, 28 Nov 2024 16:09:28 -0800
+Subject: [PATCH 03/13] Fix SEI buffer memory leaks
+
+Upstream-Status: Backport
+---
+ source/encoder/encoder.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+index 2e65cb1a9..e3285bbae 100644
+--- a/source/encoder/encoder.cpp
++++ b/source/encoder/encoder.cpp
+@@ -1082,6 +1082,16 @@ void Encoder::copyUserSEIMessages(Frame *frame, const x265_picture* pic_in)
+     }
+ 
+     int numPayloads = pic_in->userSEI.numPayloads + toneMapPayload + userPayload;
++
++    // TODO: we may reuse buffer if become smaller than exist buffer
++    if (frame->m_userSEI.payloads && numPayloads != frame->m_userSEI.numPayloads)
++    {
++        for (int i = 0; i < frame->m_userSEI.numPayloads; i++)
++            delete[] frame->m_userSEI.payloads[i].payload;
++        delete[] frame->m_userSEI.payloads;
++        frame->m_userSEI.payloads = NULL;
++    }
++
+     frame->m_userSEI.numPayloads = numPayloads;
+ 
+     if (frame->m_userSEI.numPayloads)
+@@ -1102,6 +1112,12 @@ void Encoder::copyUserSEIMessages(Frame *frame, const x265_picture* pic_in)
+             else
+                 input = pic_in->userSEI.payloads[i];
+ 
++            // TODO: condition may improve, because buffer size may change from big to small, but never back to original allocate size
++            if (frame->m_userSEI.payloads[i].payload && frame->m_userSEI.payloads[i].payloadSize < input.payloadSize)
++            {
++                delete[] frame->m_userSEI.payloads[i].payload;
++                frame->m_userSEI.payloads[i].payload = NULL;
++            }
+             if (!frame->m_userSEI.payloads[i].payload)
+                 frame->m_userSEI.payloads[i].payload = new uint8_t[input.payloadSize];
+             memcpy(frame->m_userSEI.payloads[i].payload, input.payload, input.payloadSize);
+-- 
+2.48.1
+

recipes-support/x265/files/0004-Fix-shared-link-issue-R_X86_64_PC32.patch

@@ -0,0 +1,78 @@
+From 1a0ba366cc223bf8c54ed2deb9b3ca2226d70837 Mon Sep 17 00:00:00 2001
+From: Min Chen <[email protected]>
+Date: Thu, 5 Dec 2024 22:32:27 -0800
+Subject: [PATCH 04/13] Fix shared link issue (R_X86_64_PC32)
+
+Upstream-Status: Backport
+---
+ source/common/x86/cpu-a.asm       |  7 +++++++
+ source/common/x86/pixel-util8.asm | 18 +++++++++++++++++-
+ 2 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/source/common/x86/cpu-a.asm b/source/common/x86/cpu-a.asm
+index 0930e142b..747b921f7 100644
+--- a/source/common/x86/cpu-a.asm
++++ b/source/common/x86/cpu-a.asm
+@@ -174,7 +174,14 @@ cglobal safe_intel_cpu_indicator_init
+     sub  rsp, 32 ; shadow space
+ %endif
+     and  rsp, ~31
++%if WIN64
++    lea rax, [intel_cpu_indicator_init]
++    call rax
++%elif UNIX64
++    call [rel intel_cpu_indicator_init wrt ..plt]
++%else
+     call intel_cpu_indicator_init
++%endif
+     leave
+ %if ARCH_X86_64
+     pop r14
+diff --git a/source/common/x86/pixel-util8.asm b/source/common/x86/pixel-util8.asm
+index 3f8c6be35..6ad2852d3 100644
+--- a/source/common/x86/pixel-util8.asm
++++ b/source/common/x86/pixel-util8.asm
+@@ -8484,7 +8484,13 @@ cglobal costCoeffNxN, 6,11,6
+     ; r4 - nonZero
+     ; r5 - scanFlagMask
+     ; r6 - sum
++
++%if UNIX64
++    mov         r0, [private_prefix %+ _entropyStateBits wrt ..gotpc]
++%else
+     lea         r0, [private_prefix %+ _entropyStateBits]
++    ;mov         r0, private_prefix %+ _entropyStateBits
++%endif
+     mov         r1, r6mp
+     xor         r6d, r6d
+     xor         r4d, r4d
+@@ -8664,7 +8670,12 @@ cglobal costCoeffNxN, 6,10,5
+     ; r6 - sum
+     ; {r3,r4} - ctxSig[15-0]
+     ; r8m - (numNonZero != 0) || (subPosBase == 0)
++%if UNIX64
++    mov             r0, [private_prefix %+ _entropyStateBits wrt ..gotpc]
++%else
+     lea             r0, [private_prefix %+ _entropyStateBits]
++    ;mov             r0, private_prefix %+ _entropyStateBits
++%endif
+     mov             r1, r6mp
+     xor             r6d, r6d
+     xor             r8d, r8d
+@@ -8903,7 +8914,12 @@ cglobal costC1C2Flag, 4,12,2
+     or          r11d, 0x100                     ; default value setting to 8
+     bsf         r11d, r11d
+ 
+-    lea         r5, [private_prefix %+ _entropyStateBits]
++%if UNIX64
++    mov             r5, [private_prefix %+ _entropyStateBits wrt ..gotpc]
++%else
++    lea             r5, [private_prefix %+ _entropyStateBits]
++    ;mov             r5, private_prefix %+ _entropyStateBits
++%endif
+     xor         r6d, r6d
+     mov         r4d, 0xFFFFFFF9
+ 
+-- 
+2.48.1
+

recipes-support/x265/files/0005-Add-check-for-input-video-resolution-exceeding-8k.patch

@@ -0,0 +1,25 @@
+From 8e1d8c5613c99f644e252275a187673bb651f71c Mon Sep 17 00:00:00 2001
+From: Ponsanthini <[email protected]>
+Date: Thu, 19 Dec 2024 23:36:14 +0530
+Subject: [PATCH 05/13] Add check for input video resolution exceeding 8k
+
+Upstream-Status: Backport
+---
+ source/common/param.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source/common/param.cpp b/source/common/param.cpp
+index 7d934b351..0fa1cffa2 100755
+--- a/source/common/param.cpp
++++ b/source/common/param.cpp
+@@ -1667,6 +1667,7 @@ int x265_check_params(x265_param* param)
+ {
+ #define CHECK(expr, msg) check_failed |= _confirm(param, expr, msg)
+     int check_failed = 0; /* abort if there is a fatal configuration problem */
++    CHECK((param->sourceWidth >= 8192 && param->sourceHeight >= 4320), "Input video resolution exceeds the maximum supported 8K resolution of 8192x4320");
+     CHECK(param->uhdBluray == 1 && (X265_DEPTH != 10 || param->internalCsp != 1 || param->interlaceMode != 0),
+         "uhd-bd: bit depth, chroma subsample, source picture type must be 10, 4:2:0, progressive");
+     CHECK(param->maxCUSize != 64 && param->maxCUSize != 32 && param->maxCUSize != 16,
+-- 
+2.48.1
+

recipes-support/x265/files/0006-Fix-max-supported-input-resolution-check.patch

@@ -0,0 +1,26 @@
+From 30290ccd0edfc1c79eb275e7fc40797ba6e1e35c Mon Sep 17 00:00:00 2001
+From: Ponsanthini <[email protected]>
+Date: Tue, 7 Jan 2025 17:09:44 +0530
+Subject: [PATCH 06/13] Fix max supported input resolution check
+
+Upstream-Status: Backport
+---
+ source/common/param.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/common/param.cpp b/source/common/param.cpp
+index 0fa1cffa2..ead908013 100755
+--- a/source/common/param.cpp
++++ b/source/common/param.cpp
+@@ -1667,7 +1667,7 @@ int x265_check_params(x265_param* param)
+ {
+ #define CHECK(expr, msg) check_failed |= _confirm(param, expr, msg)
+     int check_failed = 0; /* abort if there is a fatal configuration problem */
+-    CHECK((param->sourceWidth >= 8192 && param->sourceHeight >= 4320), "Input video resolution exceeds the maximum supported 8K resolution of 8192x4320");
++    CHECK((param->sourceWidth > 8192 && param->sourceHeight > 4320), "Input video resolution exceeds the maximum supported 8K resolution of 8192x4320");
+     CHECK(param->uhdBluray == 1 && (X265_DEPTH != 10 || param->internalCsp != 1 || param->interlaceMode != 0),
+         "uhd-bd: bit depth, chroma subsample, source picture type must be 10, 4:2:0, progressive");
+     CHECK(param->maxCUSize != 64 && param->maxCUSize != 32 && param->maxCUSize != 16,
+-- 
+2.48.1
+

recipes-support/x265/files/0007-Add-Feature-flag-support-in-x265_config.patch

@@ -0,0 +1,60 @@
+From aa19c727a559d35c81c0ad7ff04094cf71c7c5f8 Mon Sep 17 00:00:00 2001
+From: Uthayakumar Muthu <[email protected]>
+Date: Mon, 9 Dec 2024 15:39:04 +0530
+Subject: [PATCH 07/13] Add Feature flag support in x265_config
+
+Upstream-Status: Backport
+---
+ source/CMakeLists.txt   | 11 +++++++++++
+ source/x265_config.h.in |  3 +++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 5c6dda9e8..f39bcc5c4 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -696,17 +696,28 @@ endif(DETAILED_CU_STATS)
+ option(ENABLE_ALPHA "Enable alpha encoding in x265" OFF)
+ if(ENABLE_ALPHA)
+     add_definitions(-DENABLE_ALPHA)
++    set(ENABLE_ALPHA 1)
++else()
++    set(ENABLE_ALPHA 0)
+ endif()
+ 
+ option(ENABLE_MULTIVIEW "Enable Multi-view encoding in HEVC" OFF)
+ if(ENABLE_MULTIVIEW)
+     add_definitions(-DENABLE_MULTIVIEW)
++    set(ENABLE_MULTIVIEW 1)
++else()
++    set(ENABLE_MULTIVIEW 0)
+ endif()
+ 
+ option(ENABLE_SCC_EXT "Enable screen content coding extension in HEVC" OFF)
+ if(ENABLE_SCC_EXT)
+     add_definitions(-DENABLE_SCC_EXT)
++    set(ENABLE_SCC_EXT 1)
++else()
++    set(ENABLE_SCC_EXT 0)
+ endif()
++configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
++               "${PROJECT_BINARY_DIR}/x265_config.h")
+ 
+ add_subdirectory(encoder)
+ add_subdirectory(common)
+diff --git a/source/x265_config.h.in b/source/x265_config.h.in
+index 17c1ecb02..83e703567 100644
+--- a/source/x265_config.h.in
++++ b/source/x265_config.h.in
+@@ -30,5 +30,8 @@
+  * the shared library SONAME on platforms which support it. It also
+  * prevents linking against a different version of the static lib */
+ #define X265_BUILD ${X265_BUILD}
++#define ENABLE_ALPHA ${ENABLE_ALPHA}
++#define ENABLE_MULTIVIEW ${ENABLE_MULTIVIEW}
++#define ENABLE_SCC_EXT ${ENABLE_SCC_EXT}
+ 
+ #endif
+-- 
+2.48.1
+

recipes-support/x265/files/0008-Fix-the-buffer-size-and-frame-out-of-bound-access-is.patch

@@ -0,0 +1,48 @@
+From 9d1a40d7c7a5919d15316388e4de5b5a825b4407 Mon Sep 17 00:00:00 2001
+From: Uthayakumar Muthu <[email protected]>
+Date: Wed, 18 Dec 2024 11:29:55 +0530
+Subject: [PATCH 08/13] Fix the buffer size and frame out of bound access issue
+
+Upstream-Status: Backport
+---
+ source/encoder/encoder.cpp      | 4 ++--
+ source/encoder/frameencoder.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
+index e3285bbae..5932d819f 100644
+--- a/source/encoder/encoder.cpp
++++ b/source/encoder/encoder.cpp
+@@ -2731,14 +2731,14 @@ char* Encoder::statsString(EncStats& stat, char* buffer, size_t bufferSize)
+ 
+     if (m_param->bEnablePsnr)
+     {
+-        len += snprintf(buffer + len, sizeof(buffer) - len,"  PSNR Mean: Y:%.3lf U:%.3lf V:%.3lf",
++        len += snprintf(buffer + len, bufferSize - len,"  PSNR Mean: Y:%.3lf U:%.3lf V:%.3lf",
+                        stat.m_psnrSumY / (double)stat.m_numPics,
+                        stat.m_psnrSumU / (double)stat.m_numPics,
+                        stat.m_psnrSumV / (double)stat.m_numPics);
+     }
+     if (m_param->bEnableSsim)
+     {
+-        snprintf(buffer + len, sizeof(buffer) - len, "  SSIM Mean: %.6lf (%.3lfdB)",
++        snprintf(buffer + len, bufferSize - len, "  SSIM Mean: %.6lf (%.3lfdB)",
+                 stat.m_globalSsim / (double)stat.m_numPics,
+                 x265_ssim2dB(stat.m_globalSsim / (double)stat.m_numPics));
+     }
+diff --git a/source/encoder/frameencoder.cpp b/source/encoder/frameencoder.cpp
+index 5749f994e..9188f4c8c 100644
+--- a/source/encoder/frameencoder.cpp
++++ b/source/encoder/frameencoder.cpp
+@@ -2435,7 +2435,7 @@ void FrameEncoder::vmafFrameLevelScore()
+ 
+ Frame** FrameEncoder::getEncodedPicture(NALList& output)
+ {
+-    if (m_frame[0] && (m_param->numLayers <= 1 || m_frame[1]))
++    if (m_frame[0] && (m_param->numLayers <= 1 || (MAX_LAYERS > 1 && m_frame[1])))
+     {
+         /* block here until worker thread completes */
+         m_done.wait();
+-- 
+2.48.1
+