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

Move critical sections to prevent crash on Windows

Browse Source
This commit is contained in:
Jonathan Thomas
2018-06-06 06:31:46 -05:00
parent d0b5ae52be
commit ace89efa59
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/effects/Mask.cpp
View File

@@ -59,29 +59,35 @@ void Mask::init_effect_details()
// This method is required for all derived classes of EffectBase, and returns a
// modified openshot::Frame object
std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number)
{
std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number) {
// Get the mask image (from the mask reader)
std::shared_ptr<QImage> frame_image = frame->GetImage();
// Check if mask reader is open
if (reader && !reader->IsOpen())
#pragma omp critical (open_mask_reader)
reader->Open();
#pragma omp critical (open_mask_reader)
{
if (reader && !reader->IsOpen())
reader->Open();
}
// No reader (bail on applying the mask)
if (!reader)
return frame;
// Get mask image (if missing or different size than frame image)
if (!original_mask || !reader->info.has_single_image || (original_mask && original_mask->size() != frame_image->size())) {
#pragma omp critical (open_mask_reader)
{
#pragma omp critical (open_mask_reader)
{
if (!original_mask || !reader->info.has_single_image ||
(original_mask && original_mask->size() != frame_image->size())) {
// Only get mask if needed
std::shared_ptr<QImage> mask_without_sizing = std::shared_ptr<QImage>(new QImage(*reader->GetFrame(frame_number)->GetImage()));
std::shared_ptr<QImage> mask_without_sizing = std::shared_ptr<QImage>(
new QImage(*reader->GetFrame(frame_number)->GetImage()));
// Resize mask image to match frame size
original_mask = std::shared_ptr<QImage>(new QImage(mask_without_sizing->scaled(frame_image->width(), frame_image->height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation)));
original_mask = std::shared_ptr<QImage>(new QImage(
mask_without_sizing->scaled(frame_image->width(), frame_image->height(), Qt::IgnoreAspectRatio,
Qt::SmoothTransformation)));
}
}