diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index 91153c8f..789ab25c 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -235,7 +235,7 @@ std::shared_ptr CacheDisk::GetFrame(int64_t frame_number)
image->load(frame_path);
// Set pixel formatimage->
- image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888)));
+ image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_ARGB32_Premultiplied)));
// Create frame object
std::shared_ptr frame(new Frame());
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 0b9ef740..d336654a 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -1363,7 +1363,7 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) {
scale_mode = SWS_BICUBIC;
}
SwsContext *img_convert_ctx = sws_getContext(info.width, info.height, AV_GET_CODEC_PIXEL_FORMAT(pStream, pCodecCtx), width,
- height, PIX_FMT_RGBA, scale_mode, NULL, NULL, NULL);
+ height, AV_PIX_FMT_RGB32, scale_mode, NULL, NULL, NULL);
// Resize / Convert to RGB
sws_scale(img_convert_ctx, my_frame->data, my_frame->linesize, 0,
@@ -1373,7 +1373,7 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) {
std::shared_ptr f = CreateFrame(current_frame);
// Add Image data to frame
- f->AddImage(width, height, 4, QImage::Format_RGBA8888, buffer);
+ f->AddImage(width, height, 4, QImage::Format_ARGB32_Premultiplied, buffer);
// Update working cache
working_cache.Add(f);
diff --git a/src/Frame.cpp b/src/Frame.cpp
index 483df768..80519292 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -231,7 +231,7 @@ std::shared_ptr Frame::GetWaveform(int width, int height, int Red, int G
}
// Create blank image
- wave_image = std::shared_ptr(new QImage(total_width, total_height, QImage::Format_RGBA8888));
+ wave_image = std::shared_ptr(new QImage(total_width, total_height, QImage::Format_ARGB32_Premultiplied));
wave_image->fill(QColor(0,0,0,0));
// Load QPainter with wave_image device
@@ -262,7 +262,7 @@ std::shared_ptr Frame::GetWaveform(int width, int height, int Red, int G
else
{
// No audio samples present
- wave_image = std::shared_ptr(new QImage(width, height, QImage::Format_RGBA8888));
+ wave_image = std::shared_ptr(new QImage(width, height, QImage::Format_ARGB32_Premultiplied));
wave_image->fill(QColor(QString::fromStdString("#000000")));
}
@@ -618,7 +618,7 @@ void Frame::Thumbnail(std::string path, int new_width, int new_height, std::stri
std::string background_color, bool ignore_aspect, std::string format, int quality, float rotate) {
// Create blank thumbnail image & fill background color
- std::shared_ptr thumbnail = std::shared_ptr(new QImage(new_width, new_height, QImage::Format_RGBA8888));
+ std::shared_ptr thumbnail = std::shared_ptr(new QImage(new_width, new_height, QImage::Format_ARGB32_Premultiplied));
thumbnail->fill(QColor(QString::fromStdString(background_color)));
// Create painter
@@ -673,7 +673,7 @@ void Frame::Thumbnail(std::string path, int new_width, int new_height, std::stri
overlay->load(QString::fromStdString(overlay_path));
// Set pixel format
- overlay = std::shared_ptr(new QImage(overlay->convertToFormat(QImage::Format_RGBA8888)));
+ overlay = std::shared_ptr(new QImage(overlay->convertToFormat(QImage::Format_ARGB32_Premultiplied)));
// Resize to fit
overlay = std::shared_ptr(new QImage(overlay->scaled(new_width, new_height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)));
@@ -691,7 +691,7 @@ void Frame::Thumbnail(std::string path, int new_width, int new_height, std::stri
mask->load(QString::fromStdString(mask_path));
// Set pixel format
- mask = std::shared_ptr(new QImage(mask->convertToFormat(QImage::Format_RGBA8888)));
+ mask = std::shared_ptr(new QImage(mask->convertToFormat(QImage::Format_ARGB32_Premultiplied)));
// Resize to fit
mask = std::shared_ptr(new QImage(mask->scaled(new_width, new_height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation)));
@@ -747,7 +747,7 @@ void Frame::AddColor(int new_width, int new_height, std::string new_color)
const GenericScopedLock lock(addingImageSection);
#pragma omp critical (AddImage)
{
- image = std::shared_ptr(new QImage(new_width, new_height, QImage::Format_RGBA8888));
+ image = std::shared_ptr(new QImage(new_width, new_height, QImage::Format_ARGB32_Premultiplied));
// Fill with solid color
image->fill(QColor(QString::fromStdString(color)));
@@ -775,8 +775,8 @@ void Frame::AddImage(int new_width, int new_height, int bytes_per_pixel, QImage:
image = std::shared_ptr(new QImage(qbuffer, new_width, new_height, new_width * bytes_per_pixel, type, (QImageCleanupFunction) &openshot::Frame::cleanUpBuffer, (void*) qbuffer));
// Always convert to RGBA8888 (if different)
- if (image->format() != QImage::Format_RGBA8888)
- *image = image->convertToFormat(QImage::Format_RGBA8888);
+ if (image->format() != QImage::Format_ARGB32_Premultiplied)
+ *image = image->convertToFormat(QImage::Format_ARGB32_Premultiplied);
// Update height and width
width = image->width();
@@ -798,9 +798,9 @@ void Frame::AddImage(std::shared_ptr new_image)
{
image = new_image;
- // Always convert to RGBA8888 (if different)
- if (image->format() != QImage::Format_RGBA8888)
- *image = image->convertToFormat(QImage::Format_RGBA8888);
+ // Always convert to Format_ARGB32_Premultiplied (if different)
+ if (image->format() != QImage::Format_ARGB32_Premultiplied)
+ *image = image->convertToFormat(QImage::Format_ARGB32_Premultiplied);
// Update height and width
width = image->width();
@@ -830,8 +830,8 @@ void Frame::AddImage(std::shared_ptr new_image, bool only_odd_lines)
if (image == new_image || image->size() != new_image->size()) {
ret = true;
}
- else if (new_image->format() != image->format()) {
- new_image = std::shared_ptr(new QImage(new_image->convertToFormat(image->format())));
+ else if (new_image->format() != QImage::Format_ARGB32_Premultiplied) {
+ new_image = std::shared_ptr(new QImage(new_image->convertToFormat(QImage::Format_ARGB32_Premultiplied)));
}
}
if (ret) {
@@ -970,7 +970,7 @@ void Frame::AddMagickImage(std::shared_ptr new_image)
MagickCore::ExportImagePixels(new_image->constImage(), 0, 0, new_image->columns(), new_image->rows(), "RGBA", Magick::CharPixel, buffer, &exception);
// Create QImage of frame data
- image = std::shared_ptr(new QImage(qbuffer, width, height, width * BPP, QImage::Format_RGBA8888, (QImageCleanupFunction) &cleanUpBuffer, (void*) qbuffer));
+ image = std::shared_ptr(new QImage(qbuffer, width, height, width * BPP, QImage::Format_ARGB32_Premultiplied, (QImageCleanupFunction) &cleanUpBuffer, (void*) qbuffer));
// Update height and width
width = image->width();
diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
index 6b502fbd..776fb142 100644
--- a/src/QtHtmlReader.cpp
+++ b/src/QtHtmlReader.cpp
@@ -62,7 +62,7 @@ void QtHtmlReader::Open()
if (!is_open)
{
// create image
- image = std::shared_ptr(new QImage(width, height, QImage::Format_RGBA8888));
+ image = std::shared_ptr(new QImage(width, height, QImage::Format_ARGB32_Premultiplied));
image->fill(QColor(background_color.c_str()));
//start painting
diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
index 725d8818..0f3e789b 100644
--- a/src/QtImageReader.cpp
+++ b/src/QtImageReader.cpp
@@ -104,9 +104,6 @@ void QtImageReader::Open()
throw InvalidFile("File could not be opened.", path.toStdString());
}
- // Convert to proper format
- image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888)));
-
// Update image properties
info.has_audio = false;
info.has_video = true;
@@ -257,8 +254,6 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame)
cached_image = std::shared_ptr(new QImage(image->scaled(max_width, max_height, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
}
- cached_image = std::shared_ptr(new QImage(cached_image->convertToFormat(QImage::Format_RGBA8888)));
-
// Set max size (to later determine if max_size is changed)
max_size.setWidth(max_width);
max_size.setHeight(max_height);
diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp
index d91d164e..9a048feb 100644
--- a/src/QtTextReader.cpp
+++ b/src/QtTextReader.cpp
@@ -67,7 +67,7 @@ void QtTextReader::Open()
if (!is_open)
{
// create image
- image = std::shared_ptr(new QImage(width, height, QImage::Format_RGBA8888));
+ image = std::shared_ptr(new QImage(width, height, QImage::Format_ARGB32_Premultiplied));
image->fill(QColor(background_color.c_str()));
QPainter painter;
diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp
index 3f9aac34..14064a71 100644
--- a/src/effects/Bars.cpp
+++ b/src/effects/Bars.cpp
@@ -68,7 +68,7 @@ std::shared_ptr Bars::GetFrame(std::shared_ptr frame, int64_t fram
std::shared_ptr frame_image = frame->GetImage();
// Get bar color (and create small color image)
- std::shared_ptr tempColor = std::shared_ptr(new QImage(frame_image->width(), 1, QImage::Format_RGBA8888));
+ std::shared_ptr tempColor = std::shared_ptr(new QImage(frame_image->width(), 1, QImage::Format_ARGB32_Premultiplied));
tempColor->fill(QColor(QString::fromStdString(color.GetColorHex(frame_number))));
// Get current keyframe values
diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp
index b1c3d38d..5ef7f7e6 100644
--- a/src/effects/Crop.cpp
+++ b/src/effects/Crop.cpp
@@ -68,7 +68,7 @@ std::shared_ptr Crop::GetFrame(std::shared_ptr frame, int64_t fram
std::shared_ptr frame_image = frame->GetImage();
// Get transparent color (and create small transparent image)
- std::shared_ptr tempColor = std::shared_ptr(new QImage(frame_image->width(), 1, QImage::Format_RGBA8888));
+ std::shared_ptr tempColor = std::shared_ptr(new QImage(frame_image->width(), 1, QImage::Format_ARGB32_Premultiplied));
tempColor->fill(QColor(QString::fromStdString("transparent")));
// Get current keyframe values
diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp
index 39b3316a..c9b8e17e 100644
--- a/src/effects/Deinterlace.cpp
+++ b/src/effects/Deinterlace.cpp
@@ -73,7 +73,7 @@ std::shared_ptr Deinterlace::GetFrame(std::shared_ptr frame, int64
const unsigned char* pixels = image->bits();
// Create a smaller, new image
- QImage deinterlaced_image(image->width(), image->height() / 2, QImage::Format_RGBA8888);
+ QImage deinterlaced_image(image->width(), image->height() / 2, QImage::Format_ARGB32_Premultiplied);
const unsigned char* deinterlaced_pixels = deinterlaced_image.bits();
// Loop through the scanlines of the image (even or odd)