Merge pull request #296 from nyanmisaka/next-5.1

[5.1] Fix the brightness issue in HLG-2-SDR tonemap
jellyfin · Oct 28, 2023 · 56e2640 · 56e2640
2 parents 5dbe994 + 185fcf7
commit 56e2640
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/debian/patches/0005-add-cuda-tonemap-impl.patch b/debian/patches/0005-add-cuda-tonemap-impl.patch
@@ -244,12 +244,12 @@ Index: jellyfin-ffmpeg/libavfilter/colorspace.c
 +
 +// linearizer for HLG/ARIB-B67
 +float eotf_arib_b67(float x) {
-+    return ootf_1_2(inverse_oetf_arib_b67(x));
++    return ootf_1_2(inverse_oetf_arib_b67(x)) * 5.0f;
 +}
 +
 +// delinearizer for HLG/ARIB-B67
 +float inverse_eotf_arib_b67(float x) {
-+    return oetf_arib_b67(inverse_ootf_1_2(x));
++    return oetf_arib_b67(inverse_ootf_1_2(x / 5.0f));
 +}
 +
 +// delinearizer for BT709, BT2020-10
@@ -468,12 +468,12 @@ Index: jellyfin-ffmpeg/libavfilter/cuda/colorspace_common.h
 +
 +// linearizer for HLG/ARIB-B67
 +static __inline__ __device__ float eotf_arib_b67(float x) {
-+    return ootf_1_2(inverse_oetf_arib_b67(x));
++    return ootf_1_2(inverse_oetf_arib_b67(x)) * 5.0f;
 +}
 +
 +// delinearizer for HLG/ARIB-B67
 +static __inline__ __device__ float inverse_eotf_arib_b67(float x) {
-+    return oetf_arib_b67(inverse_ootf_1_2(x));
++    return oetf_arib_b67(inverse_ootf_1_2(x / 5.0f));
 +}
 +
 +// delinearizer for BT709, BT2020-10

diff --git a/debian/patches/0008-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch b/debian/patches/0008-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch
@@ -214,12 +214,12 @@ Index: jellyfin-ffmpeg/libavfilter/opencl/colorspace_common.cl
 +
 +// linearizer for HLG/ARIB-B67
 +float eotf_arib_b67(float x) {
-+    return ootf_1_2(inverse_oetf_arib_b67(x));
++    return ootf_1_2(inverse_oetf_arib_b67(x)) * 5.0f;
 +}
 +
 +// delinearizer for HLG/ARIB-B67
 +float inverse_eotf_arib_b67(float x) {
-+    return oetf_arib_b67(inverse_ootf_1_2(x));
++    return oetf_arib_b67(inverse_ootf_1_2(x / 5.0f));
  }
 
 -float inverse_eotf_bt1886(float c) {