openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-06-08 22:17:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1067 from OpenShot/mask-fixes

Browse Source 
Cap Mask contrast factor at maximum contrast
This commit is contained in:
Jonathan Thomas
2026-05-03 23:38:18 -05:00
committed by GitHub
parent 117012e7f5 ce560f105e
commit 235a5c8491
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/effects/Mask.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ std::shared_ptr<openshot::Frame> Mask::GetFrame(std::shared_ptr<openshot::Frame>
double brightness_value = brightness.GetValue(frame_number);
int brightness_adj = static_cast<int>(255 * brightness_value);
float contrast_factor = 20.0f / std::max(0.00001f, 20.0f - static_cast<float>(contrast_value));
float contrast_factor = 20.0f / std::max(0.5f, 20.0f - static_cast<float>(contrast_value));
const bool output_mask = replace_image;
const auto clamp_u8 = [](int value) -> unsigned char {
if (value < 0) return 0;
tests/Mask.cpp
+20
View File
@@ -103,6 +103,26 @@ TEST_CASE("Mask replace_image emits grayscale values", "[effect][mask_effect][re
CHECK(px1.alpha() == px1.red());
}
TEST_CASE("Mask maximum contrast keeps a narrow transition band", "[effect][mask_effect][contrast]") {
auto frame = std::make_shared<Frame>(1, 3, 1, "#000000");
auto image = frame->GetImage();
image->setPixelColor(0, 0, QColor(255, 0, 0, 255));
image->setPixelColor(1, 0, QColor(255, 0, 0, 255));
image->setPixelColor(2, 0, QColor(255, 0, 0, 255));
const std::string mask_path = create_mask_png({128, 129, 134});
Mask mask;
mask.Reader(new QtImageReader(mask_path));
mask.brightness = Keyframe(0.0);
mask.contrast = Keyframe(20.0);
auto out = mask.GetFrame(frame, 1);
CHECK(out->GetImage()->pixelColor(0, 0).alpha() == 127);
CHECK(out->GetImage()->pixelColor(1, 0).alpha() == 87);
CHECK(out->GetImage()->pixelColor(2, 0).alpha() == 0);
}
TEST_CASE("Mask accepts legacy reader json field", "[effect][mask_effect][json]") {
const std::string mask_path = create_mask_png({128});
QtImageReader reader(mask_path);