openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some additional cpp_test complaints

Browse Source
This commit is contained in:
Jonathan Thomas
2020-10-16 18:22:42 -05:00
parent f4d0d9d7bb
commit 29107bc427
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Clip.cpp
View File

@@ -1162,7 +1162,6 @@ void Clip::apply_keyframes(std::shared_ptr<Frame> frame, int width, int height)
pixels[byte_index + 2] *= alpha_value;
pixels[byte_index + 3] *= alpha_value;
}
pixels = NULL;
// Debug output
ZmqLogger::Instance()->AppendDebugMethod("Clip::apply_keyframes (Set Alpha & Opacity)", "alpha_value", alpha_value, "frame->number", frame->number);

2
src/Timeline.cpp
View File

@@ -492,7 +492,7 @@ void Timeline::add_layer(std::shared_ptr<Frame> new_frame, Clip* source_clip, in
/* Apply effects to the source frame (if any). If multiple clips are overlapping, only process the
* effects on the top clip. */
if (is_top_clip && source_frame) {
if (is_top_clip) {
#pragma omp critical (T_addLayer)
source_frame = apply_effects(source_frame, timeline_frame_number, source_clip->Layer());
}

18
src/effects/Mask.cpp
View File

@@ -102,12 +102,6 @@ std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
unsigned char *pixels = (unsigned char *) frame_image->bits();
unsigned char *mask_pixels = (unsigned char *) original_mask->bits();
int R = 0;
int G = 0;
int B = 0;
int A = 0;
int gray_value = 0;
float factor = 0.0;
double contrast_value = (contrast.GetValue(frame_number));
double brightness_value = (brightness.GetValue(frame_number));
@@ -115,16 +109,16 @@ std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
for (int pixel = 0, byte_index=0; pixel < original_mask->width() * original_mask->height(); pixel++, byte_index+=4)
{
// Get the RGB values from the pixel
R = mask_pixels[byte_index];
G = mask_pixels[byte_index + 1];
B = mask_pixels[byte_index + 2];
A = mask_pixels[byte_index + 3];
int R = mask_pixels[byte_index];
int G = mask_pixels[byte_index + 1];
int B = mask_pixels[byte_index + 2];
int A = mask_pixels[byte_index + 3];
// Get the average luminosity
gray_value = qGray(R, G, B);
int gray_value = qGray(R, G, B);
// Adjust the contrast
factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value));
float factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value));
gray_value = constrain((factor * (gray_value - 128)) + 128);
// Adjust the brightness