X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=a024bdf5fffe40a0d87bc18bc33e82651244d2cc;hb=7fff167fb95bb6b13b138b8d3f7b68da8a030473;hp=9cf86c867096f7e2e9aca23a8efaf3ae5b1954b5;hpb=91ff8dfd8269603d8cbebf0781159b7ac6f46c23;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 9cf86c86..a024bdf5 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -9,7 +9,7 @@ copyright : (C) Marco Gittler email : g.marco@freenet.de copyright : (C) 2006 Jean-Baptiste Mardelle - email : jb@ader.ch + email : jb@kdenlive.org ***************************************************************************/ @@ -28,6 +28,8 @@ extern "C" { #include } +#include + #include #include #include @@ -42,12 +44,20 @@ extern "C" { #include "renderer.h" #include "kdenlivesettings.h" #include "kthumb.h" -//#include +#include "definitions.h" + #include +#if LIBAVCODEC_VERSION_MAJOR > 51 || (LIBAVCODEC_VERSION_MAJOR > 50 && LIBAVCODEC_VERSION_MINOR > 54) +// long_name was added in FFmpeg avcodec version 51.55 +#define ENABLE_FFMPEG_CODEC_DESCRIPTION 1 +#endif + + + static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it ? - //if (self->isBlocked) return; + if (self->m_isBlocked) return; if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) { self->emitConsumerStopped(); } else { @@ -55,55 +65,28 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr } } -Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true) { - kDebug() << "////////// USING PROFILE: " << (char *)KdenliveSettings::current_profile().toUtf8().data(); - m_mltProfile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data()); +Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false) { + kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); refreshTimer = new QTimer(this); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); - m_connectTimer = new QTimer(this); - connect(m_connectTimer, SIGNAL(timeout()), this, SLOT(connectPlaylist())); - if (rendererName == "project") m_monitorId = 10000; else m_monitorId = 10001; osdTimer = new QTimer(this); connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout())); m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties"); - //if (rendererName == "clip") - { - //Mlt::Consumer *consumer = new Mlt::Consumer( profile , "sdl_preview"); - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer; - m_mltConsumer->set("resize", 1); - m_mltConsumer->set("window_id", winid); - m_mltConsumer->set("terminate_on_pause", 1); - m_mltConsumer->set("rescale", "nearest"); - m_mltConsumer->set("progressive", 1); - m_mltConsumer->set("audio_buffer", 1024); - m_mltConsumer->set("frequency", 48000); - m_externalwinid = extid; - m_winid = winid; - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", ""); - m_mltProducer = producer; - m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0.0); - - //m_mltConsumer->start(); - //refresh(); - //initSceneList(); - } - /*m_osdInfo = new Mlt::Filter("data_show"); - char *tmp = decodedString(m_osdProfile); - m_osdInfo->set("resource", tmp); - delete[] tmp;*/ - // Does it do anything usefull? I mean, RenderThread doesn't do anything useful at the moment - // (except being cpu hungry :) + buildConsumer(); - /* if(!s_renderThread) { - s_renderThread = new RenderThread; - s_renderThread->start(); - } */ + m_externalwinid = extid; + m_winid = winid; + Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_mltProducer = producer; + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_blackClip->set("id", "black"); + m_mltConsumer->connect(*m_mltProducer); + m_mltProducer->set_speed(0.0); } Render::~Render() { @@ -112,22 +95,76 @@ Render::~Render() { void Render::closeMlt() { - delete m_connectTimer; delete osdTimer; delete refreshTimer; if (m_mltConsumer) delete m_mltConsumer; if (m_mltProducer) delete m_mltProducer; + if (m_blackClip) delete m_blackClip; //delete m_osdInfo; } +void Render::buildConsumer() { + char *tmp; + tmp = decodedString(KdenliveSettings::current_profile()); + m_mltProfile = new Mlt::Profile(tmp); + delete[] tmp; + + + QString videoDriver = KdenliveSettings::videodrivername(); + if (!videoDriver.isEmpty()) { + if (videoDriver == "x11_noaccel") { + setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1); + videoDriver = "x11"; + } else { + unsetenv("SDL_VIDEO_YUV_HWACCEL"); + } + } + + m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); + m_mltConsumer->set("resize", 1); + m_mltConsumer->set("window_id", m_winid); + m_mltConsumer->set("terminate_on_pause", 1); + m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_mltConsumer->set("rescale", "nearest"); + + QString audioDevice = KdenliveSettings::audiodevicename(); + if (!audioDevice.isEmpty()) { + tmp = decodedString(audioDevice); + m_mltConsumer->set("audio_device", tmp); + delete[] tmp; + } -int Render::resetProfile(QString profile) { + if (!videoDriver.isEmpty()) { + tmp = decodedString(videoDriver); + m_mltConsumer->set("video_driver", tmp); + delete[] tmp; + } + + QString audioDriver = KdenliveSettings::audiodrivername(); + if (!audioDriver.isEmpty()) { + tmp = decodedString(audioDriver); + m_mltConsumer->set("audio_driver", tmp); + delete[] tmp; + } + + + m_mltConsumer->set("progressive", 1); + m_mltConsumer->set("audio_buffer", 1024); + m_mltConsumer->set("frequency", 48000); +} + +int Render::resetProfile() { if (!m_mltConsumer) return 0; + QString currentProfile = getenv("MLT_PROFILE"); + if (currentProfile == KdenliveSettings::current_profile()) { + kDebug() << "reset to same profile, nothing to do"; + return 1; + } + if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); - m_mltConsumer->set("refresh", 0); m_mltConsumer->purge(); delete m_mltConsumer; m_mltConsumer = NULL; @@ -136,22 +173,20 @@ int Render::resetProfile(QString profile) { m_mltProducer = NULL; if (m_mltProfile) delete m_mltProfile; m_mltProfile = NULL; + buildConsumer(); - m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data()); - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer; - m_mltConsumer->set("resize", 1); - m_mltConsumer->set("window_id", m_winid); - m_mltConsumer->set("terminate_on_pause", 1); - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - m_mltConsumer->set("rescale", "nearest"); - m_mltConsumer->set("progressive", 1); - m_mltConsumer->set("audio_buffer", 1024); - m_mltConsumer->set("frequency", 48000); + kDebug() << "//RESET WITHSCENE: " << scene; + setSceneList(scene); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", (char *) scene.toUtf8().data()); + char *tmp = decodedString(scene); + Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp); + delete[] tmp; m_mltProducer = producer; - m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0.0); + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_mltProducer->optimise(); + m_mltProducer->set_speed(0); + connectPlaylist(); //delete m_mltProfile; // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer()); @@ -160,7 +195,6 @@ int Render::resetProfile(QString profile) { //mlt_properties_set(properties, "profile", "hdv_1080_50i"); //m_mltConsumer->set("profile", (char *) profile.toUtf8().data()); //m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data()); - kDebug() << " ++++++++++ RESET CONSUMER WITH PROFILE: " << profile << ", WIDTH: " << m_mltProfile->width(); //apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties ); //refresh(); @@ -218,19 +252,7 @@ QPixmap Render::extractFrame(int frame_position, int width, int height) { pix.fill(Qt::black); return pix; } - //Mlt::Producer *mlt_producer = m_mltProducer->cut(frame_position, frame_position + 1); return KThumb::getFrame(m_mltProducer, frame_position, width, height); - /*Mlt::Filter m_convert(*m_mltProfile, "avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - mlt_producer->attach(m_convert); - Mlt::Frame *frame = mlt_producer->get_frame(); - - if (frame) { - pix = frameThumbnail(frame, width, height); - delete frame; - } else pix.fill(Qt::black); - delete mlt_producer; - return pix;*/ } QPixmap Render::getImageThumbnail(KUrl url, int width, int height) { @@ -242,14 +264,11 @@ QPixmap Render::getImageThumbnail(KUrl url, int width, int height) { QStringList::Iterator it; QDir dir(url.directory()); - more = dir.entryList(QDir::Files); - - for (it = more.begin() ; it != more.end() ; ++it) { - if ((*it).endsWith("." + fileType, Qt::CaseInsensitive)) { - im.load(url.directory() + "/" + *it); - break; - } - } + QStringList filter; + filter << "*." + fileType; + filter << "*." + fileType.toUpper(); + more = dir.entryList(filter, QDir::Files); + im.load(url.directory() + "/" + more.at(0)); } else im.load(url.path()); //pixmap = im.scaled(width, height); return pixmap; @@ -372,40 +391,145 @@ bool Render::isValid(KUrl url) { return true; } -void Render::getFileProperties(const QDomElement &xml, int clipId) { - int height = 40; - int width = (int)(height * m_mltProfile->dar()); - QDomDocument doc; - QDomElement westley = doc.createElement("westley"); - doc.appendChild(westley); - westley.appendChild(doc.importNode(xml, true)); - //kDebug() << "////////////\n" << doc.toString() << "////////////////\n"; - char *tmp = decodedString(doc.toString()); - - Mlt::Producer producer(*m_mltProfile, "westley-xml", tmp); - delete[] tmp; +const double Render::dar() const { + return m_mltProfile->dar(); +} - if (producer.is_blank()) { - return; +void Render::slotSplitView(bool doit) { + m_isSplitView = doit; + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + if (service.type() != tractor_type || tractor.count() < 2) return; + Mlt::Field *field = tractor.field(); + if (doit) { + int screen = 0; + for (int i = 1; i < tractor.count() && screen < 4; i++) { + Mlt::Producer trackProducer(tractor.track(i)); + kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide"); + if (QString(trackProducer.get("hide")).toInt() != 1) { + kDebug() << "// ADIDNG TRACK: " << i; + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite"); + transition->set("mlt_service", "composite"); + transition->set("a_track", 0); + transition->set("b_track", i); + transition->set("distort", 1); + transition->set("internal_added", "200"); + char *tmp; + switch (screen) { + case 0: + tmp = "0,0:50%x50%"; + break; + case 1: + tmp = "50%,0:50%x50%"; + break; + case 2: + tmp = "0,50%:50%x50%"; + break; + case 3: + tmp = "50%,50%:50%x50%"; + break; + } + transition->set("geometry", tmp); + transition->set("always_active", "1"); + field->plant_transition(*transition, 0, i); + //delete[] tmp; + screen++; + } + } + m_mltConsumer->set("refresh", 1); + } else { + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added"); + if (added == "200") { + mlt_field_disconnect_service(field->get_field(), nextservice); + } + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + m_mltConsumer->set("refresh", 1); + } } - int frameNumber = xml.attribute("frame_thumbnail", 0).toInt(); - if (frameNumber != 0) producer.seek(frameNumber); - mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer.get_producer()); +} +void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { + int height = 50; + int width = (int)(height * m_mltProfile->dar()); QMap < QString, QString > filePropertyMap; QMap < QString, QString > metadataPropertyMap; - KUrl url = xml.attribute("resource", QString::null); + KUrl url = KUrl(xml.attribute("resource", QString::null)); + Mlt::Producer *producer; + if (xml.attribute("type").toInt() == COLOR) { + char *tmp = decodedString("colour:" + xml.attribute("colour")); + producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp); + delete[] tmp; + } else if (url.isEmpty()) { + QDomDocument doc; + QDomElement westley = doc.createElement("westley"); + QDomElement play = doc.createElement("playlist"); + doc.appendChild(westley); + westley.appendChild(play); + play.appendChild(doc.importNode(xml, true)); + kDebug() << "/ / / / /CLIP XML: " << doc.toString(); + char *tmp = decodedString(doc.toString()); + producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); + delete[] tmp; + } else { + char *tmp = decodedString(url.path()); + producer = new Mlt::Producer(*m_mltProfile, tmp); + delete[] tmp; + } + if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); + + if (producer->is_blank()) { + kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: "; + emit removeInvalidClip(clipId); + return; + } + char *tmp = decodedString(clipId); + producer->set("id", tmp); + delete[] tmp; + int frameNumber = xml.attribute("thumbnail", "0").toInt(); + if (frameNumber != 0) producer->seek(frameNumber); + mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer()); + filePropertyMap["filename"] = url.path(); - filePropertyMap["duration"] = QString::number(producer.get_playtime()); - kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); - Mlt::Filter m_convert(*m_mltProfile, "avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - producer.attach(m_convert); - Mlt::Frame * frame = producer.get_frame(); + filePropertyMap["duration"] = QString::number(producer->get_playtime()); + //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); + + Mlt::Frame * frame = producer->get_frame(); + + if (xml.attribute("type").toInt() == SLIDESHOW) { + if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt()); + if (xml.attribute("fade") == "1") { + // user wants a fade effect to slideshow + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); + if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); + if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); + if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { + char *tmp = decodedString(xml.attribute("luma_file")); + filter->set("luma.resource", tmp); + delete[] tmp; + if (xml.hasAttribute("softness")) { + int soft = xml.attribute("softness").toInt(); + filter->set("luma.softness", (double) soft / 100.0); + } + } + Mlt::Service clipService(producer->get_service()); + clipService.attach(*filter); + } + } - //filePropertyMap["fps"] = QString::number(mlt_producer_get_fps(producer.get_producer())); - filePropertyMap["fps"] = producer.get("source_fps"); + + filePropertyMap["fps"] = producer->get("source_fps"); if (frame && frame->is_valid()) { filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + "x" + QString::number(frame->get_int("height")); @@ -416,19 +540,35 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { if (frame->get_int("test_image") == 0) { if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) { filePropertyMap["type"] = "playlist"; - metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer.get_service()), "title")); + metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title")); } else if (frame->get_int("test_audio") == 0) filePropertyMap["type"] = "av"; else filePropertyMap["type"] = "video"; - // Generate thumbnail for this frame - QPixmap pixmap = KThumb::getFrame(&producer, 0, width, height); + mlt_image_format format = mlt_image_yuv422; + int frame_width = 0; + int frame_height = 0; + //frame->set("rescale.interp", "hyper"); + frame->set("normalised_height", height); + frame->set("normalised_width", width); + QPixmap pix(width, height); - emit replyGetImage(clipId, 0, pixmap, width, height); + uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); + uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4); + mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height); + QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); + + if (!image.isNull()) { + pix = pix.fromImage(image.rgbSwapped()); + } else + pix.fill(Qt::black); + + mlt_pool_release(new_image); + emit replyGetImage(clipId, 0, pix, width, height); } else if (frame->get_int("test_audio") == 0) { - QPixmap pixmap(KStandardDirs::locate("appdata", "graphics/music.png")); + QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height)); emit replyGetImage(clipId, 0, pixmap, width, height); filePropertyMap["type"] = "audio"; } @@ -438,19 +578,33 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { // Fetch the video_context #if 1 + AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL); if (context != NULL) { // Get the video_index int index = mlt_properties_get_int(properties, "video_index"); - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) - filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name; - } + +#if ENABLE_FFMPEG_CODEC_DESCRIPTION + if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) { + filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->long_name; + } else +#endif + if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) { + filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name; + } + } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!"; context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL); if (context != NULL) { - // Get the video_index + // Get the audio_index int index = mlt_properties_get_int(properties, "audio_index"); - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) - filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name; + +#if ENABLE_FFMPEG_CODEC_DESCRIPTION + if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) + filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->long_name; + else +#endif + if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) + filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name; } #endif // metadata @@ -465,9 +619,10 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) { metadataPropertyMap[ name.section(".", 0, -2)] = value; } - emit replyGetFileProperties(clipId, filePropertyMap, metadataPropertyMap); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap); kDebug() << "REquested fuile info for: " << url.path(); if (frame) delete frame; + //if (producer) delete producer; } /** Create the producer from the Westley QDomDocument */ @@ -506,6 +661,39 @@ void Render::initSceneList() { setSceneList(doc, 0); } #endif + + + +/** Create the producer from the Westley QDomDocument */ +void Render::setProducer(Mlt::Producer *producer, int position) { + if (m_winid == -1) return; + m_generateScenelist = true; + + if (m_mltConsumer) { + m_mltConsumer->stop(); + } else return; + + if (m_mltProducer) { + m_mltProducer->set_speed(0); + delete m_mltProducer; + m_mltProducer = NULL; + emit stopped(); + } + if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer()); + else m_mltProducer = new Mlt::Producer(); + if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; + + m_fps = m_mltProducer->get_fps(); + connectPlaylist(); + if (position != -1) { + m_mltProducer->seek(position); + emit rendererPosition(position); + } + m_generateScenelist = false; +} + + + /** Create the producer from the Westley QDomDocument */ void Render::setSceneList(QDomDocument list, int position) { setSceneList(list.toString(), position); @@ -516,7 +704,7 @@ void Render::setSceneList(QString playlist, int position) { if (m_winid == -1) return; m_generateScenelist = true; - //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; + kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; /* @@ -528,10 +716,11 @@ void Render::setSceneList(QString playlist, int position) { if (m_mltConsumer) { m_mltConsumer->stop(); - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); } else return; + if (m_mltProducer) { - m_mltProducer->set_speed(0.0); + m_mltProducer->set_speed(0); //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo); delete m_mltProducer; @@ -542,9 +731,11 @@ void Render::setSceneList(QString playlist, int position) { char *tmp = decodedString(playlist); m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); delete[] tmp; + if (m_blackClip) delete m_blackClip; + m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); + m_blackClip->set("id", "black"); if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; - //m_mltProducer->optimise(); - if (position != 0) m_mltProducer->seek(position); + m_mltProducer->optimise(); /*if (KdenliveSettings::osdtimecode()) { // Attach filter for on screen display of timecode @@ -570,9 +761,12 @@ void Render::setSceneList(QString playlist, int position) { }*/ m_fps = m_mltProducer->get_fps(); - emit durationChanged(m_mltProducer->get_playtime()); - //m_connectTimer->start( 1000 ); + kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); connectPlaylist(); + if (position != 0) { + m_mltProducer->seek(position); + emit rendererPosition(position); + } m_generateScenelist = false; } @@ -601,9 +795,12 @@ void Render::saveSceneList(QString path, QDomElement kdenliveData) { char *tmppath = decodedString("westley:" + path); Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath); + m_mltProducer->optimise(); delete[] tmppath; westleyConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); + bool split = m_isSplitView; + if (split) slotSplitView(false); westleyConsumer.connect(prod); //prod.set("title", "kdenlive document"); //westleyConsumer.listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); @@ -625,6 +822,7 @@ void Render::saveSceneList(QString path, QDomElement kdenliveData) { out << doc.toString(); file.close(); } + if (split) slotSplitView(true); } @@ -634,12 +832,12 @@ const double Render::fps() const { void Render::connectPlaylist() { if (!m_mltConsumer) return; - m_connectTimer->stop(); - m_mltConsumer->set("refresh", "0"); + //m_mltConsumer->set("refresh", "0"); m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0.0); + m_mltProducer->set_speed(0); m_mltConsumer->start(); - refresh(); + emit durationChanged(m_mltProducer->get_playtime()); + //refresh(); /* if (m_mltConsumer->start() == -1) { KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); @@ -653,7 +851,7 @@ void Render::connectPlaylist() { void Render::refreshDisplay() { if (!m_mltProducer) return; - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer()); /*if (KdenliveSettings::osdtimecode()) { @@ -711,6 +909,7 @@ void Render::start() { return; } else { kDebug() << "----- MONITOR: " << m_name << " REFRESH"; + m_isBlocked = false; refresh(); } } @@ -718,8 +917,9 @@ void Render::start() { } void Render::clear() { + kDebug() << " ********* RENDER CLEAR"; if (m_mltConsumer) { - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); } @@ -735,7 +935,7 @@ void Render::clear() { void Render::stop() { if (m_mltConsumer && !m_mltConsumer->is_stopped()) { kDebug() << "///////////// RENDER STOPPED: " << m_name; - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); } kDebug() << "///////////// RENDER STOP2-------"; @@ -750,6 +950,7 @@ void Render::stop() { } void Render::stop(const GenTime & startTime) { + kDebug() << "///////////// RENDER STOP-------2"; if (m_mltProducer) { m_mltProducer->set_speed(0.0); @@ -761,24 +962,37 @@ void Render::stop(const GenTime & startTime) { void Render::switchPlay() { if (!m_mltProducer) return; - if (m_mltProducer->get_speed() == 0.0) m_mltProducer->set_speed(1.0); - else { + if (m_mltProducer->get_speed() == 0.0) { + //m_isBlocked = false; + m_mltProducer->set_speed(1.0); + m_mltConsumer->set("refresh", 1); + kDebug() << " ********* RENDER PLAY: " << m_mltProducer->get_speed(); + } else { + //m_isBlocked = true; + m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); - kDebug() << "// POSITON: " << m_framePosition; + //m_isBlocked = true; m_mltProducer->seek((int) m_framePosition); + //kDebug()<<" ********* RENDER PAUSE: "<get_speed(); + //m_mltConsumer->set("refresh", 0); + /*mlt_position position = mlt_producer_position( m_mltProducer->get_producer() ); + m_mltProducer->set_speed(0); + m_mltProducer->seek( position ); + //m_mltProducer->seek((int) m_framePosition); + m_isBlocked = false;*/ } - /*if (speed == 0.0) { m_mltProducer->seek((int) m_framePosition + 1); m_mltConsumer->purge(); }*/ - refresh(); + //refresh(); } void Render::play(double speed) { + kDebug() << " ********* REDNER PLAY"; if (!m_mltProducer) return; - if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); + // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); m_mltProducer->set_speed(speed); /*if (speed == 0.0) { m_mltProducer->seek((int) m_framePosition + 1); @@ -813,6 +1027,7 @@ void Render::play(double speed, const GenTime & startTime, void Render::sendSeekCommand(GenTime time) { + //kDebug()<<" ********* RENDER SEND SEEK"; if (!m_mltProducer) return; //kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps)); @@ -821,9 +1036,9 @@ void Render::sendSeekCommand(GenTime time) { } void Render::seekToFrame(int pos) { + //kDebug()<<" ********* RENDER SEEK TO POS"; if (!m_mltProducer) return; - //kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps)); m_mltProducer->seek(pos); refresh(); } @@ -835,7 +1050,7 @@ void Render::askForRefresh() { void Render::doRefresh() { // Use a Timer so that we don't refresh too much - refresh(); + m_mltConsumer->set("refresh", 1); } void Render::refresh() { @@ -875,8 +1090,7 @@ const QString & Render::rendererName() const { void Render::emitFrameNumber(double position) { - //kDebug()<<"// POSITON: "<activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId)); @@ -907,7 +1121,8 @@ void Render::exportCurrentFrame(KUrl url, bool notify) { int height = 1080;//KdenliveSettings::defaultheight(); int width = 1940; //KdenliveSettings::displaywidth(); - QPixmap pix = KThumb::getFrame(m_mltProducer, -1, width, height); + //TODO: rewrite + QPixmap pix; // = KThumb::getFrame(m_mltProducer, -1, width, height); /* QPixmap pix(width, height); Mlt::Filter m_convert(*m_mltProfile, "avcolour_space"); @@ -948,7 +1163,7 @@ void Render::mltCheckLength(bool reload) { Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); trackDuration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1; - kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration; + //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration; if (trackDuration > duration) duration = trackDuration; trackNb--; } @@ -956,7 +1171,7 @@ void Render::mltCheckLength(bool reload) { Mlt::Producer blackTrackProducer(tractor.track(0)); Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service()); double blackDuration = Mlt::Producer(blackTrackPlaylist.get_producer()).get_playtime() - 1; - kDebug() << " / / /DURATON FOR TRACK 0 = " << blackDuration; + if (blackDuration != duration) { blackTrackPlaylist.remove_region(0, (int)blackDuration); int i = 0; @@ -965,22 +1180,27 @@ void Render::mltCheckLength(bool reload) { QDomElement black = doc.createElement("producer"); black.setAttribute("mlt_service", "colour"); black.setAttribute("colour", "black"); - black.setAttribute("in", "0"); - black.setAttribute("out", "13999"); - while (dur > 14000) { // - mltInsertClip(0, GenTime(i * 14000, m_fps), black); + black.setAttribute("id", "black"); + ItemInfo info; + info.track = 0; + while (dur > 14000) { + info.startPos = GenTime(i * 14000, m_fps); + info.endPos = info.startPos + GenTime(13999, m_fps); + mltInsertClip(info, black, m_blackClip); dur = dur - 14000; i++; } - black.setAttribute("out", QString::number(dur)); - mltInsertClip(0, GenTime(), black); - + if (dur > 0) { + info.startPos = GenTime(i * 14000, m_fps); + info.endPos = info.startPos + GenTime(dur, m_fps); + mltInsertClip(info, black, m_blackClip); + } m_mltProducer->set("out", duration); emit durationChanged((int)duration); } } -void Render::mltInsertClip(int track, GenTime position, QDomElement element) { +void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { if (!m_mltProducer) { kDebug() << "PLAYLIST NOT INITIALISED //////"; return; @@ -990,27 +1210,29 @@ void Render::mltInsertClip(int track, GenTime position, QDomElement element) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; return; } + Mlt::Service service(parentProd.get_service()); Mlt::Tractor tractor(service); - - Mlt::Producer trackProducer(tractor.track(track)); + mlt_service_lock(service.get_service()); + Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - QDomDocument doc; - doc.appendChild(doc.importNode(element, true)); - QString resource = doc.toString(); - char *tmp = decodedString(resource); - Mlt::Producer clip(*m_mltProfile, "westley-xml", tmp); - //clip.set_in_and_out(in.frames(m_fps), out.frames(m_fps)); - delete[] tmp; + Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1); - trackPlaylist.insert_at((int) position.frames(m_fps), clip, 1); - if (track != 0) mltCheckLength(); - tractor.multitrack()->refresh(); - tractor.refresh(); + if (QString(prod->get("transparency")).toInt() == 1) + mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt()); + + mlt_service_unlock(service.get_service()); + + if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(); + //tractor.multitrack()->refresh(); + //tractor.refresh(); } + void Render::mltCutClip(int track, GenTime position) { + m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1019,21 +1241,75 @@ void Render::mltCutClip(int track, GenTime position) { Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - trackPlaylist.split_at((int) position.frames(m_fps)); - trackPlaylist.consolidate_blanks(0); + + + /* // Display playlist info + kDebug()<<"//////////// BEFORE"; + for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "<get_service()); + Mlt::Service dupService(clip->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get("kdenlive_id") != "") { + kDebug() << "++ ADDING FILTER: " << filter->get("kdenlive_id"); + Mlt::Filter *dup = new Mlt::Filter(filter->get_filter()); + dup->set("kdenlive_ix", filter->get("kdenlive_ix")); + dup->set("kdenlive_id", filter->get("kdenlive_id")); + dupService.attach(*dup); + } + ct++; + filter = clipService.filter(ct); + } + mlt_service_unlock(service.get_service()); + + /* // Display playlist info + kDebug()<<"//////////// AFTER"; + for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "<parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; @@ -1041,17 +1317,119 @@ void Render::mltRemoveClip(int track, GenTime position) { Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + + /* // Display playlist info + kDebug()<<"//// BEFORE"; + for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "< clipIndex) mltCheckLength(); m_isBlocked = false; + return true; } -void Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) { - +int Render::mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod) { + m_isBlocked = true; + int newLength = 0; Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps)); + Mlt::Producer clip(trackPlaylist.get_clip(clipIndex)); + QString serv = clip.parent().get("mlt_service"); + QString id = clip.parent().get("id"); + kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service"); + if (serv == "avformat" && speed != 1.0) { + mlt_service_lock(service.get_service()); + QString url = clip.parent().get("resource"); + url.append("?" + QString::number(speed)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + delete[] tmp; + QString producerid = "slowmotion:" + id + ":" + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + newLength = cut->get_length(); + trackPlaylist.replace_with_blank(clipIndex); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + } else if (speed == 1.0) { + mlt_service_lock(service.get_service()); + Mlt::Producer *cut = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + trackPlaylist.replace_with_blank(clipIndex); + newLength = cut->get_length(); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + } else if (serv == "framebuffer") { + mlt_service_lock(service.get_service()); + QString url = clip.parent().get("resource"); + url = url.section("?", 0, 0); + url.append("?" + QString::number(speed)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + delete[] tmp; + QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + newLength = cut->get_length(); + trackPlaylist.replace_with_blank(clipIndex); + trackPlaylist.consolidate_blanks(0); + trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + mlt_service_unlock(service.get_service()); + kDebug() << "AVFORMAT CLIP!!!:"; + } + + m_isBlocked = false; + return newLength; +} +bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) { + + Mlt::Service service(m_mltProducer->parent().get_service()); + bool success = false; Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -1059,7 +1437,7 @@ void Render::mltRemoveEffect(int track, GenTime position, QString index, bool do Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); if (!clip) { kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT"; - return; + return success; } Mlt::Service clipService(clip->get_service()); // if (tag.startsWith("ladspa")) tag = "ladspa"; @@ -1067,18 +1445,19 @@ void Render::mltRemoveEffect(int track, GenTime position, QString index, bool do int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if (index == "-1" || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { - clipService.detach(*filter); + if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { + if (clipService.detach(*filter) == 0) success = true; kDebug() << " / / / DLEETED EFFECT: " << ct; } else ct++; filter = clipService.filter(ct); } m_isBlocked = false; if (doRefresh) refresh(); + return success; } -void Render::mltAddEffect(int track, GenTime position, QMap args, bool doRefresh) { +bool Render::mltAddEffect(int track, GenTime position, QHash args, bool doRefresh) { Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1087,67 +1466,99 @@ void Render::mltAddEffect(int track, GenTime position, QMap a Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); - if (!clip) { - kDebug() << "********** CANNOT FIND CLIP TO APPLY EFFECT-----------"; - return; + return false; } Mlt::Service clipService(clip->get_service()); m_isBlocked = true; // create filter QString tag = args.value("tag"); - //kDebug()<<" / / INSERTING EFFECT: "<is_valid()) - filter->set("kdenlive_id", filterId); - else { - kDebug() << "filter is NULL"; - m_isBlocked = false; - return; - } + char *filterTag = decodedString(tag); + char *filterId = decodedString(args.value("id")); + QHash::Iterator it; + QString kfr = args.value("keyframes"); + + if (!kfr.isEmpty()) { + QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts); + kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes"); + char *starttag = decodedString(args.value("starttag", "start")); + char *endtag = decodedString(args.value("endtag", "end")); + kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; + int duration = clip->get_playtime(); + double max = args.value("max").toDouble(); + double min = args.value("min").toDouble(); + double factor = args.value("factor", "1").toDouble(); + args.remove("starttag"); + args.remove("endtag"); + args.remove("keyframes"); + args.remove("min"); + args.remove("max"); + args.remove("factor"); + int offset = 0; + for (int i = 0; i < keyFrames.size() - 1; ++i) { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + filter->set("kdenlive_id", filterId); + int x1 = keyFrames.at(i).section(":", 0, 0).toInt() + offset; + double y1 = keyFrames.at(i).section(":", 1, 1).toDouble(); + int x2 = keyFrames.at(i + 1).section(":", 0, 0).toInt(); + double y2 = keyFrames.at(i + 1).section(":", 1, 1).toDouble(); + if (x2 == -1) x2 = duration; + for (it = args.begin(); it != args.end(); ++it) { + char *name = decodedString(it.key()); + char *value = decodedString(it.value()); + filter->set(name, value); + delete[] name; + delete[] value; + } - QMap::Iterator it; - QString keyFrameNumber = "#0"; + filter->set("in", x1); + filter->set("out", x2); + //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); + clipService.attach(*filter); + offset = 1; + } + delete[] starttag; + delete[] endtag; + } else { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + if (filter && filter->is_valid()) + filter->set("kdenlive_id", filterId); + else { + kDebug() << "filter is NULL"; + m_isBlocked = false; + return false; + } - for (it = args.begin(); it != args.end(); ++it) { - //kDebug()<<" / / INSERTING EFFECT ARGS: "<set("kdenlive_id", filterId); - keyFrameNumber = currentKeyFrameNumber; - } - key = it.key().section(":", 1); - } else key = it.key(); - char *name = decodedString(key); - char *value = decodedString(it.value()); - filter->set(name, value); - delete[] name; - delete[] value; + for (it = args.begin(); it != args.end(); ++it) { + char *name = decodedString(it.key()); + char *value = decodedString(it.value()); + filter->set(name, value); + delete[] name; + delete[] value; + } + // attach filter to the clip + clipService.attach(*filter); } - // attach filter to the clip - clipService.attach(*filter); delete[] filterId; + delete[] filterTag; m_isBlocked = false; if (doRefresh) refresh(); + return true; } -void Render::mltEditEffect(int track, GenTime position, QMap args) { +bool Render::mltEditEffect(int track, GenTime position, QHash args) { QString index = args.value("kdenlive_ix"); QString tag = args.value("tag"); - QMap::Iterator it = args.begin(); - if (it.key().startsWith("#") || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { + QHash::Iterator it = args.begin(); + if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { // This is a keyframe effect, to edit it, we remove it and re-add it. mltRemoveEffect(track, position, index); - mltAddEffect(track, position, args); - return; + bool success = mltAddEffect(track, position, args); + return success; } // create filter @@ -1160,7 +1571,7 @@ void Render::mltEditEffect(int track, GenTime position, QMap Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); if (!clip) { kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); - return; + return false; } Mlt::Service clipService(clip->get_service()); m_isBlocked = true; @@ -1174,27 +1585,27 @@ void Render::mltEditEffect(int track, GenTime position, QMap filter = clipService.filter(ct); } - if (!filter) { kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!"; - // filter was not found, it was probably a disabled filter, so add it to the correct place... - int ct = 0; - filter = clipService.filter(ct); - QList filtersList; - while (filter) { - if (filter->get("kdenlive_ix") > index) { - filtersList.append(filter); - clipService.detach(*filter); - } else ct++; - filter = clipService.filter(ct); - } - mltAddEffect(track, position, args); - for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); - } + // filter was not found, it was probably a disabled filter, so add it to the correct place... + int ct = 0; + filter = clipService.filter(ct); + QList filtersList; + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) { + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + bool success = mltAddEffect(track, position, args); + + for (int i = 0; i < filtersList.count(); i++) { + clipService.attach(*(filtersList.at(i))); + } m_isBlocked = false; - return; + return success; } for (it = args.begin(); it != args.end(); ++it) { @@ -1207,39 +1618,155 @@ void Render::mltEditEffect(int track, GenTime position, QMap } m_isBlocked = false; refresh(); + return true; } -void Render::mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out) { - m_isBlocked = true; +void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) { + kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) + 1)) - kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; - int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) + 1); + //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + if (!clip) { + kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); + return; + } + Mlt::Service clipService(clip->get_service()); + m_isBlocked = true; + int ct = 0; + QList filtersList; + Mlt::Filter *filter = clipService.filter(ct); + bool found = false; + if (newPos > oldPos) { + while (filter) { + if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + filter = clipService.filter(ct); + while (filter && QString(filter->get("kdenlive_ix")).toInt() <= newPos) { + filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + ct++; + filter = clipService.filter(ct); + } + found = true; + } + if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) { + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } else { + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; - int newDuration = (int) out.frames(m_fps) - 1; + ct = 0; + filter = clipService.filter(ct); + while (filter) { + int pos = QString(filter->get("kdenlive_ix")).toInt(); + if (pos >= newPos) { + if (pos < oldPos) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } - kDebug() << " ** RESIZING CLIP END:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", in: " << in.frames(25) << ", out: " << out.frames(25) << ", PREVIOUS duration: " << previousDuration; - trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), newDuration); - trackPlaylist.consolidate_blanks(0); - if (previousDuration < newDuration) { + for (int i = 0; i < filtersList.count(); i++) { + clipService.attach(*(filtersList.at(i))); + } + + m_isBlocked = false; + refresh(); +} + +bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { + m_isBlocked = true; + + Mlt::Service service(m_mltProducer->parent().get_service()); + + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + + /* // Display playlist info + kDebug()<<"//////////// BEFORE RESIZE"; + for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "<get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + int newDuration = (int) clipDuration.frames(m_fps) - 1; + trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart); + //trackPlaylist.consolidate_blanks(0); + // skip to next clip + clipIndex++; + int diff = newDuration - previousDuration; + kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration; + if (diff > 0) { // clip was made longer, trim next blank if there is one. - if (trackPlaylist.is_blank(clipIndex + 1)) { - trackPlaylist.split(clipIndex + 1, newDuration - previousDuration); - trackPlaylist.remove(clipIndex + 1); + if (trackPlaylist.is_blank(clipIndex)) { + int blankStart = trackPlaylist.clip_start(clipIndex); + int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; + if (diff - blankDuration == 1) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff); + } else { + kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; } - } else trackPlaylist.insert_blank(clipIndex + 1, previousDuration - newDuration - 1); + } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); trackPlaylist.consolidate_blanks(0); - tractor.multitrack()->refresh(); - tractor.refresh(); - if (track != 0) mltCheckLength(); + + /* // Display playlist info + kDebug()<<"//////////// AFTER RESIZE"; + for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "<refresh(); + //tractor.refresh(); + if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); + if (QString(clip->parent().get("transparency")).toInt() == 1) { + //mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt()); + mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); + ItemInfo transpinfo; + transpinfo.startPos = info.startPos; + transpinfo.endPos = info.startPos + clipDuration; + transpinfo.track = info.track; + mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); + } m_isBlocked = false; + return true; } void Render::mltChangeTrackState(int track, bool mute, bool blind) { @@ -1260,47 +1787,72 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) { refresh(); } -void Render::mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out) { - m_isBlocked = true; - +bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { + //kDebug() << "//////// RSIZING CLIP from: "<parent().get_service()); - - int moveFrame = (int)(moveEnd - moveStart).frames(m_fps); - + int moveFrame = (int) diff.frames(m_fps); Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) - 1)) + if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) { kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; - int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) - 1); - kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); - - trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), (int) out.frames(m_fps)); + return false; + } + mlt_service_lock(service.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); + /*int previousStart = trackPlaylist.clip_start(clipIndex); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/ + //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (clip == NULL) { + kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; + mlt_service_unlock(service.get_service()); + return false; + } + //m_mltConsumer->set("refresh", 0); + int previousStart = clip->get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + m_isBlocked = true; + kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame; + trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration); if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1); else { - int midpos = (int)moveStart.frames(m_fps) - 1; //+ (moveFrame / 2) - int blankIndex = trackPlaylist.get_clip_index_at(midpos); + //int midpos = info.startPos.frames(m_fps) + moveFrame - 1; + int blankIndex = clipIndex - 1; int blankLength = trackPlaylist.clip_length(blankIndex); - - kDebug() << " + resizing blank: " << blankIndex << ", Mid: " << midpos << ", Length: " << blankLength << ", SIZE DIFF: " << moveFrame; - + kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame; + if (! trackPlaylist.is_blank(blankIndex)) { + kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK"; + } if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex); else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); } trackPlaylist.consolidate_blanks(0); + if (QString(clip->parent().get("transparency")).toInt() == 1) { + //mltResizeTransparency(previousStart, (int) moveEnd.frames(m_fps), (int) (moveEnd + out - in).frames(m_fps), track, QString(clip->parent().get("id")).toInt()); + mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); + ItemInfo transpinfo; + transpinfo.startPos = info.startPos + diff; + transpinfo.endPos = info.startPos + diff + (info.endPos - info.startPos); + transpinfo.track = info.track; + mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); + } m_isBlocked = false; + //m_mltConsumer->set("refresh", 1); + mlt_service_unlock(service.get_service()); + return true; } -void Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) { - mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps)); +bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) { + return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps)); } -void Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) { +bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) { m_isBlocked = true; m_mltConsumer->set("refresh", 0); - + mlt_service_lock(m_mltConsumer->get_service()); Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; @@ -1308,43 +1860,69 @@ void Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn Mlt::Producer trackProducer(tractor.track(startTrack)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1); - - Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - trackPlaylist.consolidate_blanks(0); - //mlt_events_block( MLT_PRODUCER_PROPERTIES(clipProducer.get_producer()), NULL ); - + kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; + bool checkLength = false; if (endTrack == startTrack) { + //mlt_service_lock(service.get_service()); + Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); + if (!trackPlaylist.is_blank_at(moveEnd)) { - kWarning() << "// ERROR, CLIP COLLISION----------"; - int ix = trackPlaylist.get_clip_index_at(moveEnd); - kDebug() << "BAD CLIP STARTS AT: " << trackPlaylist.clip_start(ix) << ", LENGT: " << trackPlaylist.clip_length(ix); + // error, destination is not empty + //int ix = trackPlaylist.get_clip_index_at(moveEnd); + kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; + mlt_service_unlock(m_mltConsumer->get_service()); + m_isBlocked = false; + return false; + } else { + trackPlaylist.consolidate_blanks(0); + int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); + } + if (newIndex + 1 == trackPlaylist.count()) checkLength = true; } - trackPlaylist.insert_at(moveEnd, clipProducer, 1); - trackPlaylist.consolidate_blanks(0); + //mlt_service_unlock(service.get_service()); } else { - trackPlaylist.consolidate_blanks(0); Mlt::Producer destTrackProducer(tractor.track(endTrack)); Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); - destTrackPlaylist.consolidate_blanks(1); - destTrackPlaylist.insert_at(moveEnd, clipProducer, 1); - destTrackPlaylist.consolidate_blanks(0); + if (!destTrackPlaylist.is_blank_at(moveEnd)) { + // error, destination is not empty + mlt_service_unlock(m_mltConsumer->get_service()); + m_isBlocked = false; + return false; + } else { + Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); + trackPlaylist.consolidate_blanks(0); + destTrackPlaylist.consolidate_blanks(1); + int newIndex = destTrackPlaylist.insert_at(moveEnd, clipProducer, 1); + destTrackPlaylist.consolidate_blanks(0); + if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + kDebug() << "//////// moving clip transparency"; + mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); + } + if (clipIndex > trackPlaylist.count()) checkLength = true; + else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true; + } } - mltCheckLength(); + if (checkLength) mltCheckLength(); + mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked = false; m_mltConsumer->set("refresh", 1); - //mlt_events_unblock( MLT_PRODUCER_PROPERTIES(clipProducer.get_producer()), NULL ); + return true; } -void Render::mltMoveTransition(QString type, int startTrack, int trackOffset, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { - m_isBlocked = true; +void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { + Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); + mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); - mlt_service serv = m_mltProducer->parent().get_service(); + m_isBlocked = true; + mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -1352,7 +1930,7 @@ void Render::mltMoveTransition(QString type, int startTrack, int trackOffset, Ge int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; int new_in = (int)newIn.frames(m_fps); - int new_out = (int)newOut.frames(m_fps) - 1; + int new_out = (int)newOut.frames(m_fps); while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; @@ -1362,32 +1940,35 @@ void Render::mltMoveTransition(QString type, int startTrack, int trackOffset, Ge if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { mlt_transition_set_in_and_out(tr, new_in, new_out); - if (trackOffset != 0) { + if (newTrack - startTrack != 0) { + kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << "x" << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << "x" << newTransitionTrack; + mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); - mlt_properties_set_int(properties, "a_track", mlt_transition_get_a_track(tr) + trackOffset); - mlt_properties_set_int(properties, "b_track", mlt_transition_get_b_track(tr) + trackOffset); + mlt_properties_set_int(properties, "a_track", newTransitionTrack); + mlt_properties_set_int(properties, "b_track", newTrack); //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<set("refresh", 1); } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { - //kDebug() << "update transition" << tag; + // kDebug() << "update transition" << tag << " at pos " << in.frames(25); if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false); mltAddTransition(tag, a_track, b_track, in, out, xml); } - mltSavePlaylist(); + //mltSavePlaylist(); } void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { @@ -1397,7 +1978,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -1413,6 +1994,8 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G int currentIn = (int) mlt_transition_get_in(tr); int currentOut = (int) mlt_transition_get_out(tr); + // kDebug()<<"Looking for transition : " << currentIn <<"x"< map = mltGetTransitionParamsFromXml(xml); QMap::Iterator it; @@ -1432,6 +2015,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G break; } nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); @@ -1441,12 +2025,11 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G } void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { - Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); - m_mltConsumer->set("refresh", 0); + if (do_refresh) m_mltConsumer->set("refresh", 0); mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -1463,15 +2046,17 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack; if (resource == tag && b_track == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { + //kDebug() << " / / / / /DELETE TRANS DOOOMNE"; mlt_field_disconnect_service(field->get_field(), nextservice); break; } nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_mltConsumer->set("refresh", 1); + if (do_refresh) m_mltConsumer->set("refresh", 1); } QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { @@ -1512,11 +2097,144 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { return map; } -void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { - //kDebug() << "-- ADDING TRANSITION: " << tag << ", ON TRACKS: " << a_track << ", " << b_track; - QMap args = mltGetTransitionParamsFromXml(xml); +void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id) { + kDebug() << "///////// ADDING CLIP TRANSPARENCY AT: " << info.startPos.frames(25); + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "composite"); + transition->set_in_and_out((int) info.startPos.frames(m_fps), (int) info.endPos.frames(m_fps) - 1); + transition->set("transparency", id); + transition->set("fill", 1); + transition->set("internal_added", 237); + field->plant_transition(*transition, transitiontrack, info.track); + refresh(); +} + +void Render::mltDeleteTransparency(int pos, int track, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + //if (do_refresh) m_mltConsumer->set("refresh", 0); + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack; + + if (resource == "composite" && track == currentTrack && currentIn == pos && transitionId == id) { + //kDebug() << " / / / / /DELETE TRANS DOOOMNE"; + mlt_field_disconnect_service(field->get_field(), nextservice); + break; + } + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + //if (do_refresh) m_mltConsumer->set("refresh", 1); +} + +void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + mlt_service_lock(service.get_service()); + m_mltConsumer->set("refresh", 0); + m_isBlocked = true; + + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id; + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + //mlt_properties props = MLT_TRANSITION_PROPERTIES(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ; + if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) { + kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd; + mlt_transition_set_in_and_out(tr, newStart, newEnd); + break; + } + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_mltConsumer->set("refresh", 1); + +} + +void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) { + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + + mlt_service_lock(service.get_service()); + m_mltConsumer->set("refresh", 0); + m_isBlocked = true; + + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentaTrack = mlt_transition_get_a_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + //mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); + int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); + //kDebug()<<" + TRANSITION "<set("refresh", 1); +} + + +void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) { + + QMap args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -1524,7 +2242,8 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, char *transId = decodedString(tag); Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId); - transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps)); + if (out != GenTime()) + transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps)); QMap::Iterator it; QString key;