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

Merge pull request #771 from ferdnyc/move-magick-code

Browse Source 
Move ImageMagick code out of Frame class
This commit is contained in:
Jonathan Thomas
2021-11-11 14:15:21 -06:00
committed by GitHub
parent 0c1e9d0700 5ed6929a88
commit dec6b04442
15 changed files with 285 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@@ -70,9 +70,7 @@ set(OPENSHOT_SOURCES
FrameMapper.cpp
Json.cpp
KeyFrame.cpp
TrackedObjectBase.cpp
OpenShotVersion.cpp
ZmqLogger.cpp
PlayerBase.cpp
Point.cpp
Profiles.cpp
@@ -82,7 +80,10 @@ set(OPENSHOT_SOURCES
QtTextReader.cpp
Settings.cpp
TimelineBase.cpp
Timeline.cpp)
Timeline.cpp
TrackedObjectBase.cpp
ZmqLogger.cpp
)
# OpenCV related classes
set(OPENSHOT_CV_SOURCES
@@ -216,9 +217,11 @@ if (ENABLE_MAGICK)
# Add optional ImageMagic-dependent sources
target_sources(openshot PRIVATE
MagickUtilities.cpp
ImageReader.cpp
ImageWriter.cpp
TextReader.cpp)
TextReader.cpp
)
# define a preprocessor macro (used in the C++ source)
target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1)

86
src/Frame.cpp
View File

@@ -16,9 +16,9 @@
#include <iomanip>
#include "Frame.h"
#include "AudioBufferSource.h"
#include "AudioResampler.h"
#include "QtUtilities.h"
#include <AppConfig.h>
#include <juce_audio_basics/juce_audio_basics.h>
@@ -38,10 +38,6 @@
#include <QPointF>
#include <QWidget>
#ifdef USE_IMAGEMAGICK
#include "MagickUtilities.h"
#endif
using namespace std;
using namespace openshot;
@@ -49,7 +45,7 @@ using namespace openshot;
Frame::Frame(int64_t number, int width, int height, std::string color, int samples, int channels)
: audio(std::make_shared<juce::AudioBuffer<float>>(channels, samples)),
number(number), width(width), height(height),
pixel_ratio(1,1), color(color), qbuffer(NULL),
pixel_ratio(1,1), color(color),
channels(channels), channel_layout(LAYOUT_STEREO),
sample_rate(44100),
has_audio_data(false), has_image_data(false),
@@ -755,20 +751,15 @@ void Frame::AddImage(
int new_width, int new_height, int bytes_per_pixel,
QImage::Format type, const unsigned char *pixels_)
{
// Create new buffer
{
const std::lock_guard<std::recursive_mutex> lock(addingImageMutex);
qbuffer = pixels_;
} // Release addingImageMutex lock
// Create new image object from pixel data
// Create new image object from pixel data
auto new_image = std::make_shared<QImage>(
qbuffer,
pixels_,
new_width, new_height,
new_width * bytes_per_pixel,
type,
(QImageCleanupFunction) &openshot::Frame::cleanUpBuffer,
(void*) qbuffer
(QImageCleanupFunction) &openshot::cleanUpBuffer,
(void*) pixels_
);
AddImage(new_image);
}
@@ -954,60 +945,6 @@ void Frame::SetImageCV(cv::Mat _image)
}
#endif
#ifdef USE_IMAGEMAGICK
// Get pointer to ImageMagick image object
std::shared_ptr<Magick::Image> Frame::GetMagickImage()
{
// Check for blank image
if (!image)
// Fill with black
AddColor(width, height, "#000000");
// Get the pixels from the frame image
const QRgb *tmpBits = (const QRgb*)image->constBits();
// Create new image object, and fill with pixel data
auto magick_image = std::make_shared<Magick::Image>(
image->width(), image->height(),"RGBA", Magick::CharPixel, tmpBits);
// Give image a transparent background color
magick_image->backgroundColor(Magick::Color("none"));
magick_image->virtualPixelMethod(Magick::TransparentVirtualPixelMethod);
MAGICK_IMAGE_ALPHA(magick_image, true);
return magick_image;
}
#endif
#ifdef USE_IMAGEMAGICK
// Get pointer to QImage of frame
void Frame::AddMagickImage(std::shared_ptr<Magick::Image> new_image)
{
const int BPP = 4;
const std::size_t bufferSize = new_image->columns() * new_image->rows() * BPP;
/// Use realloc for fast memory allocation.
/// TODO: consider locking the buffer for mt safety
//qbuffer = reinterpret_cast<unsigned char*>(realloc(qbuffer, bufferSize));
qbuffer = new unsigned char[bufferSize]();
unsigned char *buffer = (unsigned char*)qbuffer;
MagickCore::ExceptionInfo exception;
// TODO: Actually do something, if we get an exception here
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::make_shared<QImage>(
qbuffer, width, height, width * BPP, QImage::Format_RGBA8888_Premultiplied,
(QImageCleanupFunction) &cleanUpBuffer, (void*) qbuffer);
// Update height and width
width = image->width();
height = image->height();
has_image_data = true;
}
#endif
// Play audio samples for this frame
void Frame::Play()
{
@@ -1079,17 +1016,6 @@ void Frame::Play()
}
// Clean up buffer after QImage is deleted
void Frame::cleanUpBuffer(void *info)
{
if (info)
{
// Remove buffer since QImage tells us to
unsigned char* ptr_to_qbuffer = (unsigned char*) info;
delete[] ptr_to_qbuffer;
}
}
// Add audio silence
void Frame::AddAudioSilence(int numSamples)
{

26
src/Frame.h
View File

@@ -32,13 +32,6 @@
#include <QColor>
#include <QImage>
#ifdef USE_IMAGEMAGICK
// Forward declare Magick::Image
namespace Magick {
class Image;
}
#endif
class QApplication;
namespace juce {
@@ -102,8 +95,7 @@ namespace openshot
std::shared_ptr<QApplication> previewApp;
std::recursive_mutex addingImageMutex;
std::recursive_mutex addingAudioMutex;
const unsigned char *qbuffer;
std::recursive_mutex addingAudioMutex;
openshot::Fraction pixel_ratio;
int channels;
ChannelLayout channel_layout;
@@ -150,7 +142,8 @@ namespace openshot
/// Add (or replace) pixel data to the frame (based on a solid color)
void AddColor(int new_width, int new_height, std::string new_color);
/// Add (or replace) pixel data (filled with new_color)
/// Add (or replace) pixel data (filled with new_color)
void AddColor(const QColor& new_color);
/// Add (or replace) pixel data to the frame
@@ -162,11 +155,6 @@ namespace openshot
/// Add (or replace) pixel data to the frame (for only the odd or even lines)
void AddImage(std::shared_ptr<QImage> new_image, bool only_odd_lines);
#ifdef USE_IMAGEMAGICK
/// Add (or replace) pixel data to the frame from an ImageMagick Image
void AddMagickImage(std::shared_ptr<Magick::Image> new_image);
#endif
/// Add audio samples to a specific channel
void AddAudio(bool replaceSamples, int destChannel, int destStartSample, const float* source, int numSamples, float gainToApplyToSource);
@@ -183,9 +171,6 @@ namespace openshot
// Set the channel layout of audio samples (i.e. mono, stereo, 5 point surround, etc...)
void ChannelsLayout(openshot::ChannelLayout new_channel_layout) { channel_layout = new_channel_layout; };
/// Clean up buffer after QImage is deleted
static void cleanUpBuffer(void *info);
/// Clear the waveform image (and deallocate its memory)
void ClearWaveform();
@@ -224,11 +209,6 @@ namespace openshot
/// Get pointer to Qt QImage image object
std::shared_ptr<QImage> GetImage();
#ifdef USE_IMAGEMAGICK
/// Get pointer to ImageMagick image object
std::shared_ptr<Magick::Image> GetMagickImage();
#endif
/// Set Pixel Aspect Ratio
openshot::Fraction GetPixelRatio() { return pixel_ratio; };

82
src/ImageReader.cpp
View File

@@ -13,6 +13,9 @@
// Require ImageMagick support
#ifdef USE_IMAGEMAGICK
#include "MagickUtilities.h"
#include "QtUtilities.h"
#include "ImageReader.h"
#include "Exceptions.h"
#include "Frame.h"
@@ -57,39 +60,31 @@ void ImageReader::Open()
info.vcodec = image->format();
info.width = image->size().width();
info.height = image->size().height();
info.pixel_ratio.num = 1;
info.pixel_ratio.den = 1;
info.pixel_ratio = openshot::Fraction(1, 1);
info.duration = 60 * 60 * 1; // 1 hour duration
info.fps.num = 30;
info.fps.den = 1;
info.video_timebase.num = 1;
info.video_timebase.den = 30;
info.video_length = round(info.duration * info.fps.ToDouble());
info.fps = openshot::Fraction(30, 1);
info.video_timebase = info.fps.Reciprocal();
info.video_length = std::round(info.duration * info.fps.ToDouble());
// Calculate the DAR (display aspect ratio)
Fraction size(info.width * info.pixel_ratio.num, info.height * info.pixel_ratio.den);
Fraction dar(
info.width * info.pixel_ratio.num,
info.height * info.pixel_ratio.den);
// Reduce size fraction
size.Reduce();
// Set the ratio based on the reduced fraction
info.display_ratio.num = size.num;
info.display_ratio.den = size.den;
// Reduce DAR fraction & set ratio
dar.Reduce();
info.display_ratio = dar;
// Mark as "open"
is_open = true;
}
}
// Close image file
void ImageReader::Close()
{
// Close all objects, if reader is 'open'
if (is_open)
{
// Mark as "closed"
is_open = false;
// Delete the image
image.reset();
}
@@ -98,19 +93,21 @@ void ImageReader::Close()
// Get an openshot::Frame object for a specific frame number of this reader.
std::shared_ptr<Frame> ImageReader::GetFrame(int64_t requested_frame)
{
// Check for open reader (or throw exception)
if (!is_open)
throw ReaderClosed("The FFmpegReader is closed. Call Open() before calling this method.", path);
if (!is_open) {
throw ReaderClosed(
"The ImageReader is closed. "
"Call Open() before calling this method.", path);
}
// Create or get frame object
auto image_frame = std::make_shared<Frame>(
requested_frame, image->size().width(), image->size().height(),
requested_frame,
image->size().width(), image->size().height(),
"#000000", 0, 2);
// Add Image data to frame
image_frame->AddMagickImage(image);
// return frame object
auto qimage = openshot::Magick2QImage(image);
image_frame->AddImage(qimage);
return image_frame;
}
@@ -124,30 +121,29 @@ std::string ImageReader::Json() const {
// Generate Json::Value for this object
Json::Value ImageReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
// get parent properties
Json::Value root = ReaderBase::JsonValue();
root["type"] = "ImageReader";
root["path"] = path;
// return JsonValue
return root;
}
// Load JSON string into this object
void ImageReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
try
{
const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
catch (const std::exception& e)
{
// Error parsing JSON (or missing keys)
throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
}
// Parse JSON string into JSON objects
try
{
const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
catch (const std::exception& e)
{
throw InvalidJSON(
"JSON is invalid (missing keys or invalid data types)");
}
}
// Load Json::Value into this object
@@ -160,9 +156,7 @@ void ImageReader::SetJsonValue(const Json::Value root) {
if (!root["path"].isNull())
path = root["path"].asString();
// Re-Open path, and re-init everything (if needed)
if (is_open)
{
if (is_open) {
Close();
Open();
}

24
src/ImageReader.h
View File

@@ -16,23 +16,23 @@
// Require ImageMagick support
#ifdef USE_IMAGEMAGICK
#include "ReaderBase.h"
#include <cmath>
#include <ctime>
#include <iostream>
#include <omp.h>
#include <stdio.h>
#include <memory>
#include "CacheMemory.h"
#include <string>
#include "MagickUtilities.h"
#include "ReaderBase.h"
#include "Json.h"
// Forward decls
namespace Magick {
class Image;
}
namespace openshot {
class CacheBase;
class Frame;
}
namespace openshot
{
// Forward decls
class CacheBase;
/**
* @brief This class uses the ImageMagick++ libraries, to open image files, and return
* openshot::Frame objects containing the image.

89
src/ImageWriter.cpp
View File

@@ -13,9 +13,13 @@
//Require ImageMagick support
#ifdef USE_IMAGEMAGICK
#include "MagickUtilities.h"
#include "QtUtilities.h"
#include "ImageWriter.h"
#include "Exceptions.h"
#include "Frame.h"
#include "ReaderBase.h"
#include "ZmqLogger.h"
using namespace openshot;
@@ -24,47 +28,51 @@ ImageWriter::ImageWriter(std::string path) :
path(path), cache_size(8), write_video_count(0), image_quality(75), number_of_loops(1),
combine_frames(true), is_open(false)
{
// Disable audio & video (so they can be independently enabled)
info.has_audio = false;
info.has_video = true;
}
// Set video export options
void ImageWriter::SetVideoOptions(std::string format, Fraction fps, int width, int height,
int quality, int loops, bool combine)
void ImageWriter::SetVideoOptions(
std::string format, Fraction fps, int width, int height,
int quality, int loops, bool combine)
{
// Set frames per second (if provided)
info.fps.num = fps.num;
info.fps.den = fps.den;
// Set frames per second (if provided)
info.fps = fps;
// Set image magic properties
image_quality = quality;
number_of_loops = loops;
combine_frames = combine;
info.vcodec = format;
// Set image magic properties
image_quality = quality;
number_of_loops = loops;
combine_frames = combine;
info.vcodec = format;
// Set the timebase (inverse of fps)
info.video_timebase.num = info.fps.den;
info.video_timebase.den = info.fps.num;
// Set the timebase (inverse of fps)
info.video_timebase = fps.Reciprocal();
if (width >= 1)
info.width = width;
if (height >= 1)
info.height = height;
info.width = std::max(1, width);
info.height = std::max(1, height);
info.video_bit_rate = quality;
info.video_bit_rate = quality;
// Calculate the DAR (display aspect ratio)
Fraction size(info.width * info.pixel_ratio.num, info.height * info.pixel_ratio.den);
// Calculate the DAR (display aspect ratio)
Fraction size(
info.width * info.pixel_ratio.num,
info.height * info.pixel_ratio.den);
// Reduce size fraction
size.Reduce();
// Reduce size fraction
size.Reduce();
// Set the ratio based on the reduced fraction
info.display_ratio.num = size.num;
info.display_ratio.den = size.den;
// Set the ratio based on the reduced fraction
info.display_ratio = size;
ZmqLogger::Instance()->AppendDebugMethod("ImageWriter::SetVideoOptions (" + format + ")", "width", width, "height", height, "size.num", size.num, "size.den", size.den, "fps.num", fps.num, "fps.den", fps.den);
ZmqLogger::Instance()->AppendDebugMethod(
"ImageWriter::SetVideoOptions (" + format + ")",
"width", width,
"height", height,
"size.num", size.num,
"size.den", size.den,
"fps.num", fps.num,
"fps.den", fps.den);
}
// Open the writer
@@ -77,12 +85,15 @@ void ImageWriter::Open()
void ImageWriter::WriteFrame(std::shared_ptr<Frame> frame)
{
// Check for open reader (or throw exception)
if (!is_open)
throw WriterClosed("The ImageWriter is closed. Call Open() before calling this method.", path);
if (!is_open) {
throw WriterClosed(
"The ImageWriter is closed. "
"Call Open() before calling this method.", path);
}
// Copy and resize image
std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
auto qimage = frame->GetImage();
auto frame_image = openshot::QImage2Magick(qimage);
frame_image->magick( info.vcodec );
frame_image->backgroundColor(Magick::Color("none"));
MAGICK_IMAGE_ALPHA(frame_image, true);
@@ -91,11 +102,10 @@ void ImageWriter::WriteFrame(std::shared_ptr<Frame> frame)
frame_image->animationIterations(number_of_loops);
// Calculate correct DAR (display aspect ratio)
int new_width = info.width;
int new_height = info.height * frame->GetPixelRatio().Reciprocal().ToDouble();
// Resize image
Magick::Geometry new_size(new_width, new_height);
Magick::Geometry new_size(info.width, new_height);
new_size.aspect(true);
frame_image->resize(new_size);
@@ -110,7 +120,10 @@ void ImageWriter::WriteFrame(std::shared_ptr<Frame> frame)
// Write a block of frames from a reader
void ImageWriter::WriteFrame(ReaderBase* reader, int64_t start, int64_t length)
{
ZmqLogger::Instance()->AppendDebugMethod("ImageWriter::WriteFrame (from Reader)", "start", start, "length", length);
ZmqLogger::Instance()->AppendDebugMethod(
"ImageWriter::WriteFrame (from Reader)",
"start", start,
"length", length);
// Loop through each frame (and encoded it)
for (int64_t number = start; number <= length; number++)
@@ -126,16 +139,12 @@ void ImageWriter::WriteFrame(ReaderBase* reader, int64_t start, int64_t length)
// Close the writer and encode/output final image to the disk.
void ImageWriter::Close()
{
// Write frame's image to file
// Write frame images to file
Magick::writeImages(frames.begin(), frames.end(), path, combine_frames);
// Clear frames vector
// Clear frames vector & counters, close writer
frames.clear();
// Reset frame counters
write_video_count = 0;
// Close writer
is_open = false;
ZmqLogger::Instance()->AppendDebugMethod("ImageWriter::Close");

26
src/ImageWriter.h
View File

@@ -15,20 +15,19 @@
#ifdef USE_IMAGEMAGICK
#include "ReaderBase.h"
#include "WriterBase.h"
#include <string>
#include <vector>
#include "CacheMemory.h"
#include "Exceptions.h"
#include "Fraction.h"
#include "OpenMPUtilities.h"
#include "WriterBase.h"
#include "MagickUtilities.h"
#include "Fraction.h"
namespace openshot
{
// Forward decls
class Frame;
class ReaderBase;
/**
* @brief This class uses the ImageMagick library to write image files (including animated GIFs)
@@ -69,7 +68,7 @@ namespace openshot
int number_of_loops;
bool combine_frames;
std::shared_ptr<Frame> last_frame;
std::shared_ptr<Frame> last_frame;
public:
@@ -102,8 +101,9 @@ namespace openshot
/// @param quality Quality of image (0 to 100, 70 is default)
/// @param loops Number of times to repeat the image (used on certain multi-frame image formats, such as GIF)
/// @param combine Combine frames into a single image (if possible), or save each frame as its own image
void SetVideoOptions(std::string format, Fraction fps, int width, int height,
int quality, int loops, bool combine);
void SetVideoOptions(
std::string format, Fraction fps, int width, int height,
int quality, int loops, bool combine);
/// @brief Add a frame to the stack waiting to be encoded.
/// @param frame The openshot::Frame object to write to this image
@@ -117,7 +117,7 @@ namespace openshot
};
}
} // namespace
#endif //USE_IMAGEMAGICK
#endif //OPENSHOT_IMAGE_WRITER_H
#endif //USE_IMAGEMAGICK
#endif //OPENSHOT_IMAGE_WRITER_H

73
src/MagickUtilities.cpp Normal file
View File

@@ -0,0 +1,73 @@
/**
* @file
* @brief Implementation for MagickUtilities (conversions)
* @author Jonathan Thomas <jonathan@openshot.org>
* @author FeRD (Frank Dana) <ferdnyc@gmail.com>
*/
// Copyright (c) 2008-2021 OpenShot Studios, LLC
//
// SPDX-License-Identifier: LGPL-3.0-or-later
#ifdef USE_IMAGEMAGICK
#include "MagickUtilities.h"
#include "QtUtilities.h"
#include <QImage>
// Get pointer to Magick::Image conversion of a QImage
std::shared_ptr<Magick::Image>
openshot::QImage2Magick(std::shared_ptr<QImage> image)
{
// Check for blank image
if (!image || image->isNull())
return nullptr;
// Get the pixels from the frame image
const QRgb *tmpBits = (const QRgb*)image->constBits();
// Create new image object, and fill with pixel data
auto magick_image = std::make_shared<Magick::Image>(
image->width(), image->height(),
"RGBA", Magick::CharPixel, tmpBits);
// Give image a transparent background color
magick_image->backgroundColor(Magick::Color("none"));
magick_image->virtualPixelMethod(
Magick::TransparentVirtualPixelMethod);
MAGICK_IMAGE_ALPHA(magick_image, true);
return magick_image;
}
// Get pointer to QImage conversion of a Magick::Image
std::shared_ptr<QImage>
openshot::Magick2QImage(std::shared_ptr<Magick::Image> image)
{
if (!image)
return nullptr;
const int BPP = 4;
const std::size_t size = image->columns() * image->rows() * BPP;
auto* qbuffer = new unsigned char[size]();
MagickCore::ExceptionInfo exception;
// TODO: Actually do something, if we get an exception here
MagickCore::ExportImagePixels(
image->constImage(), 0, 0,
image->columns(), image->rows(),
"RGBA", Magick::CharPixel,
qbuffer, &exception);
auto qimage = std::make_shared<QImage>(
qbuffer, image->columns(), image->rows(),
image->columns() * BPP,
QImage::Format_RGBA8888_Premultiplied,
(QImageCleanupFunction) &openshot::cleanUpBuffer,
(void*) qbuffer);
return qimage;
}
#endif // USE_IMAGEMAGICK

23
src/MagickUtilities.h
View File

@@ -21,6 +21,9 @@
// namespace instead of the global namespace
#include <cassert>
#include <memory>
#include <QImage>
// Exclude a warning message with IM6 headers
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
@@ -30,8 +33,8 @@
// Determine ImageMagick version, as IM7 isn't fully
// backwards compatible
#ifndef NEW_MAGICK
#define NEW_MAGICK (MagickLibVersion >= 0x700)
#endif
#define NEW_MAGICK (MagickLibVersion >= 0x700)
#endif
// IM7: <Magick::Image>->alpha(bool)
// IM6: <Magick::Image>->matte(bool)
@@ -50,5 +53,17 @@
#define MAGICK_DRAWABLE std::list<Magick::Drawable>
#endif
#endif
#endif
namespace openshot {
/// Convert QImage to Magick::Image
std::shared_ptr<Magick::Image>
QImage2Magick(std::shared_ptr<QImage>);
/// Convert Magick::Image to QImage
std::shared_ptr<QImage>
Magick2QImage(std::shared_ptr<Magick::Image>);
} // namespace
#endif // USE_IMAGEMAGICK
#endif // OPENSHOT_MAGICK_UTILITIES_H

13
src/QtUtilities.h
View File

@@ -23,4 +23,17 @@ namespace Qt {
}
#endif
namespace openshot {
// Clean up buffer after QImage is deleted
static inline void cleanUpBuffer(void *info)
{
if (!info)
return;
// Remove buffer since QImage tells us to
auto* qbuffer = reinterpret_cast<unsigned char*>(info);
delete[] qbuffer;
}
} // namespace
#endif // OPENSHOT_QT_UTILITIES_H

10
src/TextReader.cpp
View File

@@ -13,6 +13,9 @@
// Require ImageMagick support
#ifdef USE_IMAGEMAGICK
#include "QtUtilities.h"
#include "MagickUtilities.h"
#include "TextReader.h"
#include "Exceptions.h"
#include "Frame.h"
@@ -152,14 +155,15 @@ std::shared_ptr<Frame> TextReader::GetFrame(int64_t requested_frame)
{
// Create or get frame object
auto image_frame = std::make_shared<Frame>(
requested_frame, image->size().width(), image->size().height(),
requested_frame,
image->size().width(), image->size().height(),
"#000000", 0, 2);
// Add Image data to frame
auto copy_image = std::make_shared<Magick::Image>(*image.get());
copy_image->modifyImage(); // actually copy the image data to this object
//TODO: Reimplement this with QImage
image_frame->AddMagickImage(copy_image);
auto qimage = openshot::Magick2QImage(copy_image);
image_frame->AddImage(qimage);
// return frame object
return image_frame;

15
src/TextReader.h
View File

@@ -16,21 +16,16 @@
// Require ImageMagick support
#ifdef USE_IMAGEMAGICK
#include "ReaderBase.h"
#include <cmath>
#include <ctime>
#include <iostream>
#include <omp.h>
#include <stdio.h>
#include <memory>
#include "CacheMemory.h"
#include "Enums.h"
#include "ReaderBase.h"
#include "Enums.h"
#include "MagickUtilities.h"
namespace openshot
{
class CacheBase;
class Frame;
/**
* @brief This class uses the ImageMagick++ libraries, to create frames with "Text", and return
@@ -108,7 +103,7 @@ namespace openshot
void Close() override;
/// Get the cache object used by this reader (always returns NULL for this object)
openshot::CacheMemory* GetCache() override { return NULL; };
openshot::CacheBase* GetCache() override { return nullptr; };
/// Get an openshot::Frame object for a specific frame number of this reader. All numbers
/// return the same Frame, since they all share the same image data.

2
src/TimelineBase.h
View File

@@ -50,6 +50,8 @@ namespace openshot {
/// so we'll be able to access the Timeline::Clips() function from a pointer object of
/// the TimelineBase class
virtual std::list<openshot::Clip*> Clips() = 0;
virtual ~TimelineBase() = default;
};
}

32
tests/ImageWriter.cpp
View File

@@ -25,6 +25,26 @@
using namespace openshot;
TEST_CASE( "conversions", "[libopenshot][imagewriter]" )
{
auto magick1 = openshot::QImage2Magick(nullptr);
CHECK_FALSE(magick1);
auto qimage1 = openshot::Magick2QImage(nullptr);
CHECK_FALSE(qimage1);
std::stringstream path_overlay;
path_overlay << TEST_MEDIA_PATH << "front3.png";
openshot::Clip overlay(path_overlay.str());
overlay.Open();
auto frame = overlay.Reader()->GetFrame(1);
auto qimage = frame->GetImage();
auto magick = openshot::QImage2Magick(qimage);
auto qimage_out = openshot::Magick2QImage(magick);
CHECK(qimage->pixelColor(100, 100) == qimage_out->pixelColor(100, 100));
}
TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
{
// Reader ---------------
@@ -49,16 +69,18 @@ TEST_CASE( "Gif", "[libopenshot][imagewriter]" )
CHECK_FALSE(w.IsOpen());
// Check for exception on write-before-open
CHECK_THROWS_AS(w.WriteFrame(&r, 500, 504), WriterClosed);
CHECK_THROWS_AS(w.WriteFrame(&r, 500, 509), WriterClosed);
// Set the image output settings (format, fps, width, height, quality, loops, combine)
w.SetVideoOptions("GIF", r.info.fps, r.info.width, r.info.height, 70, 1, true);
// Set the image output settings
// (format, fps, width, height, quality, loops, combine)
// loops=0 == infinite looping
w.SetVideoOptions("GIF", r.info.fps, r.info.width, r.info.height, 70, 0, true);
// Open writer
w.Open();
// Write some frames (start on frame 500 and go to frame 510)
w.WriteFrame(&r, 500, 504);
// Write some frames
w.WriteFrame(&r, 500, 509);
// Close writer & reader
w.Close();

22
tests/QtImageReader.cpp
View File

@@ -33,7 +33,7 @@ TEST_CASE( "GetFrame_Before_Opening", "[libopenshot][qtimagereader]" )
// Create a reader
std::stringstream path;
path << TEST_MEDIA_PATH << "front.png";
QtImageReader r(path.str());
QtImageReader r(path.str());
// Check invalid path
CHECK_THROWS_AS(r.GetFrame(1), ReaderClosed);
@@ -41,15 +41,15 @@ TEST_CASE( "GetFrame_Before_Opening", "[libopenshot][qtimagereader]" )
TEST_CASE( "Check_SVG_Loading", "[libopenshot][qtimagereader]" )
{
// Create a reader
std::stringstream path;
path << TEST_MEDIA_PATH << "1F0CF.svg";
// Create a reader
std::stringstream path;
path << TEST_MEDIA_PATH << "1F0CF.svg";
QtImageReader r(path.str());
r.Open();
r.Open();
// Get frame, with no Timeline or Clip
// Size should be equal to default SVG size
std::shared_ptr<Frame> f = r.GetFrame(1);
// Get frame, with no Timeline or Clip
// Size should be equal to default SVG size
std::shared_ptr<Frame> f = r.GetFrame(1);
CHECK(f->GetImage()->width() == 72);
CHECK(f->GetImage()->height() == 72);
@@ -80,7 +80,7 @@ TEST_CASE( "Check_SVG_Loading", "[libopenshot][qtimagereader]" )
CHECK(f->GetImage()->width() == 480 * 2);
CHECK(f->GetImage()->height() == 480 * 2);
// Close reader
t1.Close();
r.Close();
// Close reader
t1.Close();
r.Close();
}