jellyfin/jellyfin-ffmpeg
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-ffmpeg.git synced 2024-10-07 03:13:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #451 from nyanmisaka/fix-ocl-tm-full-range

Browse Source 
Fix ocl tonemap cannot output full range
This commit is contained in:
Nyanmisaka 2024-09-07 01:15:56 +08:00 committed by GitHub
commit efca98b8d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
debian/patches/0007-add-bt2390-eetf-and-code-refactor-to-opencl-tonemap.patch vendored
View File

@ -213,8 +213,10 @@ Index: FFmpeg/libavfilter/opencl/colorspace_common.cl
+ +
+float inverse_ootf_1_2(float x) { +float inverse_ootf_1_2(float x) {
+ return x > 0.0f ? native_powr(x, 1.0f / 1.2f) : x; + return x > 0.0f ? native_powr(x, 1.0f / 1.2f) : x;
+} }
+
-float inverse_eotf_bt1886(float c) {
- return c < 0.0f ? 0.0f : powr(c, 1.0f / 2.4f);
+float oetf_arib_b67(float x) { +float oetf_arib_b67(float x) {
+ x = fmax(x, 0.0f); + x = fmax(x, 0.0f);
+ return x <= (1.0f / 12.0f) + return x <= (1.0f / 12.0f)
@ -222,15 +224,6 @@ Index: FFmpeg/libavfilter/opencl/colorspace_common.cl
+ : (ARIB_B67_A * native_log(12.0f * x - ARIB_B67_B) + ARIB_B67_C); + : (ARIB_B67_A * native_log(12.0f * x - ARIB_B67_B) + ARIB_B67_C);
} }
-float inverse_eotf_bt1886(float c) {
- return c < 0.0f ? 0.0f : powr(c, 1.0f / 2.4f);
+float inverse_oetf_arib_b67(float x) {
+ x = fmax(x, 0.0f);
+ return x <= 0.5f
+ ? (x * x) * (1.0f / 3.0f)
+ : (native_exp((x - ARIB_B67_C) / ARIB_B67_A) + ARIB_B67_B) * (1.0f / 12.0f);
}
-float oetf_bt709(float c) { -float oetf_bt709(float c) {
- c = c < 0.0f ? 0.0f : c; - c = c < 0.0f ? 0.0f : c;
- float r1 = 4.5f * c; - float r1 = 4.5f * c;
@ -241,11 +234,18 @@ Index: FFmpeg/libavfilter/opencl/colorspace_common.cl
- float r1 = c / 4.5f; - float r1 = c / 4.5f;
- float r2 = powr((c + 0.099f) / 1.099f, 1.0f / 0.45f); - float r2 = powr((c + 0.099f) / 1.099f, 1.0f / 0.45f);
- return c < 0.081f ? r1 : r2; - return c < 0.081f ? r1 : r2;
+float inverse_oetf_arib_b67(float x) {
+ x = fmax(x, 0.0f);
+ return x <= 0.5f
+ ? (x * x) * (1.0f / 3.0f)
+ : (native_exp((x - ARIB_B67_C) / ARIB_B67_A) + ARIB_B67_B) * (1.0f / 12.0f);
}
+// linearizer for HLG/ARIB-B67 +// linearizer for HLG/ARIB-B67
+float eotf_arib_b67(float x) { +float eotf_arib_b67(float x) {
+ return ootf_1_2(inverse_oetf_arib_b67(x)) * 5.0f; + return ootf_1_2(inverse_oetf_arib_b67(x)) * 5.0f;
} +}
+
+// delinearizer for HLG/ARIB-B67 +// delinearizer for HLG/ARIB-B67
+float inverse_eotf_arib_b67(float x) { +float inverse_eotf_arib_b67(float x) {
+ return oetf_arib_b67(inverse_ootf_1_2(x / 5.0f)); + return oetf_arib_b67(inverse_ootf_1_2(x / 5.0f));
@ -265,7 +265,17 @@ Index: FFmpeg/libavfilter/opencl/colorspace_common.cl
float3 yuv2rgb(float y, float u, float v) { float3 yuv2rgb(float y, float u, float v) {
#ifdef FULL_RANGE_IN #ifdef FULL_RANGE_IN
u -= 0.5f; v -= 0.5f; u -= 0.5f; v -= 0.5f;
@@ -188,18 +241,101 @@ float3 lrgb2lrgb(float3 c) { @@ -150,7 +203,9 @@ float3 rgb2yuv(float r, float g, float b
float rgb2y(float r, float g, float b) {
float y = r*yuv_matrix[0] + g*yuv_matrix[1] + b*yuv_matrix[2];
+#ifndef FULL_RANGE_OUT
y = (219.0f * y + 16.0f) / 255.0f;
+#endif
return y;
}
@@ -188,18 +243,101 @@ float3 lrgb2lrgb(float3 c) {
#endif #endif
} }