#include "qimage_wrapper.h"
-#ifdef USE_QT3
-#include <qimage.h>
-#include <qmutex.h>
-
-#ifdef USE_KDE
-#include <kinstance.h>
-#include <kimageio.h>
-#endif
-
+#ifdef USE_KDE4
+#include <kcomponentdata.h>
#endif
-
-#ifdef USE_QT4
-#include <QtGui/QImage>
-#include <QtCore/QSysInfo>
-#include <QtCore/QMutex>
-#include <QtCore/QtEndian>
-#include <QtCore/QTemporaryFile>
-#endif
+#include <QImage>
+#include <QSysInfo>
+#include <QApplication>
+#include <QMutex>
+#include <QtEndian>
+#include <QTemporaryFile>
+#include <QLocale>
#ifdef USE_EXIF
#include <libexif/exif-data.h>
#include <framework/mlt_pool.h>
#include <framework/mlt_cache.h>
-#ifdef USE_KDE
-static KInstance *instance = 0L;
+#ifdef USE_KDE4
+static KComponentData *instance = 0L;
#endif
+static QApplication *app = NULL;
+
static void qimage_delete( void *data )
{
QImage *image = ( QImage * )data;
delete image;
image = NULL;
-#ifdef USE_KDE
+#if defined(USE_KDE4)
if (instance) delete instance;
instance = 0L;
#endif
+
}
-#ifdef USE_KDE
void init_qimage()
{
- if (!instance) {
- instance = new KInstance("qimage_prod");
- KImageIO::registerFormats();
+#ifdef USE_KDE4
+ if ( !instance ) {
+ instance = new KComponentData( "qimage_prod" );
}
-}
#endif
+
+}
static QImage* reorient_with_exif( producer_qimage self, int image_idx, QImage *qimage )
{
double ttl = mlt_properties_get_int( producer_props, "ttl" );
// Get the original position of this frame
- mlt_position position = mlt_properties_get_position( properties, "qimage_position" );
+ mlt_position position = mlt_frame_original_position( frame );
position += mlt_producer_get_in( producer );
// Image index
sprintf( image_key, "%d", image_idx );
int disable_exif = mlt_properties_get_int( producer_props, "disable_exif" );
+
+
+ if ( app == NULL )
+ {
+ if ( qApp )
+ {
+ app = qApp;
+ }
+ else
+ {
+#ifdef linux
+ if ( getenv("DISPLAY") == 0 )
+ {
+ mlt_log_panic( MLT_PRODUCER_SERVICE( producer ), "Error, cannot render titles without an X11 environment.\nPlease either run melt from an X session or use a fake X server like xvfb:\nxvfb-run -a melt (...)\n" );
+ return -1;
+ }
+#endif
+ int argc = 1;
+ char* argv[1];
+ argv[0] = (char*) "xxx";
+ app = new QApplication( argc, argv );
+ const char *localename = mlt_properties_get_lcnumeric( MLT_SERVICE_PROPERTIES( MLT_PRODUCER_SERVICE( producer ) ) );
+ QLocale::setDefault( QLocale( localename ) );
+ }
+ }
if ( image_idx != self->qimage_idx )
self->qimage = NULL;
if ( !self->qimage || mlt_properties_get_int( producer_props, "_disable_exif" ) != disable_exif )
{
self->current_image = NULL;
- QImage *qimage = new QImage( mlt_properties_get_value( self->filenames, image_idx ) );
+ QImage *qimage = new QImage( QString::fromUtf8( mlt_properties_get_value( self->filenames, image_idx ) ) );
self->qimage = qimage;
if ( !qimage->isNull( ) )
self->current_height = qimage->height( );
mlt_events_block( producer_props, NULL );
- mlt_properties_set_int( producer_props, "_real_width", self->current_width );
- mlt_properties_set_int( producer_props, "_real_height", self->current_height );
+ mlt_properties_set_int( producer_props, "meta.media.width", self->current_width );
+ mlt_properties_set_int( producer_props, "meta.media.height", self->current_height );
mlt_properties_set_int( producer_props, "_disable_exif", disable_exif );
mlt_events_unblock( producer_props, NULL );
}
// Set width/height of frame
mlt_properties_set_int( properties, "width", self->current_width );
mlt_properties_set_int( properties, "height", self->current_height );
- mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "_real_width" ) );
- mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "_real_height" ) );
return image_idx;
}
|| strcmp( interps, "bicubic" ) == 0 )
interp = 1;
-#ifdef USE_QT4
// Note - the original qimage is already safe and ready for destruction
if ( qimage->depth() == 1 )
{
QImage scaled = interp == 0 ? qimage->scaled( QSize( width, height ) ) :
qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
int has_alpha = scaled.hasAlphaChannel();
-#endif
-
-#ifdef USE_QT3
- // Note - the original qimage is already safe and ready for destruction
- QImage scaled = interp == 0 ? qimage->scale( width, height, QImage::ScaleFree ) :
- qimage->smoothScale( width, height, QImage::ScaleFree );
- self->has_alpha = 1;
-#endif
// Store width and height
self->current_width = width;
int dst_stride = width * ( has_alpha ? 4 : 3 );
int image_size = dst_stride * ( height + 1 );
self->current_image = ( uint8_t * )mlt_pool_alloc( image_size );
+ self->current_alpha = NULL;
self->format = has_alpha ? mlt_image_rgb24a : mlt_image_rgb24;
// Copy the image
uint8_t *buffer = NULL;
// First, set the image so it can be converted when we get it
+ mlt_frame_replace_image( frame, self->current_image, self->format, width, height );
mlt_frame_set_image( frame, self->current_image, image_size, mlt_pool_release );
- mlt_properties_set_int( properties, "format", self->format );
- mlt_properties_set_int( properties, "width", width );
- mlt_properties_set_int( properties, "height", height );
self->format = format;
// get_image will do the format conversion
self->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "qimage.image" );
self->image_idx = image_idx;
mlt_cache_item_close( self->alpha_cache );
- mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha", self->current_alpha, width * height, mlt_pool_release );
- self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" );
+ self->alpha_cache = NULL;
+ if ( self->current_alpha )
+ {
+ mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "qimage.alpha", self->current_alpha, width * height, mlt_pool_release );
+ self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "qimage.alpha" );
+ }
}
// Set width/height of frame
projects / mlt / blobdiff