Request 4404 (accepted)

Overview

Request 4404 (accepted)

- Add patches to support building with libx264 build 155 and
high color bit depth:
* 0001-x264-bump-to-build-155.patch
* 0002-encx264-check-correct-build-number-in-ifdef.patch
* 0003-encx264-fix-apply_h264_profiles-lossless-check-for-high-bit-depth.patch

Created by antlarr about 5 years ago
In state accepted

Submit handbrake-1.0.7

Submit package home:antlar...:Multimedia / handbrake-1.0.7 to package Multimedia / handbrake-1.0.7

handbrake.changes Changed

handbrake.spec Changed

0001-x264-bump-to-build-155.patch Added

@@ -0,0 +1,168 @@
+From bd19e65b00d49aed5cbda35610ee54db4d57d1c3 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Tue, 26 Dec 2017 12:38:21 -0800
+Subject: [PATCH] x264: bump to build 155
+
+Requires NASM to build
+Unified 8 and 10 bit library support
+AVX-512 optimizations
+Various other bug fixes and improvements
+---
+ contrib/x264/A00-version-string.patch |  8 ++---
+ contrib/x264/module.defs              |  7 ++--
+ libhb/encx264.c                       | 48 +++++++++++++++++++++++++--
+ 3 files changed, 52 insertions(+), 11 deletions(-)
+
+diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
+index 8e46d601c..2f7c9f96c 100644
+--- a/contrib/x264/A00-version-string.patch
++++ b/contrib/x264/A00-version-string.patch
+@@ -6,7 +6,7 @@ index 2b59b92..86b7198 100644
+  
+  #include "x264_config.h"
+  
+--#define X264_BUILD 148
++-#define X264_BUILD 155
+ +/*
+ + * Define the full version explicitly so that it survives a git --archive.
+ + *
+@@ -22,9 +22,9 @@ index 2b59b92..86b7198 100644
+ +#ifdef  X264_POINTVER
+ +#undef  X264_POINTVER
+ +#endif
+-+#define X264_BUILD    148
+-+#define X264_VERSION  " r2708 86b7198"
+-+#define X264_POINTVER "0.148.2708 86b7198"
+++#define X264_BUILD    155
+++#define X264_VERSION " r2893 b00bcaf"
+++#define X264_POINTVER "0.155.2893 b00bcaf"
+  
+  /* Application developers planning to link against a shared library version of
+   * libx264 from a Microsoft Visual Studio or similar development environment
+diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
+index 17b1e58ec..ee71e70f1 100644
+--- a/contrib/x264/module.defs
++++ b/contrib/x264/module.defs
+@@ -1,16 +1,15 @@
+ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
+ $(eval $(call import.CONTRIB.defs,X264))
+ 
+-X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2
+-X264.FETCH.url    += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2
+-X264.FETCH.sha256  = 6ba2d848eabbca0d9d2c2a12b263e02f856a81fce87fbc74df52a1097c88e39c
++X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20171225-2245.tar.bz2
++X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20171225-2245.tar.bz2
++X264.FETCH.sha256  = ea39f32ccb3bd3aeaccd663c8d210117be5d9cfbe89e1a8b5f631e0f7ed74954
+ 
+ X264.GCC.args.c_std =
+ 
+ X264.CONFIGURE.deps   =
+ X264.CONFIGURE.shared =
+ 
+-X264.CONFIGURE.extra  = --bit-depth=8 --chroma-format=420
+ X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli
+ 
+ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+diff --git a/libhb/encx264.c b/libhb/encx264.c
+index 4e9d12689..593111fb0 100644
+--- a/libhb/encx264.c
++++ b/libhb/encx264.c
+@@ -151,7 +151,11 @@ static void * x264_lib_open_ubuntu_10bit(void)
+ 
+ void hb_x264_global_init(void)
+ {
++#if X264_BUILD < 155
+     x264_apis[0].bit_depth                 = x264_bit_depth;
++#else
++    x264_apis[0].bit_depth                 = X264_BIT_DEPTH;
++#endif
+     x264_apis[0].param_default             = x264_param_default;
+     x264_apis[0].param_default_preset      = x264_param_default_preset;
+     x264_apis[0].param_apply_profile       = x264_param_apply_profile;
+@@ -164,13 +168,32 @@ void hb_x264_global_init(void)
+     x264_apis[0].encoder_close             = x264_encoder_close;
+     x264_apis[0].picture_init              = x264_picture_init;
+ 
++    if (x264_apis[0].bit_depth == 0)
++    {
++        // libx264 supports 8 and 10 bit
++        x264_apis[0].bit_depth                 = 8;
++        x264_apis[1].bit_depth                 = 10;
++        x264_apis[1].param_default             = x264_param_default;
++        x264_apis[1].param_default_preset      = x264_param_default_preset;
++        x264_apis[1].param_apply_profile       = x264_param_apply_profile;
++        x264_apis[1].param_apply_fastfirstpass = x264_param_apply_fastfirstpass;
++        x264_apis[1].param_parse               = x264_param_parse;
++        x264_apis[1].encoder_open              = x264_encoder_open;
++        x264_apis[1].encoder_headers           = x264_encoder_headers;
++        x264_apis[1].encoder_encode            = x264_encoder_encode;
++        x264_apis[1].encoder_delayed_frames    = x264_encoder_delayed_frames;
++        x264_apis[1].encoder_close             = x264_encoder_close;
++        x264_apis[1].picture_init              = x264_picture_init;
++        return;
++    }
++
+     // Invalidate other apis
+     x264_apis[1].bit_depth = -1;
+ 
+     // Attempt to dlopen a library for handling the bit-depth that we do
+     // not already have.
+     void *h;
+-    if (x264_bit_depth == 8)
++    if (x264_apis[0].bit_depth == 8)
+     {
+         h = x264_lib_open(libx264_10bit_names);
+ #if defined(SYS_LINUX)
+@@ -190,8 +213,23 @@ void hb_x264_global_init(void)
+     }
+ 
+     int ii;
++    int dll_bitdepth = 0;
++#if X264_BUILD < 155
+     int *pbit_depth                   = (int*)hb_dlsym(h, "x264_bit_depth");
++    if (pbit_depth != NULL)
++    {
++        dll_bitdepth = *pbit_depth;
++    }
++#endif
+     x264_apis[1].param_default        = hb_dlsym(h, "x264_param_default");
++#if X264_BUILD >= 155
++    if (x264_apis[1].param_default != NULL)
++    {
++        x264_param_t defaults;
++        x264_apis[1].param_default(&defaults);
++        dll_bitdepth = defaults.i_bitdepth;
++    }
++#endif
+     x264_apis[1].param_default_preset = hb_dlsym(h, "x264_param_default_preset");
+     x264_apis[1].param_apply_profile  = hb_dlsym(h, "x264_param_apply_profile");
+     x264_apis[1].param_apply_fastfirstpass =
+@@ -215,7 +253,7 @@ void hb_x264_global_init(void)
+     x264_apis[1].encoder_close        = hb_dlsym(h, "x264_encoder_close");
+     x264_apis[1].picture_init         = hb_dlsym(h, "x264_picture_init");
+ 
+-    if (pbit_depth                             != NULL &&
++    if (dll_bitdepth > 0 && dll_bitdepth != x264_apis[0].bit_depth &&
+         x264_apis[1].param_default             != NULL &&
+         x264_apis[1].param_default_preset      != NULL &&
+         x264_apis[1].param_apply_profile       != NULL &&
+@@ -228,7 +266,7 @@ void hb_x264_global_init(void)
+         x264_apis[1].encoder_close             != NULL &&
+         x264_apis[1].picture_init              != NULL)
+     {
+-        x264_apis[1].bit_depth = *pbit_depth;
++        x264_apis[1].bit_depth = dll_bitdepth;
+     }
+ }
+ 
+@@ -321,6 +359,10 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
+         return 1;
+     }
+ 
++#if X264_BUILD >= 155
++    param.i_bitdepth = bit_depth;
++#endif
++
+     /* If the PSNR or SSIM tunes are in use, enable the relevant metric */
+     if (job->encoder_tune != NULL && *job->encoder_tune)
+     {

0002-encx264-check-correct-build-number-in-ifdef.patch Added

@@ -0,0 +1,50 @@
+From 94f4c41daa72a6479b1d6e66d322d61be41b427f Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb@gmail.com>
+Date: Sun, 31 Dec 2017 08:42:26 -0800
+Subject: [PATCH] encx264: check correct build number in ifdef
+
+The multi-lib change actually happend in build 153
+---
+ libhb/encx264.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libhb/encx264.c b/libhb/encx264.c
+index 593111fb0..04ac22824 100644
+--- a/libhb/encx264.c
++++ b/libhb/encx264.c
+@@ -151,7 +151,7 @@ static void * x264_lib_open_ubuntu_10bit(void)
+ 
+ void hb_x264_global_init(void)
+ {
+-#if X264_BUILD < 155
++#if X264_BUILD < 153
+     x264_apis[0].bit_depth                 = x264_bit_depth;
+ #else
+     x264_apis[0].bit_depth                 = X264_BIT_DEPTH;
+@@ -214,7 +214,7 @@ void hb_x264_global_init(void)
+ 
+     int ii;
+     int dll_bitdepth = 0;
+-#if X264_BUILD < 155
++#if X264_BUILD < 153
+     int *pbit_depth                   = (int*)hb_dlsym(h, "x264_bit_depth");
+     if (pbit_depth != NULL)
+     {
+@@ -222,7 +222,7 @@ void hb_x264_global_init(void)
+     }
+ #endif
+     x264_apis[1].param_default        = hb_dlsym(h, "x264_param_default");
+-#if X264_BUILD >= 155
++#if X264_BUILD >= 153
+     if (x264_apis[1].param_default != NULL)
+     {
+         x264_param_t defaults;
+@@ -359,7 +359,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
+         return 1;
+     }
+ 
+-#if X264_BUILD >= 155
++#if X264_BUILD >= 153
+     param.i_bitdepth = bit_depth;
+ #endif
+

0003-encx264-fix-apply_h264_profiles-lossless-check-for-high-bit-depth.patch Added

@@ -0,0 +1,42 @@
+From fbc98da08ae1d455d8c672c312c817336338c224 Mon Sep 17 00:00:00 2001
+From: Tim Walker <tdskywalker@gmail.com>
+Date: Sun, 18 Feb 2018 06:04:20 +0100
+Subject: [PATCH] encx264: fix apply_h264_profile's lossless check for high bit
+ depth.
+
+---
+ libhb/encx264.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/libhb/encx264.c b/libhb/encx264.c
+index 4adab5cc0..984d52be9 100644
+--- a/libhb/encx264.c
++++ b/libhb/encx264.c
+@@ -976,15 +976,23 @@ static int apply_h264_profile(const x264_api_t *api, x264_param_t *param,
+         /*
+          * lossless requires High 4:4:4 Predictive profile
+          */
+-        if (param->rc.f_rf_constant < 1.0 &&
+-            param->rc.i_rc_method == X264_RC_CRF &&
+-            strcasecmp(h264_profile, "high444") != 0)
++        int qp_bd_offset = 6 * (api->bit_depth - 8);
++        if (strcasecmp(h264_profile, "high444") != 0 &&
++            ((param->rc.i_rc_method == X264_RC_CQP && param->rc.i_qp_constant <= 0) ||
++             (param->rc.i_rc_method == X264_RC_CRF && (int)(param->rc.f_rf_constant + qp_bd_offset) <= 0)))
+         {
+             if (verbose)
+             {
+                 hb_log("apply_h264_profile [warning]: lossless requires high444 profile, disabling");
+             }
+-            param->rc.f_rf_constant = 1.0;
++            if (param->rc.i_rc_method == X264_RC_CQP)
++            {
++                param->rc.i_qp_constant = 1;
++            }
++            else
++            {
++                param->rc.f_rf_constant = 1 - qp_bd_offset;
++            }
+         }
+         return api->param_apply_profile(param, h264_profile);
+     }

Build Results
RPM Lint

Refresh

Comments for request 4404 0

Request History

antlarr created request about 5 years ago

olh accepted request about 5 years ago