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

Added new GetQImage method to get a Qt QImage object from an openshot:Frame object. Also refactored the video playback code to use this new method.

Browse Source
This commit is contained in:
Jonathan Thomas
2015-03-16 13:59:11 -05:00
parent d7a43f692c
commit 891766ed29
8 changed files with 79 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/RendererBase.cpp
View File

@@ -26,12 +26,9 @@
*/
#include "../include/RendererBase.h"
#include "../include/Frame.h"
#include <stdlib.h> // for realloc
using namespace openshot;
RendererBase::RendererBase() : buffer(NULL)
RendererBase::RendererBase()
{
}
@@ -41,30 +38,5 @@ RendererBase::~RendererBase()
void RendererBase::paint(const std::tr1::shared_ptr<Frame> & frame)
{
const int BPP = 3;
const tr1::shared_ptr<Magick::Image> image = frame->GetImage();
const std::size_t width = image->columns();
const std::size_t height = image->rows();
const std::size_t bufferSize = width * height * BPP;
/// Use realloc for fast memory allocation.
/// TODO: consider locking the buffer for mt safety
buffer = reinterpret_cast<unsigned char*>(realloc(buffer, bufferSize));
#if false
// Not sure if this is actually faster... but it works now
image->getPixels(0,0, width, height); // load pixels into cache
image->depth( 8 ); // this is required or it crashes
image->writePixels(Magick::RGBQuantum, buffer); // write pixel data to our buffer
#else
// Iterate through the pixel packets, and load our own buffer
// Each color needs to be scaled to 8 bit (using the ImageMagick built-in ScaleQuantumToChar function)
const Magick::PixelPacket *pixels = frame->GetPixels();
for (int n = 0, i = 0; n < width * height; n += 1, i += 3) {
buffer[i+0] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].red);
buffer[i+1] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].green);
buffer[i+2] = MagickCore::ScaleQuantumToChar((Magick::Quantum) pixels[n].blue);
}
#endif
this->render(RGB_888, width, height, width * BPP, buffer);
this->render(frame->GetQImage());
}