X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=2acfe0f6c2f45b697d09d00c9640bd77d9f7639f;hb=c45bc0a73244411dbc8c6fc486f66e88f152462c;hp=3e18730174c408034b15898a708d2a7d5a72019b;hpb=fefb8e4376d675868a11c438f18c1a059d0cfced;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 3e187301..2acfe0f6 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -43,14 +43,17 @@ #include #include #include +#include #include #include #include + static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl) { +// kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified(); if (level > MLT_LOG_ERROR) return; QString error; QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified())); @@ -61,7 +64,6 @@ static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list 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->m_isBlocked) return; Mlt::Frame frame(frame_ptr); if (!frame.is_valid()) return; self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); @@ -81,7 +83,6 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr static void consumer_paused(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->m_isBlocked) return; self->emitConsumerStopped(); } @@ -89,7 +90,6 @@ static void consumer_paused(mlt_consumer, Render * self, mlt_frame /*frame_ptr*/ static void consumer_gl_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->m_isBlocked) return; Mlt::Frame frame(frame_ptr); self->showFrame(frame); if (frame.get_double("_speed") == 0.0) { @@ -102,7 +102,6 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : AbstractRender(rendererName, parent), - m_isBlocked(0), analyseAudio(KdenliveSettings::monitor_audio()), m_name(rendererName), m_mltConsumer(NULL), @@ -118,7 +117,6 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget { if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); buildConsumer(profile); - m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); @@ -126,16 +124,19 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget Render::~Render() { - m_isBlocked = 1; closeMlt(); delete m_mltProfile; } void Render::closeMlt() -{ +{ //delete m_osdTimer; - if (m_mltProducer) { + m_requestList.clear(); + m_infoThread.waitForFinished(); + if (m_mltConsumer) delete m_mltConsumer; + if (m_mltProducer) delete m_mltProducer; + /*if (m_mltProducer) { Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); @@ -158,21 +159,14 @@ void Render::closeMlt() resource = mlt_properties_get(properties, "mlt_service"); } - for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { - Mlt::Producer trackProducer(tractor.track(trackNb)); - Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); - } delete field; field = NULL; } mlt_service_unlock(service.get_service()); - } + }*/ kDebug() << "// // // CLOSE RENDERER " << m_name; - delete m_mltConsumer; - delete m_mltProducer; - delete m_blackClip; + if (m_blackClip) delete m_blackClip; //delete m_osdInfo; } @@ -181,20 +175,20 @@ void Render::slotSwitchFullscreen() if (m_mltConsumer) m_mltConsumer->set("full_screen", 1); } -void Render::buildConsumer(const QString profileName) +void Render::buildConsumer(const QString &profileName) { - m_activeProfile = profileName; - char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); - setenv("MLT_PROFILE", tmp, 1); delete m_blackClip; m_blackClip = NULL; //TODO: uncomment following line when everything is clean // uncommented Feb 2011 --Granjow if (m_mltProfile) delete m_mltProfile; - + m_activeProfile = profileName; + char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); + setenv("MLT_PROFILE", tmp, 1); m_mltProfile = new Mlt::Profile(tmp); - m_mltProfile->get_profile()->is_explicit = 1; + m_mltProfile->set_explicit(true); + kDebug()<<"// ********* PROFILE AR: "<dar(); delete[] tmp; m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); @@ -282,15 +276,25 @@ void Render::buildConsumer(const QString profileName) Mlt::Producer *Render::invalidProducer(const QString &id) { - Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + Mlt::Producer *clip; + QString txt = "+" + i18n("Missing clip") + ".txt"; + char *tmp = qstrdup(txt.toUtf8().constData()); + clip = new Mlt::Producer(*m_mltProfile, tmp); + delete[] tmp; + if (clip == NULL) clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + else { + clip->set("bgcolour", "0xff0000ff"); + clip->set("pad", "10"); + } clip->set("id", id.toUtf8().constData()); clip->set("mlt_type", "producer"); return clip; } -int Render::resetProfile(const QString profileName) +int Render::resetProfile(const QString &profileName, bool dropSceneList) { - QString scene = sceneList(); + QString scene; + if (!dropSceneList) scene = sceneList(); if (m_mltConsumer) { if (m_externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; @@ -316,6 +320,8 @@ int Render::resetProfile(const QString profileName) double current_dar = m_mltProfile->dar(); delete m_blackClip; m_blackClip = NULL; + m_requestList.clear(); + m_infoThread.waitForFinished(); if (m_mltProducer) { pos = m_mltProducer->position(); @@ -336,31 +342,17 @@ int Render::resetProfile(const QString profileName) buildConsumer(profileName); double new_fps = m_mltProfile->fps(); double new_dar = m_mltProfile->dar(); - if (current_fps != new_fps) { - // fps changed, we must update the scenelist positions - scene = updateSceneListFps(current_fps, new_fps, scene); + + if (!dropSceneList) { + // We need to recover our playlist + if (current_fps != new_fps) { + // fps changed, we must update the scenelist positions + scene = updateSceneListFps(current_fps, new_fps, scene); + } + setSceneList(scene, pos); + // producers have changed (different profile), so reset them... + emit refreshDocumentProducers(new_dar != current_dar, current_fps != new_fps); } - //kDebug() << "//RESET WITHSCENE: " << scene; - setSceneList(scene, pos); - // producers have changed (different profile), so reset them... - emit refreshDocumentProducers(new_dar != current_dar); - /*Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", scene.toUtf8().constData()); - m_mltProducer = producer; - 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()); - //mlt_profile prof = m_mltProfile->get_profile(); - //mlt_properties_set_data(properties, "_profile", prof, 0, (mlt_destructor)mlt_profile_close, NULL); - //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()); - - //apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties ); - //refresh(); return 1; } @@ -368,7 +360,6 @@ void Render::seek(GenTime time) { if (!m_mltProducer) return; - m_isBlocked = false; m_mltProducer->seek((int)(time.frames(m_fps))); refresh(); } @@ -377,7 +368,6 @@ void Render::seek(int time) { if (!m_mltProducer) return; - m_isBlocked = false; m_mltProducer->seek(time); refresh(); } @@ -418,15 +408,15 @@ int Render::renderHeight() const QImage Render::extractFrame(int frame_position, QString path, int width, int height) { if (width == -1) { - width = renderWidth(); + width = frameRenderWidth(); height = renderHeight(); } else if (width % 2 == 1) width++; - + int dwidth = height * frameRenderWidth() / renderHeight(); if (!path.isEmpty()) { Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); if (producer) { if (producer->is_valid()) { - QImage img = KThumb::getFrame(producer, frame_position, width, height); + QImage img = KThumb::getFrame(producer, frame_position, dwidth, width, height); delete producer; return img; } @@ -439,7 +429,7 @@ QImage Render::extractFrame(int frame_position, QString path, int width, int hei pix.fill(Qt::black); return pix; } - return KThumb::getFrame(m_mltProducer, frame_position, width, height); + return KThumb::getFrame(m_mltProducer, frame_position, dwidth, width, height); } QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/) @@ -563,153 +553,197 @@ void Render::slotSplitView(bool doit) } } -void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip) +void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer) +{ + requestClipInfo info; + info.xml = xml; + info.clipId = clipId; + info.imageHeight = imageHeight; + info.replaceProducer = replaceProducer; + m_requestList.append(info); + if (!m_infoThread.isRunning()) + m_infoThread = QtConcurrent::run(this, &Render::getFileProperties2); +} + +void Render::forceProcessing(const QString &id) { + m_infoMutex.lock(); + for (int i = 0; i < m_requestList.count(); i++) { + requestClipInfo info = m_requestList.at(i); + if (info.clipId == id) { + if (i == 0) break; + else { + m_requestList.removeAt(i); + m_requestList.prepend(info); + break; + } + } + } + m_infoMutex.unlock(); +} + +int Render::processingItems() const +{ + int count = m_requestList.count(); + if (m_infoThread.isRunning()) count++; + return count; +} + +void Render::getFileProperties2() +{ + while (!m_requestList.isEmpty()) { + m_infoMutex.lock(); + requestClipInfo info = m_requestList.takeFirst(); + m_infoMutex.unlock(); + QString path; + QLocale locale; bool proxyProducer; - if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") { - path = xml.attribute("proxy"); + if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") { + path = info.xml.attribute("proxy"); proxyProducer = true; } else { - path = xml.attribute("resource"); + path = info.xml.attribute("resource"); proxyProducer = false; } - - KUrl url = KUrl(path); + KUrl url(path); Mlt::Producer *producer = NULL; - CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt(); - //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; - /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { + CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt(); + //kDebug() << "PROFILE WIDT: "<< info.xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; + /*if (info.xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); return; }*/ if (type == COLOR) { - producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + info.xml.attribute("colour")).toUtf8().constData()); } else if (type == TEXT) { - producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData()); - if (producer && producer->is_valid() && xml.hasAttribute("xmldata")) - producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + info.xml.attribute("resource")).toUtf8().constData()); + if (producer && producer->is_valid() && info.xml.hasAttribute("xmldata")) + producer->set("xmldata", info.xml.attribute("xmldata").toUtf8().constData()); } else if (url.isEmpty()) { QDomDocument doc; QDomElement mlt = doc.createElement("mlt"); QDomElement play = doc.createElement("playlist"); doc.appendChild(mlt); mlt.appendChild(play); - play.appendChild(doc.importNode(xml, true)); + play.appendChild(doc.importNode(info.xml, true)); producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); } else { - producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); } if (producer == NULL || producer->is_blank() || !producer->is_valid()) { - kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "; + kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("out", xml.attribute("proxy_out").toInt()); - if (producer->get_out() != xml.attribute("proxy_out").toInt()) { + if (proxyProducer && info.xml.hasAttribute("proxy_out")) { + producer->set("length", info.xml.attribute("proxy_out").toInt() + 1); + producer->set("out", info.xml.attribute("proxy_out").toInt()); + if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) { // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip - emit removeInvalidProxy(clipId, true); + emit removeInvalidProxy(info.clipId, true); delete producer; - return; + continue; } } - if (xml.hasAttribute("force_aspect_ratio")) { - double aspect = xml.attribute("force_aspect_ratio").toDouble(); + if (info.xml.hasAttribute("force_aspect_ratio")) { + double aspect = info.xml.attribute("force_aspect_ratio").toDouble(); if (aspect > 0) producer->set("force_aspect_ratio", aspect); } - if (xml.hasAttribute("force_aspect_num") && xml.hasAttribute("force_aspect_den")) { - int width = xml.attribute("frame_size").section('x', 0, 0).toInt(); - int height = xml.attribute("frame_size").section('x', 1, 1).toInt(); - int aspectNumerator = xml.attribute("force_aspect_num").toInt(); - int aspectDenominator = xml.attribute("force_aspect_den").toInt(); + if (info.xml.hasAttribute("force_aspect_num") && info.xml.hasAttribute("force_aspect_den")) { + int width = info.xml.attribute("frame_size").section('x', 0, 0).toInt(); + int height = info.xml.attribute("frame_size").section('x', 1, 1).toInt(); + int aspectNumerator = info.xml.attribute("force_aspect_num").toInt(); + int aspectDenominator = info.xml.attribute("force_aspect_den").toInt(); if (aspectDenominator != 0 && width != 0) producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width); } - if (xml.hasAttribute("force_fps")) { - double fps = xml.attribute("force_fps").toDouble(); + if (info.xml.hasAttribute("force_fps")) { + double fps = info.xml.attribute("force_fps").toDouble(); if (fps > 0) producer->set("force_fps", fps); } - if (xml.hasAttribute("force_progressive")) { + if (info.xml.hasAttribute("force_progressive")) { bool ok; - int progressive = xml.attribute("force_progressive").toInt(&ok); + int progressive = info.xml.attribute("force_progressive").toInt(&ok); if (ok) producer->set("force_progressive", progressive); } - if (xml.hasAttribute("force_tff")) { + if (info.xml.hasAttribute("force_tff")) { bool ok; - int fieldOrder = xml.attribute("force_tff").toInt(&ok); + int fieldOrder = info.xml.attribute("force_tff").toInt(&ok); if (ok) producer->set("force_tff", fieldOrder); } - if (xml.hasAttribute("threads")) { - int threads = xml.attribute("threads").toInt(); + if (info.xml.hasAttribute("threads")) { + int threads = info.xml.attribute("threads").toInt(); if (threads != 1) producer->set("threads", threads); } - if (xml.hasAttribute("video_index")) { - int vindex = xml.attribute("video_index").toInt(); + if (info.xml.hasAttribute("video_index")) { + int vindex = info.xml.attribute("video_index").toInt(); if (vindex != 0) producer->set("video_index", vindex); } - if (xml.hasAttribute("audio_index")) { - int aindex = xml.attribute("audio_index").toInt(); + if (info.xml.hasAttribute("audio_index")) { + int aindex = info.xml.attribute("audio_index").toInt(); if (aindex != 0) producer->set("audio_index", aindex); } - if (xml.hasAttribute("force_colorspace")) { - int colorspace = xml.attribute("force_colorspace").toInt(); + if (info.xml.hasAttribute("force_colorspace")) { + int colorspace = info.xml.attribute("force_colorspace").toInt(); if (colorspace != 0) producer->set("force_colorspace", colorspace); } - if (xml.hasAttribute("full_luma")) { - int full_luma = xml.attribute("full_luma").toInt(); + if (info.xml.hasAttribute("full_luma")) { + int full_luma = info.xml.attribute("full_luma").toInt(); if (full_luma != 0) producer->set("set.force_full_luma", full_luma); } int clipOut = 0; int duration = 0; - if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt(); + if (info.xml.hasAttribute("out")) clipOut = info.xml.attribute("out").toInt(); // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) { int length; - if (xml.hasAttribute("length")) { + if (info.xml.hasAttribute("length")) { if (clipOut > 0) duration = clipOut + 1; - length = xml.attribute("length").toInt(); + length = info.xml.attribute("length").toInt(); clipOut = length - 1; } - else length = xml.attribute("out").toInt() - xml.attribute("in").toInt(); + else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt(); producer->set("length", length); } - if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut); + if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut); - producer->set("id", clipId.toUtf8().constData()); + producer->set("id", info.clipId.toUtf8().constData()); - if (xml.hasAttribute("templatetext")) - producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData()); + if (info.xml.hasAttribute("templatetext")) + producer->set("templatetext", info.xml.attribute("templatetext").toUtf8().constData()); - if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) { + if ((!info.replaceProducer && info.xml.hasAttribute("file_hash")) || info.xml.hasAttribute("proxy")) { // Clip already has all properties - emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip); - return; + if (info.replaceProducer) emit blockClipMonitor(info.clipId); + emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer, true); + continue; } - int width = (int)(imageHeight * m_mltProfile->dar() + 0.5); - QMap < QString, QString > filePropertyMap; - QMap < QString, QString > metadataPropertyMap; + int imageWidth = (int)((double) info.imageHeight * m_mltProfile->width() / m_mltProfile->height() + 0.5); + int fullWidth = (int)((double) info.imageHeight * m_mltProfile->dar() + 0.5); + stringMap filePropertyMap; + stringMap metadataPropertyMap; - int frameNumber = xml.attribute("thumbnail", "0").toInt(); + int frameNumber = info.xml.attribute("thumbnail", "0").toInt(); if (frameNumber != 0) producer->seek(frameNumber); filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime()); @@ -718,15 +752,15 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int Mlt::Frame *frame = producer->get_frame(); if (type == SLIDESHOW) { - int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; + int ttl = info.xml.hasAttribute("ttl") ? info.xml.attribute("ttl").toInt() : 0; if (ttl) producer->set("ttl", ttl); - if (!xml.attribute("animation").isEmpty()) { + if (!info.xml.attribute("animation").isEmpty()) { Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine"); if (filter && filter->is_valid()) { int cycle = ttl; - QString geometry = SlideshowClip::animationToGeometry(xml.attribute("animation"), cycle); + QString geometry = SlideshowClip::animationToGeometry(info.xml.attribute("animation"), cycle); if (!geometry.isEmpty()) { - if (xml.attribute("animation").contains("low-pass")) { + if (info.xml.attribute("animation").contains("low-pass")) { Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur"); if (blur && blur->is_valid()) producer->attach(*blur); @@ -737,23 +771,23 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } } } - if (xml.attribute("fade") == "1") { + if (info.xml.attribute("fade") == "1") { // user wants a fade effect to slideshow Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); if (filter && filter->is_valid()) { if (ttl) filter->set("cycle", ttl); - if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("duration", xml.attribute("luma_duration").toInt()); - if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { - filter->set("luma.resource", xml.attribute("luma_file").toUtf8().constData()); - if (xml.hasAttribute("softness")) { - int soft = xml.attribute("softness").toInt(); + if (info.xml.hasAttribute("luma_duration") && !info.xml.attribute("luma_duration").isEmpty()) filter->set("duration", info.xml.attribute("luma_duration").toInt()); + if (info.xml.hasAttribute("luma_file") && !info.xml.attribute("luma_file").isEmpty()) { + filter->set("luma.resource", info.xml.attribute("luma_file").toUtf8().constData()); + if (info.xml.hasAttribute("softness")) { + int soft = info.xml.attribute("softness").toInt(); filter->set("luma.softness", (double) soft / 100.0); } } producer->attach(*filter); } } - if (xml.attribute("crop") == "1") { + if (info.xml.attribute("crop") == "1") { // user wants to center crop the slides Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop"); if (filter && filter->is_valid()) { @@ -764,7 +798,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } if (producer->get_double("meta.media.frame_rate_den") > 0) { - filePropertyMap["fps"] = QString::number(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); + filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); } else filePropertyMap["fps"] = producer->get("source_fps"); if (frame && frame->is_valid()) { @@ -783,26 +817,12 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int filePropertyMap["type"] = "video"; int variance; - mlt_image_format format = mlt_image_rgb24a; - int frame_width = width; - int frame_height = imageHeight; - QPixmap pix; + QImage img; do { variance = 100; - uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); - QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied); - - if (!image.isNull()) { - if (frame_width > (2 * width)) { - // there was a scaling problem, do it manually - QImage scaled = image.scaled(width, imageHeight); - pix = QPixmap::fromImage(scaled.rgbSwapped()); - } else pix = QPixmap::fromImage(image.rgbSwapped()); - variance = KThumb::imageVariance(image); - } else - pix.fill(Qt::black); - - if (frameNumber == 0 && variance < 6) { + img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight); + variance = KThumb::imageVariance(img); + if (frameNumber == 0 && variance< 6) { // Thumbnail is not interesting (for example all black, seek to fetch better thumb frameNumber = 100; producer->seek(frameNumber); @@ -811,11 +831,9 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int variance = -1; } } while (variance == -1); - emit replyGetImage(clipId, pix); - + emit replyGetImage(info.clipId, img); } else if (frame->get_int("test_audio") == 0) { - QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, imageHeight)); - emit replyGetImage(clipId, pixmap); + emit replyGetImage(info.clipId, "audio-x-generic", fullWidth, info.imageHeight); filePropertyMap["type"] = "audio"; } } @@ -890,9 +908,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip); + if (info.replaceProducer) emit blockClipMonitor(info.clipId); + emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer); // FIXME: should delete this to avoid a leak... //delete producer; + } } @@ -936,21 +956,26 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { + QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; - if (m_mltConsumer) { - m_mltConsumer->stop(); - } else return -1; + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); + } + m_mltConsumer->set("refresh", 0); + } + else { + return -1; + } - m_mltConsumer->purge(); - m_isBlocked = true; if (m_mltProducer) { m_mltProducer->set_speed(0); delete m_mltProducer; m_mltProducer = NULL; emit stopped(); } - if (producer) { + blockSignals(true); + if (producer && producer->is_valid()) { m_mltProducer = new Mlt::Producer(producer->get_producer()); } else m_mltProducer = m_blackClip->cut(0, 50); @@ -961,13 +986,13 @@ int Render::setProducer(Mlt::Producer *producer, int position) int volume = KdenliveSettings::volume(); m_mltProducer->set("meta.volume", (double)volume / 100); m_fps = m_mltProducer->get_fps(); + blockSignals(false); int error = connectPlaylist(); if (position != -1) { m_mltProducer->seek(position); emit rendererPosition(position); } else emit rendererPosition((int) m_mltProducer->position()); - m_isBlocked = false; return error; } @@ -979,10 +1004,9 @@ int Render::setSceneList(QDomDocument list, int position) int Render::setSceneList(QString playlist, int position) { if (m_winid == -1) return -1; - m_isBlocked = true; int error = 0; - //kDebug() << "////// RENDER, SET SCENE LIST: " << playlist; + //kDebug() << "////// RENDER, SET SCENE LIST:\n" << playlist <<"\n..........:::."; // Remove previous profile info QDomDocument doc; @@ -1000,12 +1024,14 @@ int Render::setSceneList(QString playlist, int position) kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER"; error = -1; } + m_requestList.clear(); + m_infoThread.waitForFinished(); if (m_mltProducer) { m_mltProducer->set_speed(0); //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo); - Mlt::Service service(m_mltProducer->parent().get_service()); + /*Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); if (service.type() == tractor_type) { @@ -1035,7 +1061,7 @@ int Render::setSceneList(QString playlist, int position) } delete field; } - mlt_service_unlock(service.get_service()); + mlt_service_unlock(service.get_service());*/ qDeleteAll(m_slowmotionProducers.values()); m_slowmotionProducers.clear(); @@ -1046,11 +1072,7 @@ int Render::setSceneList(QString playlist, int position) } blockSignals(true); - // TODO: Better way to do this - if (KdenliveSettings::projectloading_avformatnovalidate()) - playlist.replace(">avformat", ">avformat-novalidate"); - else - playlist.replace(">avformat-novalidate", ">avformat"); + m_locale = QLocale(); m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); if (!m_mltProducer || !m_mltProducer->is_valid()) { @@ -1058,6 +1080,7 @@ int Render::setSceneList(QString playlist, int position) m_mltProducer = m_blackClip->cut(0, 50); error = -1; } + checkMaxThreads(); int volume = KdenliveSettings::volume(); m_mltProducer->set("meta.volume", (double)volume / 100); m_mltProducer->optimise(); @@ -1093,8 +1116,6 @@ int Render::setSceneList(QString playlist, int position) if (error == 0) error = connectPlaylist(); else connectPlaylist(); fillSlowMotionProducers(); - - m_isBlocked = false; blockSignals(false); return error; @@ -1102,6 +1123,27 @@ int Render::setSceneList(QString playlist, int position) //if (position != 0) emit rendererPosition(position); } +void Render::checkMaxThreads() +{ + // Make sure we don't use too much threads, MLT avformat does not cope with too much threads + // Currently, Kdenlive uses the following avformat threads: + // One thread to get info when adding a clip + // One thread to create the timeline video thumbnails + // One thread to create the audio thumbnails + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } + Mlt::Tractor tractor(service); + int mltMaxThreads = mlt_service_cache_get_size(service.get_service(), "producer_avformat"); + int requestedThreads = tractor.count() + 4; + if (requestedThreads > mltMaxThreads) { + mlt_service_cache_set_size(service.get_service(), "producer_avformat", requestedThreads); + kDebug()<<"// MLT threads updated to: "<optimise(); xmlConsumer.set("terminate_on_pause", 1); @@ -1253,37 +1294,30 @@ void Render::slotOsdTimeout() void Render::start() { - kDebug() << "----- STARTING MONITOR: " << m_name; if (m_winid == -1) { kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } if (m_mltConsumer && m_mltConsumer->is_stopped()) { - kDebug() << "----- MONITOR: " << m_name << " WAS STOPPED"; 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.")); kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR"; } else { - kDebug() << "----- MONITOR: " << m_name << " REFRESH"; - m_isBlocked = false; refresh(); } } - m_isBlocked = false; } void Render::stop() { if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - kDebug() << "///////////// RENDER STOPPED: " << m_name; + //kDebug() << "///////////// RENDER STOPPED: " << m_name; //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); // delete m_mltConsumer; // m_mltConsumer = NULL; } - kDebug() << "///////////// RENDER STOP2-------"; - m_isBlocked = true; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); @@ -1291,13 +1325,10 @@ void Render::stop() //m_mltProducer->set("out", m_mltProducer->get_length() - 1); //kDebug() << m_mltProducer->get_length(); } - kDebug() << "///////////// RENDER STOP3-------"; } void Render::stop(const GenTime & startTime) { - - kDebug() << "///////////// RENDER STOP-------2"; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1312,7 +1343,6 @@ void Render::pause() return; if (m_mltProducer->get_speed() == 0.0) return; if (m_isZoneMode) resetZoneMode(); - m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); /* @@ -1328,17 +1358,22 @@ void Render::switchPlay(bool play) return; if (m_isZoneMode) resetZoneMode(); if (play && m_mltProducer->get_speed() == 0.0) { - m_isBlocked = false; if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); + if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); } else if (!play) { - m_isBlocked = true; - m_mltConsumer->set("refresh", 0); + stop(); + m_mltConsumer->set("refresh", "0"); + m_framePosition++; + m_mltProducer->seek(m_framePosition); + /*m_mltConsumer->set("refresh", 0); + m_mltConsumer->stop(); + m_mltConsumer->purge(); m_mltProducer->set_speed(0.0); - //emit rendererPosition(m_framePosition); + //m_framePosition = m_mltProducer->position(); m_mltProducer->seek(m_framePosition); - //m_mltConsumer->purge(); + emit rendererPosition(m_framePosition);*/ } } @@ -1347,7 +1382,6 @@ void Render::play(double speed) if (!m_mltProducer) return; // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); - m_isBlocked = false; m_mltProducer->set_speed(speed); /*if (speed == 0.0) { m_mltProducer->seek((int) m_framePosition + 1); @@ -1360,7 +1394,6 @@ void Render::play(const GenTime & startTime) { if (!m_mltProducer || !m_mltConsumer) return; - m_isBlocked = false; m_mltProducer->seek((int)(startTime.frames(m_fps))); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); @@ -1380,7 +1413,6 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { if (!m_mltProducer || !m_mltConsumer) return; - m_isBlocked = false; if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; m_mltProducer->set("out", (int)(stopTime.frames(m_fps))); m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1400,10 +1432,8 @@ void Render::resetZoneMode() void Render::seekToFrame(int pos) { - //kDebug()<<" ********* RENDER SEEK TO POS"; if (!m_mltProducer) return; - m_isBlocked = false; resetZoneMode(); m_mltProducer->seek(pos); refresh(); @@ -1411,10 +1441,8 @@ void Render::seekToFrame(int pos) void Render::seekToFrameDiff(int diff) { - //kDebug()<<" ********* RENDER SEEK TO POS"; if (!m_mltProducer) return; - m_isBlocked = false; resetZoneMode(); m_mltProducer->seek(m_mltProducer->position() + diff); refresh(); @@ -1423,15 +1451,19 @@ void Render::seekToFrameDiff(int diff) void Render::doRefresh() { // Use a Timer so that we don't refresh too much - if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1); + if (m_mltConsumer) { + if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); + m_mltConsumer->set("refresh", 1); + } } void Render::refresh() { - if (!m_mltProducer || m_isBlocked) + if (!m_mltProducer) return; if (m_mltConsumer) { m_mltConsumer->set("refresh", 1); + if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); } } @@ -1478,13 +1510,13 @@ const QString & Render::rendererName() const void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame.get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32); - memcpy(qimage.bits(), image, width * height * 4); - emit frameUpdated(qimage.rgbSwapped()); + QImage qimage(width, height, QImage::Format_RGB888); + memcpy(qimage.bits(), image, width * height * 3); + emit frameUpdated(qimage); } void Render::emitFrameNumber(double position) @@ -1638,20 +1670,20 @@ void Render::mltCheckLength(Mlt::Tractor *tractor) Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element) { if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod; - + QLocale locale; // We want a slowmotion producer double speed = element.attribute("speed", "1.0").toDouble(); int strobe = element.attribute("strobe", "1").toInt(); QString url = QString::fromUtf8(prod->get("resource")); - url.append('?' + QString::number(speed)); + url.append('?' + locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); - QString id = prod->get("id"); + QString id = prod->parent().get("id"); if (id.contains('_')) id = id.section('_', 0, 0); - QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id + ':' + locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); m_slowmotionProducers.insert(url, slowprod); @@ -1727,8 +1759,6 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro void Render::mltCutClip(int track, GenTime position) { - m_isBlocked = true; - Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; @@ -1755,7 +1785,6 @@ void Render::mltCutClip(int track, GenTime position) int clipIndex = trackPlaylist.get_clip_index_at(cutPos); if (trackPlaylist.is_blank(clipIndex)) { kDebug() << "// WARNING, TRYING TO CUT A BLANK"; - m_isBlocked = false; return; } mlt_service_lock(service.get_service()); @@ -1804,7 +1833,6 @@ void Render::mltCutClip(int track, GenTime position) kDebug()<<"CLIP "< trackClipStartList, QMap trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) +void Render::mltInsertSpace(QMap trackClipStartList, QMap trackTransitionStartList, int track, const GenTime &duration, const GenTime &timeOffset) { if (!m_mltProducer) { kDebug() << "PLAYLIST NOT INITIALISED //////"; @@ -2129,13 +2142,13 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double /*oldspeed*/, int strobe, 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"; return -1; } + //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)); @@ -2167,13 +2180,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) { mlt_service_lock(service.get_service()); QString url = QString::fromUtf8(clipparent.get("resource")); - url.append('?' + QString::number(speed)); + url.append('?' + m_locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); - QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id + ':' + m_locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); // copy producer props @@ -2246,13 +2259,13 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou mlt_service_lock(service.get_service()); QString url = QString::fromUtf8(clipparent.get("resource")); url = url.section('?', 0, 0); - url.append('?' + QString::number(speed)); + url.append('?' + m_locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); slowprod->set("strobe", strobe); - QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); + QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + m_locale.toString(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); slowprod->set("id", producerid.toUtf8().constData()); // copy producer props @@ -2303,11 +2316,10 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou } delete original; if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); - m_isBlocked = false; return newLength; } -bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) +bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex) { Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; @@ -2316,27 +2328,25 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); Mlt::Service clipService(trackPlaylist.get_service()); - m_isBlocked = true; mlt_service_lock(service.get_service()); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) { + if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) { if (clipService.detach(*filter) == 0) success = true; } else if (updateIndex) { // Adjust the other effects index - if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); } - m_isBlocked = false; mlt_service_unlock(service.get_service()); refresh(); return success; } -bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) +bool Render::mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh) { if (position < GenTime()) { // Remove track effect @@ -2364,23 +2374,20 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up } delete clip; -// if (tag.startsWith("ladspa")) tag = "ladspa"; - m_isBlocked = true; mlt_service_lock(service.get_service()); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) { + if ((index == -1 && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; //kDebug()<<"Deleted filter id:"<get("kdenlive_id")<<", ix:"<get("kdenlive_ix")<<", SERVICE:"<get("mlt_service"); } else if (updateIndex) { // Adjust the other effects index - if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); } - m_isBlocked = false; mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return success; @@ -2429,7 +2436,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int const int filter_ix = params.paramValue("kdenlive_ix").toInt(); const QString region = params.paramValue("region"); int ct = 0; - m_isBlocked = true; mlt_service_lock(service.get_service()); Mlt::Filter *filter = service.filter(ct); @@ -2454,7 +2460,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int ct++; filter = service.filter(ct); } - m_isBlocked = false; mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; @@ -2475,7 +2480,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int // create filter QString tag = params.paramValue("tag"); - kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; + //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; char *filterTag = qstrdup(tag.toUtf8().constData()); char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); QHash::Iterator it; @@ -2483,19 +2488,21 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int if (!kfr.isEmpty()) { QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); - kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); + //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData()); char *endtag = qstrdup(params.paramValue("endtag", "end").toUtf8().constData()); - kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; + //kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; //double max = params.paramValue("max").toDouble(); double min = params.paramValue("min").toDouble(); double factor = params.paramValue("factor", "1").toDouble(); + double paramOffset = params.paramValue("offset", "0").toDouble(); params.removeParam("starttag"); params.removeParam("endtag"); params.removeParam("keyframes"); params.removeParam("min"); params.removeParam("max"); params.removeParam("factor"); + params.removeParam("offset"); int offset = 0; // Special case, only one keyframe, means we want a constant value if (keyFrames.count() == 1) { @@ -2509,7 +2516,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } filter->set("in", x1); //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data()); service.attach(*filter); } } else for (int i = 0; i < keyFrames.size() - 1; ++i) { @@ -2529,8 +2536,8 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int 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()); + filter->set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data()); + filter->set(endtag, m_locale.toString(((min + y2) - paramOffset) / factor).toUtf8().data()); service.attach(*filter); offset = 1; } @@ -2556,11 +2563,15 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } } else { kDebug() << "filter is NULL"; - m_isBlocked = false; mlt_service_unlock(service.get_service()); return false; } params.removeParam("kdenlive_id"); + if (params.hasParam("_sync_in_out")) { + // This effect must sync in / out with parent clip + params.removeParam("_sync_in_out"); + filter->set_in_and_out(service.get_int("in"), service.get_int("out")); + } for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); @@ -2582,10 +2593,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter->set("effect", effectArgs.simplified().toUtf8().constData()); } - if (params.paramValue("id") == "pan_zoom") { - filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1); - } - // attach filter to the clip service.attach(*filter); } @@ -2599,7 +2606,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); service.attach(*filter); } - m_isBlocked = false; mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; @@ -2612,7 +2618,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); Mlt::Service clipService(trackPlaylist.get_service()); - m_isBlocked = true; int ct = 0; QString index = params.paramValue("kdenlive_ix"); QString tag = params.paramValue("tag"); @@ -2631,7 +2636,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) // filter was not found, it was probably a disabled filter, so add it to the correct place... bool success = false;//mltAddTrackEffect(track, params); - m_isBlocked = false; return success; } QString prefix; @@ -2643,7 +2647,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) } mlt_service_unlock(service.get_service()); - m_isBlocked = false; refresh(); return true; @@ -2651,7 +2654,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) { - QString index = params.paramValue("kdenlive_ix"); + int index = params.paramValue("kdenlive_ix").toInt(); QString tag = params.paramValue("tag"); if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) { @@ -2687,12 +2690,11 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); if (diff < 0 || diff > duration) doRefresh = false; - m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clip->filter(ct); while (filter) { - if (filter->get_int("kdenlive_ix") == index.toInt()) { + if (filter->get_int("kdenlive_ix") == index) { break; } ct++; @@ -2704,24 +2706,24 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par // filter was not found, it was probably a disabled filter, so add it to the correct place... bool success = mltAddEffect(track, position, params); - m_isBlocked = false; return success; } QString prefix; QString ser = filter->get("mlt_service"); if (ser == "region") prefix = "filter0."; + if (params.hasParam("_sync_in_out")) { + // This effect must sync in / out with parent clip + params.removeParam("_sync_in_out"); + filter->set_in_and_out(clip->get_in(), clip->get_out()); + } mlt_service_lock(service.get_service()); for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); - } - - if (params.paramValue("id") == "pan_zoom") - filter->set_in_and_out(clip->get_in(), clip->get_out() + 1); + } delete clip; mlt_service_unlock(service.get_service()); - m_isBlocked = false; if (doRefresh) refresh(); return true; } @@ -2748,7 +2750,6 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in if (diff < 0 || diff > duration) doRefresh = false; delete clip; - m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { @@ -2758,8 +2759,6 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in } else ct++; filter = clipService.filter(ct); } - - m_isBlocked = false; if (doRefresh) refresh(); } @@ -2789,7 +2788,6 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) if (diff < 0 || diff > duration) doRefresh = false; delete clip; - m_isBlocked = true; int ct = 0; QList filtersList; Mlt::Filter *filter = clipService.filter(ct); @@ -2841,7 +2839,6 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) clipService.attach(*(filtersList.at(i))); } - m_isBlocked = false; if (doRefresh) refresh(); } @@ -2851,10 +2848,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - Mlt::Service clipService(trackPlaylist.get_service()); - - m_isBlocked = true; int ct = 0; QList filtersList; Mlt::Filter *filter = clipService.filter(ct); @@ -2905,13 +2899,11 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) 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)); @@ -2929,7 +2921,6 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) if (trackPlaylist.is_blank_at((int) info.startPos.frames(m_fps))) { kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; - m_isBlocked = false; return false; } mlt_service_lock(service.get_service()); @@ -2989,7 +2980,6 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) transpinfo.track = info.track; mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); }*/ - m_isBlocked = false; m_mltConsumer->set("refresh", 1); return true; } @@ -3006,6 +2996,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) if (mute && trackProducer.get_int("hide") < 2 ) { // We mute a track with sound if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true; + kDebug()<<"Muting track: "< 1 ) { // We un-mute a previously muted track @@ -3044,7 +3035,6 @@ void Render::fixAudioMixing(Mlt::Tractor tractor) mlt_service serv = m_mltProducer->parent().get_service(); Mlt::Field *field = tractor.field(); mlt_service_lock(serv); - m_isBlocked++; mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -3075,7 +3065,6 @@ void Render::fixAudioMixing(Mlt::Tractor tractor) field->plant_transition(*transition, lowestTrack, i); } mlt_service_unlock(serv); - m_isBlocked--; } bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) @@ -3100,9 +3089,7 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) int previousStart = clip->get_in(); int previousOut = clip->get_out(); delete clip; - m_isBlocked = true; trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset); - m_isBlocked = false; mlt_service_unlock(service.get_service()); m_mltConsumer->set("refresh", 1); return true; @@ -3131,7 +3118,6 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) int previousStart = clip->get_in(); int previousOut = clip->get_out(); - m_isBlocked = true; previousStart += moveFrame; if (previousStart < 0) { @@ -3175,7 +3161,6 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) 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()); m_mltConsumer->set("refresh", 1); @@ -3194,9 +3179,7 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; return false; } - kDebug() << "NEW PROD ID: " << prod->get("id"); - m_isBlocked++; - kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; + //kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; @@ -3212,7 +3195,6 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) kDebug() << "// ERROR UPDATING CLIP PROD"; delete clipProducer; mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); @@ -3220,7 +3202,6 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) if (clip) delete clip; delete clipProducer; mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } // move all effects to the correct producer @@ -3229,14 +3210,11 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) delete clip; delete clipProducer; mlt_service_unlock(service.get_service()); - m_isBlocked--; return true; } bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool /*insert*/) { - m_isBlocked++; - Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; @@ -3248,7 +3226,7 @@ bool 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); - kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; + //kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex; bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); @@ -3261,7 +3239,6 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } else { trackPlaylist.consolidate_blanks(0); @@ -3285,7 +3262,6 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } else { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); @@ -3295,7 +3271,6 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn if (clipProducer) delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } trackPlaylist.consolidate_blanks(0); @@ -3345,7 +3320,6 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } mlt_service_unlock(service.get_service()); if (checkLength) mltCheckLength(&tractor); - m_isBlocked--; //askForRefresh(); //m_mltConsumer->set("refresh", 1); return true; @@ -3397,8 +3371,6 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n diff = new_out - m_mltProducer->position(); if (diff < 0 || diff > new_out - new_in) doRefresh = false; } - - m_isBlocked++; mlt_service_lock(service.get_service()); mlt_service nextservice = mlt_service_get_producer(service.get_service()); @@ -3435,7 +3407,6 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n resource = mlt_properties_get(properties, "mlt_service"); } mlt_service_unlock(service.get_service()); - m_isBlocked--; if (doRefresh) refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); return found; @@ -3483,7 +3454,7 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b { if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { - kDebug()<<"// DELETING TRANS: "<parent().get_service(); mlt_service_lock(serv); - m_isBlocked++; mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -3512,7 +3482,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G int currentOut = (int) mlt_transition_get_out(tr); // kDebug()<<"Looking for transition : " << currentIn <<'x'< map = mltGetTransitionParamsFromXml(xml); QMap::Iterator it; @@ -3556,7 +3525,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G resource = mlt_properties_get(properties, "mlt_service"); } mlt_service_unlock(serv); - m_isBlocked--; //askForRefresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } @@ -3564,7 +3532,6 @@ 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 serv = m_mltProducer->parent().get_service(); - m_isBlocked++; mlt_service_lock(serv); Mlt::Service service(serv); @@ -3579,7 +3546,7 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT QString resource = mlt_properties_get(properties, "mlt_service"); const int old_pos = (int)((in + out).frames(m_fps) / 2); - kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25); + //kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25); while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; @@ -3599,7 +3566,6 @@ void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenT resource = mlt_properties_get(properties, "mlt_service"); } mlt_service_unlock(serv); - m_isBlocked--; //askForRefresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); } @@ -3616,8 +3582,8 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) if (!e.attribute("value").isEmpty()) { map[name] = e.attribute("value"); } - if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) { - map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble()); + if (e.attribute("type") != "addedgeometry" && (e.attribute("factor", "1") != "1" || e.attribute("offset", "0") != "0")) { + map[name] = m_locale.toString((map.value(name).toDouble() - e.attribute("offset", "0").toDouble()) / e.attribute("factor", "1").toDouble()); //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . , } @@ -3702,7 +3668,6 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); - m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -3729,8 +3694,7 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t resource = mlt_properties_get(properties, "mlt_service"); } mlt_service_unlock(service.get_service()); - m_isBlocked--; - if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); + m_mltConsumer->set("refresh", 1); } @@ -3741,7 +3705,6 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int mlt_service_lock(service.get_service()); m_mltConsumer->set("refresh", 0); - m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -3774,7 +3737,6 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - m_isBlocked--; mlt_service_unlock(service.get_service()); m_mltConsumer->set("refresh", 1); } @@ -3800,6 +3762,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, //kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count(); if (xml.hasAttribute("id")) transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData()); + if (xml.hasAttribute("force_track")) + transition->set("force_track", xml.attribute("force_track").toInt()); for (it = args.begin(); it != args.end(); ++it) { key = it.key(); @@ -3808,12 +3772,10 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, //kDebug() << " ------ ADDING TRANS PARAM: " << key << ": " << it.value(); } // attach transition - m_isBlocked++; mlt_service_lock(service.get_service()); mltPlantTransition(field, *transition, a_track, b_track); // field->plant_transition(*transition, a_track, b_track); mlt_service_unlock(service.get_service()); - m_isBlocked--; if (do_refresh) refresh(); return true; } @@ -3848,13 +3810,14 @@ const QList Render::producersList() int clipNb = trackPlaylist.count(); for (int i = 0; i < clipNb; i++) { Mlt::Producer *c = trackPlaylist.get_clip(i); - Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); - if (nprod) { - QString prodId = nprod->get("id"); - if (!prodId.startsWith("slowmotion") && !prodId.isEmpty() && !nprod->is_blank() && !ids.contains(prodId)) { - ids.append(nprod->get("id")); + if (c == NULL) continue; + QString prodId = c->parent().get("id"); + if (!c->is_blank() && !ids.contains(prodId) && !prodId.startsWith("slowmotion") && !prodId.isEmpty()) { + Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); + if (nprod) { + ids.append(prodId); prods.append(nprod); - } else delete nprod; + } } delete c; } @@ -3881,7 +3844,7 @@ void Render::fillSlowMotionProducers() Mlt::Producer *c = trackPlaylist.get_clip(i); Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); if (nprod) { - QString id = nprod->get("id"); + QString id = nprod->parent().get("id"); if (id.startsWith("slowmotion:") && !nprod->is_blank()) { // this is a slowmotion producer, add it to the list QString url = QString::fromUtf8(nprod->get("resource")); @@ -3900,7 +3863,6 @@ void Render::fillSlowMotionProducers() void Render::mltInsertTrack(int ix, bool videoTrack) { blockSignals(true); - m_isBlocked++; Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); @@ -3936,6 +3898,8 @@ void Render::mltInsertTrack(int ix, bool videoTrack) if (!videoTrack) newProd.set("hide", 1); } + checkMaxThreads(); + // Move transitions mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -3975,7 +3939,6 @@ void Render::mltInsertTrack(int ix, bool videoTrack) mlt_service_unlock(service.get_service()); //tractor.multitrack()->refresh(); //tractor.refresh(); - m_isBlocked--; blockSignals(false); } @@ -4022,7 +3985,7 @@ void Render::mltDeleteTrack(int ix) tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); - emit refreshDocumentProducers(false); + emit refreshDocumentProducers(false, false); }