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

Huge refactor, switched almost all methods to using pointers for Frames, and moved some key method calls outside the critical OMP sections. Also, refactored the sws scaler, to create a pool of 32 scalers, and give each thread it's own scaler. This refactor resulted in a 40%+ increase in speed on the FFmpegReader class.

Browse Source 
I also added a cmake build flag for the google perftools library, to assist on profiling performance issues.
This commit is contained in:
Jonathan Thomas
2012-08-15 17:27:14 -05:00
parent 9b6d4dc4a1
commit d1af1b5fef
14 changed files with 239 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Frame.cpp
View File

@@ -13,7 +13,7 @@ using namespace openshot;
Frame::Frame() : number(1), image(0), audio(0), pixel_ratio(1,1), sample_rate(48000), channels(2)
{
// Init the image magic and audio buffer
image = new Magick::Image(Magick::Geometry(300,200), Magick::Color("red"));
image = new Magick::Image(Magick::Geometry(1,1), Magick::Color("red"));
audio = new juce::AudioSampleBuffer(channels, 1600);
// initialize the audio samples to zero (silence)
@@ -25,7 +25,7 @@ Frame::Frame(int number, int width, int height, string color)
: number(number), image(0), audio(0), pixel_ratio(1,1), sample_rate(48000), channels(2)
{
// Init the image magic and audio buffer
image = new Magick::Image(Magick::Geometry(width, height), Magick::Color(color));
image = new Magick::Image(Magick::Geometry(1, 1), Magick::Color(color));
audio = new juce::AudioSampleBuffer(channels, 1600);
// initialize the audio samples to zero (silence)
@@ -49,7 +49,7 @@ Frame::Frame(int number, int samples, int channels) :
number(number), image(0), audio(0), pixel_ratio(1,1), sample_rate(48000), channels(channels)
{
// Init the image magic and audio buffer
image = new Magick::Image(Magick::Geometry(300, 200), Magick::Color("white"));
image = new Magick::Image(Magick::Geometry(1, 1), Magick::Color("white"));
audio = new juce::AudioSampleBuffer(channels, samples);
// initialize the audio samples to zero (silence)
@@ -61,7 +61,7 @@ Frame::Frame(int number, int width, int height, string color, int samples, int c
: number(number), image(0), audio(0), pixel_ratio(1,1), sample_rate(48000), channels(channels)
{
// Init the image magic and audio buffer
image = new Magick::Image(Magick::Geometry(width, height), Magick::Color(color));
image = new Magick::Image(Magick::Geometry(1, 1), Magick::Color(color));
audio = new juce::AudioSampleBuffer(channels, samples);
// initialize the audio samples to zero (silence)
@@ -100,7 +100,6 @@ Frame& Frame::operator= (const Frame& other)
// Copy data and pointers from another Frame instance
void Frame::DeepCopy(const Frame& other)
{
// ignore copy if objects are the same
number = other.number;
image = new Magick::Image(*(other.image));
audio = new juce::AudioSampleBuffer(*(other.audio));
@@ -115,7 +114,6 @@ void Frame::DeletePointers()
// deallocate image memory
delete image;
image = NULL;
// deallocate audio memory
delete audio;
audio = NULL;
}