Merge branch 'demosaic_54_firstbunch' of https://github.com/jenshannoschwalm/darktable

Author: TurboGit

data/kernels/demosaic_other.cl

@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    copyright (c) 2015 LebedevRI.
+    Copyright (C) 2015-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -62,8 +62,13 @@ passthrough_color (__read_only image2d_t in, __write_only image2d_t out, const i
  * and writes it to out in float4 format.
  */
 __kernel void
-clip_and_zoom_demosaic_passthrough_monochrome(__read_only image2d_t in, __write_only image2d_t out, const int width, const int height,
-    const int r_x, const int r_y, const int rin_wd, const int rin_ht, const float r_scale, const unsigned int filters)
+clip_and_zoom_demosaic_passthrough_monochrome(__read_only image2d_t in,
+                                              __write_only image2d_t out,
+                                              const int width,
+                                              const int height,
+                                              const int rin_wd,
+                                              const int rin_ht,
+                                              const float r_scale)
 {
   // global id is pixel in output image (float4)
   const int x = get_global_id(0);
@@ -79,19 +84,19 @@ clip_and_zoom_demosaic_passthrough_monochrome(__read_only image2d_t in, __write_
   // how many pixels can be sampled inside that area
   const int samples = round(px_footprint);
 
-  const float2 f = (float2)((x + r_x) * px_footprint, (y + r_y) * px_footprint);
-  int2 p = (int2)((int)f.x, (int)f.y);
+  const float2 f = (float2)(x * px_footprint, y * px_footprint);
+  const int2 p = (int2)((int)f.x, (int)f.y);
   const float2 d = (float2)(f.x - p.x, f.y - p.y);
 
   for(int j=0;j<=samples+1;j++) for(int i=0;i<=samples+1;i++)
   {
     const int xx = p.x + i;
     const int yy = p.y + j;
 
-    float xfilter = (i == 0) ? 1.0f - d.x : ((i == samples+1) ? d.x : 1.0f);
-    float yfilter = (j == 0) ? 1.0f - d.y : ((j == samples+1) ? d.y : 1.0f);
+    const float xfilter = (i == 0) ? 1.0f - d.x : ((i == samples+1) ? d.x : 1.0f);
+    const float yfilter = (j == 0) ? 1.0f - d.y : ((j == samples+1) ? d.y : 1.0f);
 
-    float px = read_imagef(in, sampleri, (int2)(xx, yy)).x;
+    const float px = read_imagef(in, sampleri, (int2)(xx, yy)).x;
     color += yfilter*xfilter*(float4)(px, px, px, 0.0f);
     weight += yfilter*xfilter;
   }

data/kernels/demosaic_ppg.cl

@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    copyright (c) 2009--2010 johannes hanika.
+    Copyright (C) 2009-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,8 +36,13 @@ backtransformf (float2 p, const int r_x, const int r_y, const int r_wd, const in
 }
 
 kernel void
-green_equilibration_lavg(read_only image2d_t in, write_only image2d_t out, const int width, const int height, const unsigned int filters,
-                         const int r_x, const int r_y, const float thr, local float *buffer)
+green_equilibration_lavg(read_only image2d_t in,
+                         write_only image2d_t out,
+                         const int width,
+                         const int height,
+                         const unsigned int filters,
+                         const float thr,
+                         local float *buffer)
 {
   const int x = get_global_id(0);
   const int y = get_global_id(1);
@@ -79,11 +84,11 @@ green_equilibration_lavg(read_only image2d_t in, write_only image2d_t out, const
 
   if(x >= width || y >= height) return;
 
-  const int c = FC(y + r_y, x + r_x, filters);
+  const int c = FC(y, x, filters);
   const float maximum = 1.0f;
   float o = buffer[0];
 
-  if(c == 1 && ((y + r_y) & 1))
+  if(c == 1 && (y & 1))
   {
     const float o1_1 = buffer[-1 * stride - 1];
     const float o1_2 = buffer[-1 * stride + 1];
@@ -112,8 +117,12 @@ green_equilibration_lavg(read_only image2d_t in, write_only image2d_t out, const
 
 
 kernel void
-green_equilibration_favg_reduce_first(read_only image2d_t in, const int width, const int height,
-                                      global float2 *accu, const unsigned int filters, const int r_x, const int r_y, local float2 *buffer)
+green_equilibration_favg_reduce_first(read_only image2d_t in,
+                                      const int width,
+                                      const int height,
+                                      global float2 *accu,
+                                      const unsigned int filters,
+                                      local float2 *buffer)
 {
   const int x = get_global_id(0);
   const int y = get_global_id(1);
@@ -124,11 +133,11 @@ green_equilibration_favg_reduce_first(read_only image2d_t in, const int width, c
 
   const int l = mad24(ylid, xlsz, xlid);
 
-  const int c = FC(y + r_y, x + r_x, filters);
+  const int c = FC(y, x, filters);
 
   const int isinimage = (x < 2 * (width / 2) && y < 2 * (height / 2));
-  const int isgreen1 = (c == 1 && !((y + r_y) & 1));
-  const int isgreen2 = (c == 1 && ((y + r_y) & 1));
+  const int isgreen1 = (c == 1 && !(y & 1));
+  const int isgreen2 = (c == 1 && (y & 1));
 
   float pixel = read_imagef(in, sampleri, (int2)(x, y)).x;
 
@@ -194,8 +203,12 @@ green_equilibration_favg_reduce_second(const global float2* input, global float2
 
 
 kernel void
-green_equilibration_favg_apply(read_only image2d_t in, write_only image2d_t out, const int width, const int height, const unsigned int filters,
-                               const int r_x, const int r_y, const float gr_ratio)
+green_equilibration_favg_apply(read_only image2d_t in,
+                               write_only image2d_t out,
+                               const int width,
+                               const int height,
+                               const unsigned int filters,
+                               const float gr_ratio)
 {
   const int x = get_global_id(0);
   const int y = get_global_id(1);
@@ -204,9 +217,9 @@ green_equilibration_favg_apply(read_only image2d_t in, write_only image2d_t out,
 
   float pixel = read_imagef(in, sampleri, (int2)(x, y)).x;
 
-  const int c = FC(y + r_y, x + r_x, filters);
+  const int c = FC(y, x, filters);
 
-  const int isgreen1 = (c == 1 && !((y + r_y) & 1));
+  const int isgreen1 = (c == 1 && !(y & 1));
 
   pixel *= (isgreen1 ? gr_ratio : 1.0f);
 
@@ -461,8 +474,14 @@ clip_and_zoom(read_only image2d_t in, write_only image2d_t out, const int width,
  * resamping is done via rank-1 lattices and demosaicing using half-size interpolation.
  */
 __kernel void
-clip_and_zoom_demosaic_half_size(__read_only image2d_t in, __write_only image2d_t out, const int width, const int height,
-    const int r_x, const int r_y, const int rin_wd, const int rin_ht, const float r_scale, const unsigned int filters)
+clip_and_zoom_demosaic_half_size(__read_only image2d_t in,
+                                 __write_only image2d_t out,
+                                 const int width,
+                                 const int height,
+                                 const int rin_wd,
+                                 const int rin_ht,
+                                 const float r_scale,
+                                 const unsigned int filters)
 {
   // global id is pixel in output image (float4)
   const int x = get_global_id(0);
@@ -490,7 +509,7 @@ clip_and_zoom_demosaic_half_size(__read_only image2d_t in, __write_only image2d_
 
 
   // upper left corner:
-  const float2 f = (float2)((x + r_x) * px_footprint, (y + r_y) * px_footprint);
+  const float2 f = (float2)(x * px_footprint, y * px_footprint);
   int2 p = (int2)((int)f.x & ~1, (int)f.y & ~1);
   const float2 d = (float2)((f.x - p.x)/2.0f, (f.y - p.y)/2.0f);
 
@@ -504,14 +523,14 @@ clip_and_zoom_demosaic_half_size(__read_only image2d_t in, __write_only image2d_
 
     if(xx + 1 >= rin_wd || yy + 1 >= rin_ht) continue;
 
-    float xfilter = (i == 0) ? 1.0f - d.x : ((i == samples+1) ? d.x : 1.0f);
-    float yfilter = (j == 0) ? 1.0f - d.y : ((j == samples+1) ? d.y : 1.0f);
+    const float xfilter = (i == 0) ? 1.0f - d.x : ((i == samples+1) ? d.x : 1.0f);
+    const float yfilter = (j == 0) ? 1.0f - d.y : ((j == samples+1) ? d.y : 1.0f);
 
     // get four mosaic pattern uint16:
-    float p1 = read_imagef(in, sampleri, (int2)(xx,   yy  )).x;
-    float p2 = read_imagef(in, sampleri, (int2)(xx+1, yy  )).x;
-    float p3 = read_imagef(in, sampleri, (int2)(xx,   yy+1)).x;
-    float p4 = read_imagef(in, sampleri, (int2)(xx+1, yy+1)).x;
+    const float p1 = read_imagef(in, sampleri, (int2)(xx,   yy  )).x;
+    const float p2 = read_imagef(in, sampleri, (int2)(xx+1, yy  )).x;
+    const float p3 = read_imagef(in, sampleri, (int2)(xx,   yy+1)).x;
+    const float p4 = read_imagef(in, sampleri, (int2)(xx+1, yy+1)).x;
     color += yfilter*xfilter*(float4)(p1, (p2+p3)*0.5f, p4, 0.0f);
     weight += yfilter*xfilter;
   }
@@ -679,7 +698,7 @@ ppg_demosaic_redblue (read_only image2d_t in, write_only image2d_t out, const in
   float4 color = buffer[0];
   if(x == 0 || y == 0 || x == (width-1) || y == (height-1))
   {
-    write_imagef (out, (int2)(x, y), fmax(color, 0.0f));  
+    write_imagef (out, (int2)(x, y), fmax(color, 0.0f));
     return;
   }
 

data/kernels/demosaic_rcd.cl

@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2020-2024 darktable developers.
+    Copyright (C) 2020-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -542,3 +542,33 @@ kernel void rcd_border_redblue(read_only image2d_t in, write_only image2d_t out,
   write_imagef (out, (int2)(x, y), fmax(color, 0.0f));
 }
 
+kernel void demosaic_box3(read_only image2d_t in,
+                          write_only image2d_t out,
+                          const int width,
+                          const int height,
+                          const int sx,
+                          const int sy,
+                          const unsigned int filters,
+                          global const unsigned char (*const xtrans)[6])
+{
+  const int col = get_global_id(0);
+  const int row = get_global_id(1);
+  if(col >= width || row >= height) return;
+  float sum[3] = { 0.0f, 0.0f, 0.0f };
+  float cnt[3] = { 0.0f, 0.0f, 0.0f };
+  for(int y = row-1; y < row+2; y++)
+  {
+    for(int x = col-1; x < col+2; x++)
+    {
+      if(x >= 0 && y >= 0 && x < width && y < height)
+      {
+        const int color = (filters == 9u) ? FCxtrans(y+sy, x+sx, xtrans) : FC(y, x, filters);
+        sum[color] += fmax(0.0f, read_imagef(in, samplerA, (int2)(x, y)).x);
+        cnt[color] += 1.0f;
+      }
+    }
+  }
+  const float4 rgb = { sum[0]/fmax(1.0f, cnt[0]), sum[1]/fmax(1.0f, cnt[1]), sum[2]/fmax(1.0f, cnt[2]), 0.0f};
+  write_imagef(out, (int2)(col, row), rgb);
+}
+