Revision fb2e489ace36782a23246a4b3fa6655375b1c23a authored by Ulrich Pegelow on 23 November 2012, 14:58:46 UTC, committed by Ulrich Pegelow on 23 November 2012, 14:58:46 UTC
they are heavily outdated. for the time being the english draft version must do.
1 parent 8ea5e74
velvia.c
/*
This file is part of darktable,
copyright (c) 2010 Henrik Andersson.
darktable is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
darktable is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with darktable. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <math.h>
#include <assert.h>
#include <string.h>
#ifdef HAVE_GEGL
#include <gegl.h>
#endif
#include "bauhaus/bauhaus.h"
#include "develop/develop.h"
#include "develop/imageop.h"
#include "common/opencl.h"
#include "control/control.h"
#include "gui/accelerators.h"
#include "gui/gtk.h"
#include <gtk/gtk.h>
#include <inttypes.h>
#include <xmmintrin.h>
// NaN-safe clip: NaN compares false and will result in 0.0
#define CLIP(x) (((x)>=0.0)?((x)<=1.0?(x):1.0):0.0)
DT_MODULE(2)
typedef struct dt_iop_velvia_params_t
{
float strength;
float bias;
}
dt_iop_velvia_params_t;
/* legacy version 1 params */
typedef struct dt_iop_velvia_params1_t
{
float saturation;
float vibrance;
float luminance;
float clarity;
}
dt_iop_velvia_params1_t;
typedef struct dt_iop_velvia_gui_data_t
{
GtkVBox *vbox;
GtkWidget *strength_scale;
GtkWidget *bias_scale;
}
dt_iop_velvia_gui_data_t;
typedef struct dt_iop_velvia_data_t
{
float strength;
float bias;
}
dt_iop_velvia_data_t;
typedef struct dt_iop_velvia_global_data_t
{
int kernel_velvia;
}
dt_iop_velvia_global_data_t;
const char *name()
{
return _("velvia");
}
int flags()
{
return IOP_FLAGS_INCLUDE_IN_STYLES | IOP_FLAGS_SUPPORTS_BLENDING | IOP_FLAGS_ALLOW_TILING;
}
int
groups ()
{
return IOP_GROUP_COLOR;
}
#if 0 // BAUHAUS doesnt support keyaccels yet...
void init_key_accels(dt_iop_module_so_t *self)
{
dt_accel_register_slider_iop(self, FALSE, NC_("accel", "vibrance"));
dt_accel_register_slider_iop(self, FALSE, NC_("accel", "mid-tones bias"));
}
void connect_key_accels(dt_iop_module_t *self)
{
dt_iop_velvia_gui_data_t *g = (dt_iop_velvia_gui_data_t*)self->gui_data;
dt_accel_connect_slider_iop(self, "vibrance",
GTK_WIDGET(g->strength_scale));
dt_accel_connect_slider_iop(self, "mid-tones bias",
GTK_WIDGET(g->bias_scale));
}
#endif
int
legacy_params (dt_iop_module_t *self, const void *const old_params, const int old_version, void *new_params, const int new_version)
{
if (old_version == 1 && new_version == 2)
{
const dt_iop_velvia_params1_t *old = old_params;
dt_iop_velvia_params_t *new = new_params;
new->strength = old->saturation*old->vibrance/100.0f;
new->bias = old->luminance;
return 0;
}
return 1;
}
void process (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, void *ivoid, void *ovoid, const dt_iop_roi_t *roi_in, const dt_iop_roi_t *roi_out)
{
dt_iop_velvia_data_t *data = (dt_iop_velvia_data_t *)piece->data;
float *in = (float *)ivoid;
float *out = (float *)ovoid;
const int ch = piece->colors;
const float strength = data->strength/100.0f;
// Apply velvia saturation
if(strength <= 0.0)
memcpy(out, in, sizeof(float)*ch*roi_out->width*roi_out->height);
else
{
#ifdef _OPENMP
#pragma omp parallel for default(none) shared(roi_out, in, out, data) schedule(static)
#endif
for(int k=0; k<roi_out->width*roi_out->height; k++)
{
float *inp = in + ch*k;
float *outp = out + ch*k;
// calculate vibrance, and apply boost velvia saturation at least saturated pixels
float pmax=fmaxf(inp[0],fmaxf(inp[1],inp[2])); // max value in RGB set
float pmin=fminf(inp[0],fminf(inp[1],inp[2])); // min value in RGB set
float plum = (pmax+pmin)/2.0f; // pixel luminocity
float psat =(plum<=0.5f) ? (pmax-pmin)/(1e-5f + pmax+pmin): (pmax-pmin)/(1e-5f + MAX(0.0f, 2.0f-pmax-pmin));
float pweight=CLAMPS(((1.0f- (1.5f*psat)) + ((1.0f+(fabsf(plum-0.5f)*2.0f))*(1.0f-data->bias))) / (1.0f+(1.0f-data->bias)), 0.0f, 1.0f); // The weight of pixel
float saturation = strength*pweight; // So lets calculate the final affection of filter on pixel
// Apply velvia saturation values
const __m128 inp_m = _mm_load_ps(inp);
const __m128 boost = _mm_set1_ps(saturation);
const __m128 min_m = _mm_set1_ps(0.0f);
const __m128 max_m = _mm_set1_ps(1.0f);
const __m128 inp_shuffled = _mm_mul_ps(_mm_add_ps(_mm_shuffle_ps(inp_m,inp_m,_MM_SHUFFLE(3,0,2,1)),_mm_shuffle_ps(inp_m,inp_m,_MM_SHUFFLE(3,1,0,2))),_mm_set1_ps(0.5f));
_mm_stream_ps( outp, _mm_min_ps(max_m,_mm_max_ps(min_m, _mm_add_ps(inp_m, _mm_mul_ps(boost,_mm_sub_ps(inp_m,inp_shuffled))))));
// equivalent to:
/*
outp[0]=CLAMPS(inp[0] + saturation*(inp[0]-0.5f*(inp[1]+inp[2])), 0.0f, 1.0f);
outp[1]=CLAMPS(inp[1] + saturation*(inp[1]-0.5f*(inp[2]+inp[0])), 0.0f, 1.0f);
outp[2]=CLAMPS(inp[2] + saturation*(inp[2]-0.5f*(inp[0]+inp[1])), 0.0f, 1.0f);
*/
}
}
_mm_sfence();
if(piece->pipe->mask_display)
dt_iop_alpha_copy(ivoid, ovoid, roi_out->width, roi_out->height);
}
#ifdef HAVE_OPENCL
int
process_cl (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, cl_mem dev_in, cl_mem dev_out, const dt_iop_roi_t *roi_in, const dt_iop_roi_t *roi_out)
{
dt_iop_velvia_data_t *data = (dt_iop_velvia_data_t *)piece->data;
dt_iop_velvia_global_data_t *gd = (dt_iop_velvia_global_data_t *)self->data;
cl_int err = -999;
const int devid = piece->pipe->devid;
const int width = roi_in->width;
const int height = roi_in->height;
const float strength = data->strength/100.0f;
const float bias = data->bias;
size_t sizes[] = { ROUNDUPWD(width), ROUNDUPHT(height), 1};
if(strength <= 0.0f)
{
size_t origin[] = {0, 0, 0};
size_t region[] = {width, height, 1};
err = dt_opencl_enqueue_copy_image(devid, dev_in, dev_out, origin, origin, region);
if (err != CL_SUCCESS) goto error;
}
else
{
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 0, sizeof(cl_mem), (void *)&dev_in);
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 1, sizeof(cl_mem), (void *)&dev_out);
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 2, sizeof(int), (void *)&width);
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 3, sizeof(int), (void *)&height);
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 4, sizeof(float), (void *)&strength);
dt_opencl_set_kernel_arg(devid, gd->kernel_velvia, 5, sizeof(float), (void *)&bias);
err = dt_opencl_enqueue_kernel_2d(devid, gd->kernel_velvia, sizes);
if(err != CL_SUCCESS) goto error;
}
return TRUE;
error:
dt_print(DT_DEBUG_OPENCL, "[opencl_velvia] couldn't enqueue kernel! %d\n", err);
return FALSE;
}
#endif
void init_global(dt_iop_module_so_t *module)
{
const int program = 8; // extended.cl, from programs.conf
dt_iop_velvia_global_data_t *gd = (dt_iop_velvia_global_data_t *)malloc(sizeof(dt_iop_velvia_global_data_t));
module->data = gd;
gd->kernel_velvia = dt_opencl_create_kernel(program, "velvia");
}
void cleanup_global(dt_iop_module_so_t *module)
{
dt_iop_velvia_global_data_t *gd = (dt_iop_velvia_global_data_t *)module->data;
dt_opencl_free_kernel(gd->kernel_velvia);
free(module->data);
module->data = NULL;
}
static void
strength_callback (GtkWidget *slider, gpointer user_data)
{
dt_iop_module_t *self = (dt_iop_module_t *)user_data;
if(self->dt->gui->reset) return;
dt_iop_velvia_params_t *p = (dt_iop_velvia_params_t *)self->params;
p->strength = dt_bauhaus_slider_get(slider);
dt_dev_add_history_item(darktable.develop, self, TRUE);
}
static void
bias_callback (GtkWidget *slider, gpointer user_data)
{
dt_iop_module_t *self = (dt_iop_module_t *)user_data;
if(self->dt->gui->reset) return;
dt_iop_velvia_params_t *p = (dt_iop_velvia_params_t *)self->params;
p->bias= dt_bauhaus_slider_get(slider);
dt_dev_add_history_item(darktable.develop, self, TRUE);
}
void commit_params (struct dt_iop_module_t *self, dt_iop_params_t *p1, dt_dev_pixelpipe_t *pipe, dt_dev_pixelpipe_iop_t *piece)
{
dt_iop_velvia_params_t *p = (dt_iop_velvia_params_t *)p1;
#ifdef HAVE_GEGL
fprintf(stderr, "[velvia] TODO: implement gegl version!\n");
// pull in new params to gegl
#else
dt_iop_velvia_data_t *d = (dt_iop_velvia_data_t *)piece->data;
d->strength = p->strength;
d->bias = p->bias;
#endif
}
void init_pipe (struct dt_iop_module_t *self, dt_dev_pixelpipe_t *pipe, dt_dev_pixelpipe_iop_t *piece)
{
#ifdef HAVE_GEGL
// create part of the gegl pipeline
piece->data = NULL;
#else
piece->data = malloc(sizeof(dt_iop_velvia_data_t));
memset(piece->data,0,sizeof(dt_iop_velvia_data_t));
self->commit_params(self, self->default_params, pipe, piece);
#endif
}
void cleanup_pipe (struct dt_iop_module_t *self, dt_dev_pixelpipe_t *pipe, dt_dev_pixelpipe_iop_t *piece)
{
#ifdef HAVE_GEGL
// clean up everything again.
(void)gegl_node_remove_child(pipe->gegl, piece->input);
// no free necessary, no data is alloc'ed
#else
free(piece->data);
#endif
}
void gui_update(struct dt_iop_module_t *self)
{
dt_iop_module_t *module = (dt_iop_module_t *)self;
dt_iop_velvia_gui_data_t *g = (dt_iop_velvia_gui_data_t *)self->gui_data;
dt_iop_velvia_params_t *p = (dt_iop_velvia_params_t *)module->params;
dt_bauhaus_slider_set(g->strength_scale, p->strength);
dt_bauhaus_slider_set(g->bias_scale, p->bias);
}
void init(dt_iop_module_t *module)
{
module->params = malloc(sizeof(dt_iop_velvia_params_t));
module->default_params = malloc(sizeof(dt_iop_velvia_params_t));
module->default_enabled = 0;
module->priority = 865; // module order created by iop_dependencies.py, do not edit!
module->params_size = sizeof(dt_iop_velvia_params_t);
module->gui_data = NULL;
dt_iop_velvia_params_t tmp = (dt_iop_velvia_params_t)
{
25,1.0
};
memcpy(module->params, &tmp, sizeof(dt_iop_velvia_params_t));
memcpy(module->default_params, &tmp, sizeof(dt_iop_velvia_params_t));
}
void cleanup(dt_iop_module_t *module)
{
free(module->gui_data);
module->gui_data = NULL;
free(module->params);
module->params = NULL;
}
void gui_init(struct dt_iop_module_t *self)
{
self->gui_data = malloc(sizeof(dt_iop_velvia_gui_data_t));
dt_iop_velvia_gui_data_t *g = (dt_iop_velvia_gui_data_t *)self->gui_data;
dt_iop_velvia_params_t *p = (dt_iop_velvia_params_t *)self->params;
self->widget = gtk_vbox_new(FALSE, DT_BAUHAUS_SPACE);
/* strength */
g->strength_scale = dt_bauhaus_slider_new_with_range(self, 0.0, 100.0, 1, p->strength, 0);
dt_bauhaus_slider_set_format(g->strength_scale,"%.0f%%");
dt_bauhaus_widget_set_label(g->strength_scale,_("strength"));
g_object_set(G_OBJECT(g->strength_scale), "tooltip-text", _("the strength of saturation boost"), (char *)NULL);
g_signal_connect (G_OBJECT (g->strength_scale), "value-changed",
G_CALLBACK (strength_callback), self);
/* bias */
g->bias_scale = dt_bauhaus_slider_new_with_range(self, 0.0, 1.0, 0.01, p->bias, 2);
dt_bauhaus_widget_set_label(g->bias_scale,_("mid-tones bias"));
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(g->strength_scale), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(g->bias_scale), TRUE, TRUE, 0);
g_object_set(G_OBJECT(g->bias_scale), "tooltip-text", _("how much to spare highlights and shadows"), (char *)NULL);
g_signal_connect (G_OBJECT (g->bias_scale), "value-changed",
G_CALLBACK (bias_callback), self);
}
void gui_cleanup(struct dt_iop_module_t *self)
{
free(self->gui_data);
self->gui_data = NULL;
}
// modelines: These editor modelines have been set for all relevant files by tools/update_modelines.sh
// vim: shiftwidth=2 expandtab tabstop=2 cindent
// kate: tab-indents: off; indent-width 2; replace-tabs on; indent-mode cstyle; remove-trailing-space on;
Computing file changes ...