Skip to content

Faster blur for sharpness #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Faster blur for sharpness #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f6fa8a
Added ModificationMessage to blur slider to update every time it is m…
HiCamino Nov 22, 2024
414e6b6
Another attempt at "live" update for Sharpness.
HiCamino Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 41 additions & 21 deletions addons/AddOns/Sharpness/Sharpness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
#include "Selection.h"
#include "Sharpness.h"


#include <stdio.h>

#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "AddOns_Sharpness"

Expand Down Expand Up @@ -104,7 +107,7 @@ SharpnessManipulator::ManipulateBitmap(

delete blurred_image;
blurred_image = DuplicateBitmap(source_bitmap, 0);
ipLibrary->gaussian_blur(blurred_image, BLUR_AMOUNT);
ipLibrary->fast_gaussian_blur(blurred_image, BLUR_AMOUNT, 1);
// CalculateLuminanceImage(source_bitmap);

start_threads();
Expand Down Expand Up @@ -136,19 +139,20 @@ SharpnessManipulator::PreviewBitmap(bool full_quality, BRegion* updated_region)
if (full_quality)
last_calculated_resolution = min_c(1, last_calculated_resolution);

previous_settings = settings;
//previous_settings = settings;

if (last_calculated_resolution > 0) {
current_resolution = last_calculated_resolution;
updated_region->Set(preview_bitmap->Bounds());

target_bitmap = preview_bitmap;
source_bitmap = copy_of_the_preview_bitmap;
current_settings = settings;

start_threads();
}

previous_settings = settings;

return last_calculated_resolution;
}

Expand Down Expand Up @@ -192,14 +196,28 @@ SharpnessManipulator::thread_function(int32 thread_number)
// which in this case is the luminance image. The luminance image
// is in bitmap blurred_image, which is in B_CMAP8 color-space.

if (current_settings.sharpness == previous_settings.sharpness)
{
int32 blur_size = source_bitmap->Bounds().Width() * current_settings.blur_size / 1000;
if (blur_size < 1)
blur_size = 1;
BBitmap* tmp_bitmap = DuplicateBitmap(copy_of_the_preview_bitmap, 0);
ipLibrary->fast_gaussian_blur(tmp_bitmap, blur_size,
processor_count, current_resolution);
int32* d_bits = (int32*)blurred_image->Bits();
int32* s_bits = (int32*)tmp_bitmap->Bits();
int32 bits_length = tmp_bitmap->BitsLength();
memcpy(d_bits, s_bits, bits_length);
delete tmp_bitmap;
}

int32 step = current_resolution;
float sharpness_coeff = current_settings.sharpness / 100.0;

BWindow* progress_bar_window = NULL;
if (progress_bar != NULL)
progress_bar_window = progress_bar->Window();


uint32* source_bits = (uint32*)source_bitmap->Bits();
uint32* target_bits = (uint32*)target_bitmap->Bits();
int32 source_bpr = source_bitmap->BytesPerRow() / 4;
Expand Down Expand Up @@ -329,7 +347,7 @@ SharpnessManipulator::SetPreviewBitmap(BBitmap* bm)
preview_bitmap = bm;
copy_of_the_preview_bitmap = DuplicateBitmap(bm, 0);
blurred_image = DuplicateBitmap(preview_bitmap, 0);
ipLibrary->gaussian_blur(blurred_image, settings.blur_size, processor_count);
ipLibrary->fast_gaussian_blur(blurred_image, settings.blur_size, processor_count);
} else {
preview_bitmap = NULL;
copy_of_the_preview_bitmap = NULL;
Expand All @@ -340,15 +358,15 @@ SharpnessManipulator::SetPreviewBitmap(BBitmap* bm)
if (preview_bitmap != NULL) {
// Let's select a resolution that can handle all the pixels at least
// 10 times in a second while assuming that one pixel calculation takes
// about 50 CPU cycles.
double speed = GetSystemClockSpeed() / (10 * 50);
// about 250 CPU cycles.
double speed = GetSystemClockSpeed() / (10 * 250);
BRect bounds = preview_bitmap->Bounds();
float num_pixels = (bounds.Width() + 1) * (bounds.Height() + 1);
lowest_available_quality = 1;
while ((num_pixels / lowest_available_quality / lowest_available_quality) > speed)
while ((num_pixels / lowest_available_quality) > speed)
lowest_available_quality *= 2;

lowest_available_quality = min_c(lowest_available_quality, 16);
lowest_available_quality = min_c(lowest_available_quality, 32);
highest_available_quality = max_c(lowest_available_quality / 2, 1);
} else {
lowest_available_quality = 1;
Expand Down Expand Up @@ -396,18 +414,8 @@ SharpnessManipulator::ChangeSettings(ManipulatorSettings* s)
{
SharpnessManipulatorSettings* new_settings;
new_settings = dynamic_cast<SharpnessManipulatorSettings*>(s);
if (new_settings != NULL) {
if (new_settings->blur_size != settings.blur_size) {
int32* d_bits = (int32*)blurred_image->Bits();
int32* s_bits = (int32*)copy_of_the_preview_bitmap->Bits();
int32 bits_length = blurred_image->BitsLength();

memcpy(d_bits, s_bits, bits_length);
ipLibrary->gaussian_blur(blurred_image, new_settings->blur_size, processor_count);
}

if (new_settings != NULL)
settings = *new_settings;
}
}


Expand Down Expand Up @@ -441,7 +449,8 @@ SharpnessManipulatorView::SharpnessManipulatorView(SharpnessManipulator* manip,
sharpness_slider->SetHashMarkCount(11);

blur_size_slider = new BSlider("blur_size_slider", B_TRANSLATE("Effect strength:"),
new BMessage(BLUR_ADJUSTING_FINISHED), 1, 50, B_HORIZONTAL, B_TRIANGLE_THUMB);
new BMessage(BLUR_ADJUSTING_FINISHED), 1, 100, B_HORIZONTAL, B_TRIANGLE_THUMB);
blur_size_slider->SetModificationMessage(new BMessage(BLUR_ADJUSTED));
blur_size_slider->SetLimitLabels(B_TRANSLATE("Low"), B_TRANSLATE("High"));
blur_size_slider->SetHashMarks(B_HASH_MARKS_BOTTOM);
blur_size_slider->SetHashMarkCount(11);
Expand All @@ -460,6 +469,7 @@ SharpnessManipulatorView::AttachedToWindow()
WindowGUIManipulatorView::AttachedToWindow();
sharpness_slider->SetTarget(BMessenger(this));
blur_size_slider->SetTarget(BMessenger(this));
blur_size_slider->SetSnoozeAmount(30000);
}


Expand Down Expand Up @@ -491,8 +501,18 @@ SharpnessManipulatorView::MessageReceived(BMessage* message)
manipulator->ChangeSettings(&settings);
target.SendMessage(HS_MANIPULATOR_ADJUSTING_FINISHED);
} break;
case BLUR_ADJUSTED:
{
settings.blur_size = blur_size_slider->Value();
manipulator->ChangeSettings(&settings);
if (!started_adjusting) {
target.SendMessage(HS_MANIPULATOR_ADJUSTING_STARTED);
started_adjusting = TRUE;
}
}
case BLUR_ADJUSTING_FINISHED:
{
started_adjusting = FALSE;
settings.blur_size = blur_size_slider->Value();
manipulator->ChangeSettings(&settings);
target.SendMessage(HS_MANIPULATOR_ADJUSTING_FINISHED);
Expand Down
1 change: 1 addition & 0 deletions addons/AddOns/Sharpness/Sharpness.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class SharpnessManipulator : public WindowGUIManipulator {
#define SHARPNESS_ADJUSTED 'Shad'
#define SHARPNESS_ADJUSTING_FINISHED 'Shaf'

#define BLUR_ADJUSTED 'Blad'
#define BLUR_ADJUSTING_FINISHED 'Blaf'


Expand Down
Loading