Skip to content

Commit c7b5d6f

Browse files
jenshannoschwalmTurboGit
jenshannoschwalm
authored and
TurboGit
committed
More verbose log related to picker data
No functional changes, some formatting for editor syntax / readability.
1 parent 70d07c2 commit c7b5d6f

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

‎src/develop/pixelpipe_cache.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,9 @@ gboolean dt_dev_pixelpipe_cache_get(dt_dev_pixelpipe_t *pipe,
307307
const dt_iop_buffer_dsc_t *cdsc = *dsc;
308308
dt_print_pipe(DT_DEBUG_PIPE, "cache HIT",
309309
pipe, module, DT_DEVICE_NONE, NULL, NULL,
310-
"%s, hash=%" PRIx64,
311-
dt_iop_colorspace_to_name(cdsc->cst), hash);
310+
"%s %.3f %.3f %.3f, hash=%" PRIx64,
311+
dt_iop_colorspace_to_name(cdsc->cst), cdsc->temperature.coeffs[0], cdsc->temperature.coeffs[1], cdsc->temperature.coeffs[2],
312+
hash);
312313
return FALSE;
313314
}
314315
// We need a fresh buffer as there was no hit.

‎src/develop/pixelpipe_hb.c‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,10 @@ static void _pixelpipe_picker(dt_iop_module_t *module,
888888
picker_source == PIXELPIPE_PICKER_INPUT
889889
? "pixelpipe IN picker"
890890
: "pixelpipe OUT picker",
891-
piece->pipe, module, DT_DEVICE_CPU, roi,
892-
NULL, " %s -> %s, %sbox %i/%i -- %i/%i",
891+
piece->pipe, module, DT_DEVICE_CPU, roi, NULL,
892+
"%s (%.3f %.3f %.3f) -> %s (%s), %sbox %i/%i -- %i/%i",
893+
dt_iop_colorspace_to_name(dsc->cst),
894+
dsc->temperature.coeffs[0], dsc->temperature.coeffs[1], dsc->temperature.coeffs[2],
893895
dt_iop_colorspace_to_name(image_cst),
894896
dt_iop_colorspace_to_name(dt_iop_color_picker_get_active_cst(module)),
895897
darktable.lib->proxy.colorpicker.primary_sample->denoise
@@ -980,7 +982,10 @@ static void _pixelpipe_picker_cl(const int devid,
980982
picker_source == PIXELPIPE_PICKER_INPUT
981983
? "pixelpipe IN picker CL"
982984
: "pixelpipe OUT picker CL",
983-
piece->pipe, module, devid, roi, NULL, " %s -> %s, %sbox %i/%i -- %i/%i",
985+
piece->pipe, module, devid, roi, NULL,
986+
"%s (%.3f %.3f %.3f) -> %s (%s), %sbox %i/%i -- %i/%i",
987+
dt_iop_colorspace_to_name(dsc->cst),
988+
dsc->temperature.coeffs[0], dsc->temperature.coeffs[1], dsc->temperature.coeffs[2],
984989
dt_iop_colorspace_to_name(image_cst),
985990
dt_iop_colorspace_to_name(dt_iop_color_picker_get_active_cst(module)),
986991
darktable.lib->proxy.colorpicker.primary_sample->denoise
@@ -1070,13 +1075,13 @@ static void _pixelpipe_pick_samples(dt_develop_t *dev,
10701075
// padding, e.g. is equivalent to float[x*4], and that on failure
10711076
// it's OK not to touch output
10721077
int converted_cst;
1073-
dt_ioppr_transform_image_colorspace(module, sample->display[0], sample->lab[0],
1074-
3, 1, IOP_CS_RGB, IOP_CS_LAB,
1075-
&converted_cst, display_profile);
1078+
dt_ioppr_transform_image_colorspace(module, sample->display[0], sample->lab[0], 3, 1,
1079+
IOP_CS_RGB, IOP_CS_LAB, &converted_cst,
1080+
display_profile);
10761081
if(display_profile && histogram_profile)
1077-
dt_ioppr_transform_image_colorspace_rgb
1078-
(sample->display[0], sample->scope[0], 3, 1,
1079-
display_profile, histogram_profile, "primary picker");
1082+
dt_ioppr_transform_image_colorspace_rgb(sample->display[0], sample->scope[0], 3, 1,
1083+
display_profile, histogram_profile,
1084+
"primary picker");
10801085
}
10811086
samples = g_slist_next(samples);
10821087
}
@@ -1284,9 +1289,10 @@ static gboolean _pixelpipe_process_on_CPU(dt_dev_pixelpipe_t *pipe,
12841289
}
12851290

12861291
// transform to module input colorspace
1287-
dt_ioppr_transform_image_colorspace
1288-
(module, input, input, roi_in->width, roi_in->height, cst_from,
1289-
cst_to, &input_format->cst, work_profile);
1292+
dt_ioppr_transform_image_colorspace(module, input, input,
1293+
roi_in->width, roi_in->height,
1294+
cst_from, cst_to, &input_format->cst,
1295+
work_profile);
12901296

12911297
if(dt_pipe_shutdown(pipe))
12921298
return TRUE;
@@ -1470,7 +1476,8 @@ static gboolean _pixelpipe_process_on_CPU(dt_dev_pixelpipe_t *pipe,
14701476
// blend needs input/output images with default colorspace
14711477
if(_transform_for_blend(module, piece))
14721478
{
1473-
dt_ioppr_transform_image_colorspace(module, input, input, roi_in->width, roi_in->height,
1479+
dt_ioppr_transform_image_colorspace(module, input, input,
1480+
roi_in->width, roi_in->height,
14741481
input_format->cst, blend_cst, &input_format->cst,
14751482
work_profile);
14761483
dt_ioppr_transform_image_colorspace(module, *output, *output,
@@ -2029,14 +2036,11 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
20292036
dt_iop_colorspace_to_name(cst_to),
20302037
work_profile ? dt_colorspaces_get_name(work_profile->type, work_profile->filename) : "no work profile");
20312038

2032-
success_opencl = dt_ioppr_transform_image_colorspace_cl
2033-
(module, pipe->devid,
2034-
cl_mem_input, cl_mem_input,
2035-
roi_in.width, roi_in.height,
2036-
input_cst_cl,
2037-
cst_to,
2038-
&input_cst_cl,
2039-
work_profile);
2039+
success_opencl = dt_ioppr_transform_image_colorspace_cl(module, pipe->devid,
2040+
cl_mem_input, cl_mem_input,
2041+
roi_in.width, roi_in.height,
2042+
input_cst_cl, cst_to, &input_cst_cl,
2043+
work_profile);
20402044
}
20412045

20422046
// histogram collection for module
@@ -2238,8 +2242,7 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
22382242
return TRUE;
22392243
}
22402244

2241-
dt_iop_colorspace_type_t blend_cst =
2242-
dt_develop_blend_colorspace(piece, pipe->dsc.cst);
2245+
const dt_iop_colorspace_type_t blend_cst = dt_develop_blend_colorspace(piece, pipe->dsc.cst);
22432246
const gboolean blend_picking = _request_color_pick(pipe, dev, module)
22442247
&& _transform_for_blend(module, piece)
22452248
&& blend_cst != cst_to;
@@ -2276,16 +2279,17 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
22762279
&& _transform_for_blend(module, piece))
22772280
{
22782281

2279-
success_opencl = dt_ioppr_transform_image_colorspace_cl
2280-
(module, pipe->devid, cl_mem_input, cl_mem_input,
2281-
roi_in.width, roi_in.height,
2282-
input_cst_cl, blend_cst, &input_cst_cl, work_profile);
2283-
2284-
success_opencl &= dt_ioppr_transform_image_colorspace_cl
2285-
(module, pipe->devid, *cl_mem_output, *cl_mem_output,
2286-
roi_out->width, roi_out->height,
2287-
pipe->dsc.cst, blend_cst, &pipe->dsc.cst, work_profile);
2288-
2282+
success_opencl = dt_ioppr_transform_image_colorspace_cl(module, pipe->devid,
2283+
cl_mem_input, cl_mem_input,
2284+
roi_in.width, roi_in.height,
2285+
input_cst_cl, blend_cst, &input_cst_cl,
2286+
work_profile);
2287+
2288+
success_opencl &= dt_ioppr_transform_image_colorspace_cl(module, pipe->devid,
2289+
*cl_mem_output, *cl_mem_output,
2290+
roi_out->width, roi_out->height,
2291+
pipe->dsc.cst, blend_cst, &pipe->dsc.cst,
2292+
work_profile);
22892293
if(success_opencl && blend_picking)
22902294
{
22912295
_pixelpipe_picker_cl(pipe->devid, module, piece, &piece->dsc_in,
@@ -2368,10 +2372,10 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
23682372
pipe, module, pipe->devid, &roi_in, NULL, "%s -> %s",
23692373
dt_iop_colorspace_to_name(cst_from),
23702374
dt_iop_colorspace_to_name(cst_to));
2371-
dt_ioppr_transform_image_colorspace
2372-
(module, input, input, roi_in.width, roi_in.height,
2373-
input_format->cst, cst_to,
2374-
&input_format->cst, work_profile);
2375+
dt_ioppr_transform_image_colorspace(module, input, input,
2376+
roi_in.width, roi_in.height,
2377+
input_format->cst, cst_to, &input_format->cst,
2378+
work_profile);
23752379
}
23762380

23772381
if(dt_pipe_shutdown(pipe))
@@ -2481,8 +2485,7 @@ static gboolean _dev_pixelpipe_process_rec(dt_dev_pixelpipe_t *pipe,
24812485
{
24822486
dt_ioppr_transform_image_colorspace(module, input, input,
24832487
roi_in.width, roi_in.height,
2484-
input_format->cst, blend_cst,
2485-
&input_format->cst,
2488+
input_format->cst, blend_cst, &input_format->cst,
24862489
work_profile);
24872490
dt_ioppr_transform_image_colorspace(module, *output, *output,
24882491
roi_out->width, roi_out->height,

‎src/iop/channelmixerrgb.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,16 +2030,14 @@ static void _set_trouble_messages(dt_iop_module_t *self)
20302030
const dt_image_t *img = &dev->image_storage;
20312031
dt_print_pipe(DT_DEBUG_PIPE, anyproblem ? "chroma trouble" : "chroma data",
20322032
NULL, self, DT_DEVICE_NONE, NULL, NULL,
2033-
"%s%s%sD65=%s. NOW %.3f %.3f %.3f, D65 %.3f %.3f %.3f, AS-SHOT %.3f %.3f %.3f File `%s' ID=%i",
2033+
"%s%s%sD65=%s. D65 %.3f %.3f %.3f, AS-SHOT %.3f %.3f %.3f File `%s' ID=%i",
20342034
problem1 ? "white balance applied twice, " : "",
20352035
problem2 ? "double CAT applied, " : "",
20362036
problem3 ? "white balance missing, " : "",
20372037
dt_dev_is_D65_chroma(dev) ? "YES" : "NO",
2038-
chr->wb_coeffs[0], chr->wb_coeffs[1], chr->wb_coeffs[2],
20392038
chr->D65coeffs[0], chr->D65coeffs[1], chr->D65coeffs[2],
20402039
chr->as_shot[0], chr->as_shot[1], chr->as_shot[2],
2041-
img->filename,
2042-
img->id);
2040+
img->filename, img->id);
20432041

20442042
if(problem2)
20452043
{

0 commit comments

Comments
 (0)