X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=272acaf5ce5e7b55f04b95a38ffb360dc1198f89;hb=d4eba74b4e5bf7febef259fd83cf6516d233bc8f;hp=91251de4d9db1754a687e30d81b5d383e6b9f06c;hpb=31774190b35e1d0150cdef47288916d86257835c;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 91251de4..272acaf5 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -43,12 +43,14 @@ #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(); @@ -62,10 +64,9 @@ 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; + self->emitFrameNumber(); Mlt::Frame frame(frame_ptr); if (!frame.is_valid()) return; - self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); if (self->sendFrameForAnalysis && frame_ptr->convert_image) { self->emitFrameUpdated(frame); } @@ -82,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(); } @@ -90,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) { @@ -103,13 +102,13 @@ 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), m_mltProducer(NULL), m_mltProfile(NULL), - m_framePosition(0), + m_showFrameEvent(NULL), + m_pauseEvent(NULL), m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), @@ -119,15 +118,16 @@ 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_mltProducer = m_blackClip->cut(0, 1); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); + m_refreshTimer.setSingleShot(true); + m_refreshTimer.setInterval(50); + connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); } Render::~Render() { - m_isBlocked = 1; closeMlt(); delete m_mltProfile; } @@ -136,11 +136,15 @@ Render::~Render() void Render::closeMlt() { //delete m_osdTimer; + m_requestList.clear(); + m_infoThread.waitForFinished(); + if (m_showFrameEvent) delete m_showFrameEvent; + if (m_pauseEvent) delete m_pauseEvent; 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()); + service.lock(); if (service.type() == tractor_type) { Mlt::Tractor tractor(service); @@ -164,7 +168,7 @@ void Render::closeMlt() delete field; field = NULL; } - mlt_service_unlock(service.get_service()); + service.unlock(); }*/ kDebug() << "// // // CLOSE RENDERER " << m_name; @@ -208,9 +212,8 @@ void Render::buildConsumer(const QString &profileName) delete[] tmp; if (m_mltConsumer->is_valid()) { m_externalConsumer = true; - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("buffer", 12); m_mltConsumer->set("deinterlace_method", "onefield"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); mlt_log_set_callback(kdenlive_callback); @@ -237,12 +240,11 @@ void Render::buildConsumer(const QString &profileName) m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); m_mltConsumer->set("preview_off", 1); m_mltConsumer->set("preview_format", mlt_image_rgb24a); - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); } else { m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); - // FIXME: the event object returned by the listen gets leaked... - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); m_mltConsumer->set("window_id", m_winid); } m_mltConsumer->set("resize", 1); @@ -292,10 +294,14 @@ Mlt::Producer *Render::invalidProducer(const QString &id) return clip; } +bool Render::hasProfile(const QString &profileName) const +{ + return m_activeProfile == profileName; +} + int Render::resetProfile(const QString &profileName, bool dropSceneList) { - QString scene; - if (!dropSceneList) scene = sceneList(); + m_refreshTimer.stop(); if (m_mltConsumer) { if (m_externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; @@ -313,14 +319,22 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); + if (m_showFrameEvent) delete m_showFrameEvent; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; delete m_mltConsumer; m_mltConsumer = NULL; } + QString scene; + if (!dropSceneList) scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); 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(); @@ -359,18 +373,22 @@ void Render::seek(GenTime time) { if (!m_mltProducer) return; - m_isBlocked = false; + m_mltProducer->seek((int)(time.frames(m_fps))); - refresh(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } void Render::seek(int time) { if (!m_mltProducer) return; - m_isBlocked = false; + m_mltProducer->seek(time); - refresh(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } //static @@ -409,15 +427,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; } @@ -430,7 +448,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*/) @@ -554,344 +572,405 @@ 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) { - QString path; - QLocale locale; - bool proxyProducer; - if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") { - path = xml.attribute("proxy"); - proxyProducer = true; - } - else { - path = xml.attribute("resource"); - proxyProducer = false; - } - - 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())) { - emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); - return; - }*/ + requestClipInfo info; + info.xml = xml; + info.clipId = clipId; + info.imageHeight = imageHeight; + info.replaceProducer = replaceProducer; + // Make sure we don't request the info for same clip twice + m_infoMutex.lock(); + m_requestList.removeAll(info); + m_requestList.append(info); + m_infoMutex.unlock(); + if (!m_infoThread.isRunning()) + m_infoThread = QtConcurrent::run(this, &Render::processFileProperties); +} - if (type == COLOR) { - producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + 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()); - } 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)); - producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); - } else { - char *resTag = qstrdup(QString("nocache:" + path).toUtf8().constData()); - producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); - delete[] resTag; +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() +{ + m_infoMutex.lock(); + int count = m_requestList.count(); + if (!m_processingClipId.isEmpty()) { + // one clip is currently processed + count++; + } + m_infoMutex.unlock(); + return count; +} - if (producer == NULL || producer->is_blank() || !producer->is_valid()) { - kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("length", xml.attribute("proxy_out").toInt() + 1); - producer->set("out", xml.attribute("proxy_out").toInt()); - if (producer->get_out() != 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); - delete producer; - return; +void Render::processFileProperties() +{ + requestClipInfo info; + QLocale locale; + while (!m_requestList.isEmpty()) { + m_infoMutex.lock(); + info = m_requestList.takeFirst(); + m_infoMutex.unlock(); + m_processingClipId = info.clipId; + QString path; + bool proxyProducer; + if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") { + path = info.xml.attribute("proxy"); + proxyProducer = true; } - } - - if (xml.hasAttribute("force_aspect_ratio")) { - double aspect = 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 (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 (fps > 0) producer->set("force_fps", fps); - } - - if (xml.hasAttribute("force_progressive")) { - bool ok; - int progressive = xml.attribute("force_progressive").toInt(&ok); - if (ok) producer->set("force_progressive", progressive); - } - if (xml.hasAttribute("force_tff")) { - bool ok; - int fieldOrder = xml.attribute("force_tff").toInt(&ok); - if (ok) producer->set("force_tff", fieldOrder); - } - if (xml.hasAttribute("threads")) { - int threads = xml.attribute("threads").toInt(); - if (threads != 1) producer->set("threads", threads); - } - if (xml.hasAttribute("video_index")) { - int vindex = 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 (aindex != 0) producer->set("audio_index", aindex); - } - if (xml.hasAttribute("force_colorspace")) { - int colorspace = 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 (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(); - - // 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 (clipOut > 0) duration = clipOut + 1; - length = xml.attribute("length").toInt(); - clipOut = length - 1; + else { + path = info.xml.attribute("resource"); + proxyProducer = false; + } + KUrl url(path); + Mlt::Producer *producer = NULL; + CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt(); + + if (type == COLOR) { + 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:" + 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(info.xml, true)); + producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); + } else { + producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); } - else length = xml.attribute("out").toInt() - xml.attribute("in").toInt(); - producer->set("length", length); - } - if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut); + if (producer == NULL || producer->is_blank() || !producer->is_valid()) { + kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("id", clipId.toUtf8().constData()); + 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 + m_processingClipId.clear(); + emit removeInvalidProxy(info.clipId, true); + delete producer; + continue; + } + } - if (xml.hasAttribute("templatetext")) - producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData()); + 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 ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) { - // Clip already has all properties - if (replaceProducer) emit blockClipMonitor(clipId); - // Querying a frame is required by MLT, otherwise the producer is not correctly initialised - //Mlt::Frame *frame = producer->get_frame(); - //delete frame; - emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip); - return; - } + 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); + } - int width = (int)(imageHeight * m_mltProfile->dar() + 0.5); - QMap < QString, QString > filePropertyMap; - QMap < QString, QString > metadataPropertyMap; + if (info.xml.hasAttribute("force_fps")) { + double fps = info.xml.attribute("force_fps").toDouble(); + if (fps > 0) producer->set("force_fps", fps); + } - int frameNumber = xml.attribute("thumbnail", "0").toInt(); - if (frameNumber != 0) producer->seek(frameNumber); + if (info.xml.hasAttribute("force_progressive")) { + bool ok; + int progressive = info.xml.attribute("force_progressive").toInt(&ok); + if (ok) producer->set("force_progressive", progressive); + } + if (info.xml.hasAttribute("force_tff")) { + bool ok; + int fieldOrder = info.xml.attribute("force_tff").toInt(&ok); + if (ok) producer->set("force_tff", fieldOrder); + } + if (info.xml.hasAttribute("threads")) { + int threads = info.xml.attribute("threads").toInt(); + if (threads != 1) producer->set("threads", threads); + } + if (info.xml.hasAttribute("video_index")) { + int vindex = info.xml.attribute("video_index").toInt(); + if (vindex != 0) producer->set("video_index", vindex); + } + if (info.xml.hasAttribute("audio_index")) { + int aindex = info.xml.attribute("audio_index").toInt(); + if (aindex != 0) producer->set("audio_index", aindex); + } + if (info.xml.hasAttribute("force_colorspace")) { + int colorspace = info.xml.attribute("force_colorspace").toInt(); + if (colorspace != 0) producer->set("force_colorspace", colorspace); + } + 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); + } - filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime()); - //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime(); + int clipOut = 0; + int duration = 0; + 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 (info.xml.hasAttribute("length")) { + if (clipOut > 0) duration = clipOut + 1; + length = info.xml.attribute("length").toInt(); + clipOut = length - 1; + } + else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt(); + producer->set("length", length); + } - Mlt::Frame *frame = producer->get_frame(); + if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut); + + producer->set("id", info.clipId.toUtf8().constData()); + + if (info.xml.hasAttribute("templatetext")) + producer->set("templatetext", info.xml.attribute("templatetext").toUtf8().constData()); + + 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); + int frameNumber = info.xml.attribute("thumbnail", "-1").toInt(); + + if ((!info.replaceProducer && info.xml.hasAttribute("file_hash")) || proxyProducer) { + // Clip already has all properties + if (proxyProducer) { + // Recreate clip thumb + if (frameNumber > 0) producer->seek(frameNumber); + Mlt::Frame *frame = producer->get_frame(); + if (frame && frame->is_valid()) { + QImage img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight); + delete frame; + emit replyGetImage(info.clipId, img); + } + } + m_processingClipId.clear(); + emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); + continue; + } - if (type == SLIDESHOW) { - int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; - if (ttl) producer->set("ttl", ttl); - if (!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); - if (!geometry.isEmpty()) { - if (xml.attribute("animation").contains("low-pass")) { - Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur"); - if (blur && blur->is_valid()) - producer->attach(*blur); + stringMap filePropertyMap; + stringMap metadataPropertyMap; + char property[200]; + + if (frameNumber > 0) producer->seek(frameNumber); + + duration = duration > 0 ? duration : producer->get_playtime(); + filePropertyMap["duration"] = QString::number(duration); + //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime(); + + if (type == SLIDESHOW) { + int ttl = info.xml.hasAttribute("ttl") ? info.xml.attribute("ttl").toInt() : 0; + if (ttl) producer->set("ttl", ttl); + 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(info.xml.attribute("animation"), cycle); + if (!geometry.isEmpty()) { + 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); + } + filter->set("transition.geometry", geometry.toUtf8().data()); + filter->set("transition.cycle", cycle); + producer->attach(*filter); } - filter->set("transition.geometry", geometry.toUtf8().data()); - filter->set("transition.cycle", cycle); - producer->attach(*filter); } } - } - if (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(); - filter->set("luma.softness", (double) soft / 100.0); + 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 (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); } - producer->attach(*filter); } - } - if (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()) { - filter->set("center", 1); - producer->attach(*filter); + 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()) { + filter->set("center", 1); + producer->attach(*filter); + } } } - } + + // Get frame rate + int vindex = producer->get_int("video_index"); + if (vindex > -1) { + snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", vindex); + if (producer->get(property)) + filePropertyMap["fps"] = producer->get(property); + } - if (producer->get_double("meta.media.frame_rate_den") > 0) { - 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()) { - filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height")); - filePropertyMap["frequency"] = QString::number(frame->get_int("frequency")); - filePropertyMap["channels"] = QString::number(frame->get_int("channels")); - filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio"); - - if (frame->get_int("test_image") == 0) { - if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) { - filePropertyMap["type"] = "playlist"; - metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title")); - } else if (frame->get_int("test_audio") == 0) - filePropertyMap["type"] = "av"; - else - filePropertyMap["type"] = "video"; - - int variance; - mlt_image_format format = mlt_image_rgb24a; - int frame_width = width; - int frame_height = imageHeight; - QPixmap pix; - 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) { - // Thumbnail is not interesting (for example all black, seek to fetch better thumb - frameNumber = 100; - producer->seek(frameNumber); - delete frame; - frame = producer->get_frame(); - variance = -1; - } - } while (variance == -1); - emit replyGetImage(clipId, pix); + if (!filePropertyMap.contains("fps")) { + if (producer->get_double("meta.media.frame_rate_den") > 0) { + 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"); + } - } else if (frame->get_int("test_audio") == 0) { - QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, imageHeight)); - emit replyGetImage(clipId, pixmap); - filePropertyMap["type"] = "audio"; + Mlt::Frame *frame = producer->get_frame(); + if (frame && frame->is_valid()) { + filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height")); + filePropertyMap["frequency"] = QString::number(frame->get_int("frequency")); + filePropertyMap["channels"] = QString::number(frame->get_int("channels")); + filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio"); + + if (frame->get_int("test_image") == 0) { + if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) { + filePropertyMap["type"] = "playlist"; + metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title")); + } else if (frame->get_int("test_audio") == 0) + filePropertyMap["type"] = "av"; + else + filePropertyMap["type"] = "video"; + + int variance; + QImage img; + do { + variance = 100; + img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight); + variance = KThumb::imageVariance(img); + if (frameNumber == -1 && variance< 6) { + // Thumbnail is not interesting (for example all black, seek to fetch better thumb + frameNumber = duration > 100 ? 100 : duration / 2 ; + producer->seek(frameNumber); + delete frame; + frame = producer->get_frame(); + variance = -1; + } + } while (variance == -1); + delete frame; + if (frameNumber > -1) filePropertyMap["thumbnail"] = QString::number(frameNumber); + emit replyGetImage(info.clipId, img); + } else if (frame->get_int("test_audio") == 0) { + emit replyGetImage(info.clipId, "audio-x-generic", fullWidth, info.imageHeight); + filePropertyMap["type"] = "audio"; + } } - } - delete frame; - // Retrieve audio / video codec name + // Retrieve audio / video codec name + // If there is a - // If there is a - char property[200]; - if (producer->get_int("video_index") > -1) { - /*if (context->duration == AV_NOPTS_VALUE) { - kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION"; - emit removeInvalidClip(clipId); + if (vindex > -1) { + /*if (context->duration == AV_NOPTS_VALUE) { + kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION"; + emit removeInvalidClip(clipId); delete producer; return; - }*/ - // Get the video_index - int default_video = producer->get_int("video_index"); - int video_max = 0; - int default_audio = producer->get_int("audio_index"); - int audio_max = 0; - - // Find maximum stream index values - for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) { - snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix); - QString type = producer->get(property); - if (type == "video") - video_max = ix; - else if (type == "audio") - audio_max = ix; - } - filePropertyMap["default_video"] = QString::number(default_video); - filePropertyMap["video_max"] = QString::number(video_max); - filePropertyMap["default_audio"] = QString::number(default_audio); - filePropertyMap["audio_max"] = QString::number(audio_max); - - snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video); - if (producer->get(property)) { - filePropertyMap["videocodec"] = producer->get(property); - } else { - snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); - if (producer->get(property)) + }*/ + // Get the video_index + int video_max = 0; + int default_audio = producer->get_int("audio_index"); + int audio_max = 0; + + // Find maximum stream index values + for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) { + snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix); + QString type = producer->get(property); + if (type == "video") + video_max = ix; + else if (type == "audio") + audio_max = ix; + } + filePropertyMap["default_video"] = QString::number(vindex); + filePropertyMap["video_max"] = QString::number(video_max); + filePropertyMap["default_audio"] = QString::number(default_audio); + filePropertyMap["audio_max"] = QString::number(audio_max); + + snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex); + if (producer->get(property)) { filePropertyMap["videocodec"] = producer->get(property); - } - QString query; - query = QString("meta.media.%1.codec.pix_fmt").arg(default_video); - filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData()); - filePropertyMap["colorspace"] = producer->get("meta.media.colorspace"); - - } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!"; - if (producer->get_int("audio_index") > -1) { - // Get the audio_index - int index = producer->get_int("audio_index"); - - snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index); - if (producer->get(property)) { - filePropertyMap["audiocodec"] = producer->get(property); - } else { - snprintf(property, sizeof(property), "meta.media.%d.codec.name", index); - if (producer->get(property)) + } else { + snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); + if (producer->get(property)) + filePropertyMap["videocodec"] = producer->get(property); + } + QString query; + query = QString("meta.media.%1.codec.pix_fmt").arg(vindex); + filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData()); + filePropertyMap["colorspace"] = producer->get("meta.media.colorspace"); + + } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!"; + if (producer->get_int("audio_index") > -1) { + // Get the audio_index + int index = producer->get_int("audio_index"); + snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index); + if (producer->get(property)) { filePropertyMap["audiocodec"] = producer->get(property); + } else { + snprintf(property, sizeof(property), "meta.media.%d.codec.name", index); + if (producer->get(property)) + filePropertyMap["audiocodec"] = producer->get(property); + } } - } - // metadata - Mlt::Properties metadata; - metadata.pass_values(*producer, "meta.attr."); - int count = metadata.count(); - for (int i = 0; i < count; i ++) { - QString name = metadata.get_name(i); - QString value = QString::fromUtf8(metadata.get(i)); - if (name.endsWith("markup") && !value.isEmpty()) - metadataPropertyMap[ name.section('.', 0, -2)] = value; - } - producer->seek(0); - if (replaceProducer) emit blockClipMonitor(clipId); - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip); - // FIXME: should delete this to avoid a leak... - //delete producer; + // metadata + Mlt::Properties metadata; + metadata.pass_values(*producer, "meta.attr."); + int count = metadata.count(); + for (int i = 0; i < count; i ++) { + QString name = metadata.get_name(i); + QString value = QString::fromUtf8(metadata.get(i)); + if (name.endsWith("markup") && !value.isEmpty()) + metadataPropertyMap[ name.section('.', 0, -2)] = value; + } + producer->seek(0); + m_processingClipId.clear(); + emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer); + } + m_processingClipId.clear(); } @@ -935,46 +1014,72 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); - if (m_winid == -1) return -1; - if (m_mltConsumer) { - if (!m_mltConsumer->is_stopped()) { - m_mltConsumer->stop(); - } - m_mltConsumer->set("refresh", 0); + QString currentId; + int consumerPosition = 0; + if (m_winid == -1 || !m_mltConsumer) { + kDebug()<<" / / / / WARNING, MONITOR NOT READY"; + if (producer) delete producer; + return -1; } - else { + m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); + } + m_mltConsumer->purge(); + consumerPosition = m_mltConsumer->position(); + + + blockSignals(true); + if (!producer || !producer->is_valid()) { + if (producer) delete producer; + producer = m_blackClip->cut(0, 1); + } + + if (!producer || !producer->is_valid()) { + kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; return -1; } + if (m_mltProducer) currentId = m_mltProducer->get("id"); + emit stopped(); + if (position == -1 && producer->get("id") == currentId) position = consumerPosition; + if (position != -1) producer->seek(position); + int volume = KdenliveSettings::volume(); + producer->set("meta.volume", (double)volume / 100); + m_fps = producer->get_fps(); + blockSignals(false); + m_mltConsumer->connect(*producer); - m_isBlocked = true; if (m_mltProducer) { m_mltProducer->set_speed(0); delete m_mltProducer; m_mltProducer = NULL; - emit stopped(); } - blockSignals(true); - if (producer && producer->is_valid()) { - m_mltProducer = new Mlt::Producer(producer->get_producer()); - } else m_mltProducer = m_blackClip->cut(0, 50); - - if (!m_mltProducer || !m_mltProducer->is_valid()) { - kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; + m_mltProducer = producer; + m_mltProducer->set_speed(0); + emit durationChanged(m_mltProducer->get_playtime()); + if (m_mltConsumer->start() == -1) { + // ARGH CONSUMER BROKEN!!!! + 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.")); + if (m_showFrameEvent) delete m_showFrameEvent; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; + delete m_mltConsumer; + m_mltConsumer = NULL; return -1; } - 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; + position = m_mltProducer->position(); + m_mltConsumer->set("refresh", 1); + // Make sure the first frame is displayed, otherwise if we change producer too fast + // We can crash the avformat producer + Mlt::Event *ev = m_mltConsumer->setup_wait_for("consumer-frame-show"); + m_mltConsumer->wait_for(ev); + delete ev; + emit rendererPosition(position); + return 0; } int Render::setSceneList(QDomDocument list, int position) @@ -984,8 +1089,9 @@ int Render::setSceneList(QDomDocument list, int position) int Render::setSceneList(QString playlist, int position) { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; - m_isBlocked = true; int error = 0; //kDebug() << "////// RENDER, SET SCENE LIST:\n" << playlist <<"\n..........:::."; @@ -1006,13 +1112,15 @@ 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_lock(service.get_service()); + service.lock(); if (service.type() == tractor_type) { Mlt::Tractor tractor(service); @@ -1041,7 +1149,7 @@ int Render::setSceneList(QString playlist, int position) } delete field; } - mlt_service_unlock(service.get_service());*/ + service.unlock();*/ qDeleteAll(m_slowmotionProducers.values()); m_slowmotionProducers.clear(); @@ -1052,15 +1160,15 @@ int Render::setSceneList(QString playlist, int position) } blockSignals(true); - m_locale = QLocale(); m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); if (!m_mltProducer || !m_mltProducer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData(); - m_mltProducer = m_blackClip->cut(0, 50); + m_mltProducer = m_blackClip->cut(0, 1); error = -1; } + checkMaxThreads(); int volume = KdenliveSettings::volume(); m_mltProducer->set("meta.volume", (double)volume / 100); m_mltProducer->optimise(); @@ -1093,18 +1201,38 @@ int Render::setSceneList(QString playlist, int position) } kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); - if (error == 0) error = connectPlaylist(); - else connectPlaylist(); + m_mltConsumer->connect(*m_mltProducer); + m_mltProducer->set_speed(0); fillSlowMotionProducers(); - - m_isBlocked = false; blockSignals(false); + emit durationChanged(m_mltProducer->get_playtime()); return error; //kDebug()<<"// SETSCN LST, POS: "<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: "<set("refresh", "0"); - m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0); - if (m_mltConsumer->start() == -1) { - // ARGH CONSUMER BROKEN!!!! - 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.")); - delete m_mltConsumer; - m_mltConsumer = NULL; - return -1; - } - emit durationChanged(m_mltProducer->get_playtime()); - return 0; - //refresh(); -} - -void Render::refreshDisplay() -{ - - if (!m_mltProducer) return; - //m_mltConsumer->set("refresh", 0); - - //mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer()); - /*if (KdenliveSettings::osdtimecode()) { - mlt_properties_set_int( properties, "meta.attr.timecode", 1); - mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#"); - m_osdInfo->set("dynamic", "1"); - m_mltProducer->attach(*m_osdInfo); - } - else { - m_mltProducer->detach(*m_osdInfo); - m_osdInfo->set("dynamic", "0"); - }*/ - refresh(); -} - int Render::volume() const { if (!m_mltConsumer || !m_mltProducer) return -1; @@ -1255,44 +1345,44 @@ void Render::slotOsdTimeout() void Render::start() { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_winid == -1) { kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } - if (m_mltConsumer && m_mltConsumer->is_stopped()) { + if (!m_mltConsumer) return; + if (m_mltConsumer->is_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 { - m_isBlocked = false; - refresh(); + m_mltConsumer->purge(); + m_mltConsumer->set("refresh", 1); } } - m_isBlocked = false; } void Render::stop() { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - //kDebug() << "///////////// RENDER STOPPED: " << m_name; - //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); - // delete m_mltConsumer; - // m_mltConsumer = NULL; + m_mltConsumer->purge(); } - m_isBlocked = true; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); - //m_mltProducer->set("out", m_mltProducer->get_length() - 1); - //kDebug() << m_mltProducer->get_length(); } } void Render::stop(const GenTime & startTime) { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1307,33 +1397,39 @@ 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); - /* - The 2 lines below create a flicker loop - emit rendererPosition(m_framePosition); - m_mltProducer->seek(m_framePosition);*/ m_mltConsumer->purge(); } void Render::switchPlay(bool play) { + QMutexLocker locker(&m_mutex); if (!m_mltProducer || !m_mltConsumer) 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); + if (m_name == "clip" && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); + if (m_mltConsumer->is_stopped()) { + m_mltConsumer->start(); + } m_mltProducer->set_speed(1.0); - m_mltConsumer->set("refresh", 1); + m_mltConsumer->set("refresh", "1"); } else if (!play) { - m_isBlocked = true; + m_mltProducer->set_speed(0.0); m_mltConsumer->set("refresh", 0); + m_mltProducer->seek(m_mltConsumer->position()); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + if (m_isZoneMode) resetZoneMode(); + + //emitConsumerStopped(); + /*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);*/ } } @@ -1342,7 +1438,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); @@ -1355,7 +1450,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); @@ -1375,7 +1469,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))); @@ -1395,21 +1488,20 @@ 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(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } 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(); @@ -1417,21 +1509,24 @@ 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_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start(); } void Render::refresh() { - if (!m_mltProducer || m_isBlocked) + QMutexLocker locker(&m_mutex); + if (!m_mltProducer) return; if (m_mltConsumer) { + if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); + m_mltConsumer->purge(); m_mltConsumer->set("refresh", 1); } } void Render::setDropFrames(bool show) { + QMutexLocker locker(&m_mutex); if (m_mltConsumer) { int dropFrames = KdenliveSettings::mltthreads(); if (show == false) dropFrames = -dropFrames; @@ -1448,7 +1543,7 @@ void Render::setDropFrames(bool show) } } -double Render::playSpeed() +double Render::playSpeed() const { if (m_mltProducer) return m_mltProducer->get_speed(); return 0.0; @@ -1462,7 +1557,8 @@ GenTime Render::seekPosition() const int Render::seekFramePosition() const { - if (m_mltProducer) return (int) m_mltProducer->position(); + //if (m_mltProducer) return (int) m_mltProducer->position(); + if (m_mltConsumer) return (int) m_mltConsumer->position(); return 0; } @@ -1482,10 +1578,9 @@ void Render::emitFrameUpdated(Mlt::Frame& frame) emit frameUpdated(qimage); } -void Render::emitFrameNumber(double position) +void Render::emitFrameNumber() { - m_framePosition = position; - emit rendererPosition((int) position); + if (m_mltConsumer) emit rendererPosition((int) m_mltConsumer->position()); } void Render::emitConsumerStopped() @@ -1533,8 +1628,7 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) void Render::showFrame(Mlt::Frame& frame) { - m_framePosition = qMax(frame.get_int("_position"), 0); - emit rendererPosition((int) m_framePosition); + emit rendererPosition((int) m_mltConsumer->position()); mlt_image_format format = mlt_image_rgb24a; int width = 0; int height = 0; @@ -1610,6 +1704,7 @@ void Render::mltCheckLength(Mlt::Tractor *tractor) } if (blackclip == NULL || blackTrackPlaylist.count() != 1) { + if (blackclip) delete blackclip; blackTrackPlaylist.clear(); m_blackClip->set("length", duration + 1); m_blackClip->set("out", duration); @@ -1680,14 +1775,14 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25); return -1; } - mlt_service_lock(service.get_service()); + service.lock(); Mlt::Producer trackProducer(tractor.track(info.track)); int trackDuration = trackProducer.get_playtime() - 1; Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); //kDebug()<<"/// INSERT cLIP: "<is_valid()) { - mlt_service_unlock(service.get_service()); + service.unlock(); return -1; } @@ -1713,7 +1808,7 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/ if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(&tractor); - mlt_service_unlock(service.get_service()); + service.unlock(); /*tractor.multitrack()->refresh(); tractor.refresh();*/ return 0; @@ -1722,8 +1817,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"; @@ -1750,13 +1843,12 @@ 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()); + service.lock(); int clipStart = trackPlaylist.clip_start(clipIndex); trackPlaylist.split(clipIndex, cutPos - clipStart - 1); - mlt_service_unlock(service.get_service()); + service.unlock(); // duplicate effects Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart); @@ -1799,23 +1891,50 @@ void Render::mltCutClip(int track, GenTime position) kDebug()<<"CLIP "<is_stopped()) m_mltConsumer->stop(); + m_mltConsumer->purge(); + } + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return NULL; + } + service.lock(); + return new Mlt::Tractor(service); + +} + +void Render::unlockService(Mlt::Tractor *tractor) +{ + if (tractor) { + delete tractor; } + if (!m_mltProducer) return; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; + return; + } + service.unlock(); +} + +bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod) +{ + // TODO: optimize + if (prod == NULL || tractor == NULL) { + kDebug() << "Cannot update clip with null producer //////"; return false; } - Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(tractor.count() - 1 - info.track)); + + Mlt::Producer trackProducer(tractor->track(tractor->count() - 1 - info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int startPos = info.startPos.frames(m_fps); int clipIndex = trackPlaylist.get_clip_index_at(startPos); @@ -1823,7 +1942,6 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos; return false; } - mlt_service_lock(service.get_service()); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); // keep effects QList filtersList; @@ -1837,31 +1955,23 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr ct++; filter = sourceService.filter(ct); } - - trackPlaylist.replace_with_blank(clipIndex); delete clip; - //if (!mltRemoveClip(info.track, info.startPos)) return false; + clip = trackPlaylist.replace_with_blank(clipIndex); + delete clip; prod = checkSlowMotionProducer(prod, element); if (prod == NULL || !prod->is_valid()) { - mlt_service_unlock(service.get_service()); return false; } Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps) - 1); trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1); + Mlt::Service destService(clip2->get_service()); delete clip2; - - //if (mltInsertClip(info, element, prod) == -1) return false; if (!filtersList.isEmpty()) { - clipIndex = trackPlaylist.get_clip_index_at(startPos); - Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex); - Mlt::Service destService(destclip->get_service()); - delete destclip; for (int i = 0; i < filtersList.count(); i++) destService.attach(*(filtersList.at(i))); } - mlt_service_unlock(service.get_service()); return true; } @@ -1881,10 +1991,9 @@ bool Render::mltRemoveClip(int track, GenTime position) if (trackPlaylist.is_blank(clipIndex)) { kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps); - //mlt_service_unlock(service.get_service()); + //service.unlock(); return false; } - m_isBlocked = true; Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); if (clip) delete clip; trackPlaylist.consolidate_blanks(0); @@ -1900,7 +2009,6 @@ bool Render::mltRemoveClip(int track, GenTime position) }*/ //service.unlock(); if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(&tractor); - m_isBlocked = false; return true; } @@ -1967,7 +2075,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap Mlt::Service service(parentProd.get_service()); Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); + service.lock(); int diff = duration.frames(m_fps); int offset = timeOffset.frames(m_fps); int insertPos; @@ -2085,7 +2193,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap resource = mlt_properties_get(properties, "mlt_service"); } } - mlt_service_unlock(service.get_service()); + service.unlock(); mltCheckLength(&tractor); m_mltConsumer->set("refresh", 1); } @@ -2111,7 +2219,6 @@ 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) { @@ -2148,7 +2255,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou if (speed <= 0 && speed > -1) speed = 1.0; //kDebug() << "CLIP SERVICE: " << serv; if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) { - mlt_service_lock(service.get_service()); + service.lock(); QString url = QString::fromUtf8(clipparent.get("resource")); url.append('?' + m_locale.toString(speed)); if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); @@ -2197,9 +2304,9 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou delete clip; clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); - mlt_service_unlock(service.get_service()); + service.unlock(); } else if (speed == 1.0 && strobe < 2) { - mlt_service_lock(service.get_service()); + service.lock(); Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); @@ -2223,10 +2330,10 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou delete clip; clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); - mlt_service_unlock(service.get_service()); + service.unlock(); } else if (serv == "framebuffer") { - mlt_service_lock(service.get_service()); + service.lock(); QString url = QString::fromUtf8(clipparent.get("resource")); url = url.section('?', 0, 0); url.append('?' + m_locale.toString(speed)); @@ -2282,11 +2389,10 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou clipIndex = trackPlaylist.get_clip_index_at(startPos); newLength = trackPlaylist.clip_length(clipIndex); - mlt_service_unlock(service.get_service()); + service.unlock(); } delete original; if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); - m_isBlocked = false; return newLength; } @@ -2299,8 +2405,7 @@ bool Render::mltRemoveTrackEffect(int track, int 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()); + service.lock(); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { @@ -2313,8 +2418,7 @@ bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex) } else ct++; filter = clipService.filter(ct); } - m_isBlocked = false; - mlt_service_unlock(service.get_service()); + service.unlock(); refresh(); return success; } @@ -2347,8 +2451,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, int index, bool update } delete clip; - m_isBlocked = true; - mlt_service_lock(service.get_service()); + service.lock(); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { @@ -2362,8 +2465,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, int index, bool update } else ct++; filter = clipService.filter(ct); } - m_isBlocked = false; - mlt_service_unlock(service.get_service()); + service.unlock(); if (doRefresh) refresh(); return success; } @@ -2411,8 +2513,7 @@ 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()); + service.lock(); Mlt::Filter *filter = service.filter(ct); while (filter) { @@ -2436,8 +2537,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int ct++; filter = service.filter(ct); } - m_isBlocked = false; - mlt_service_unlock(service.get_service()); + service.unlock(); if (doRefresh) refresh(); return true; } @@ -2540,8 +2640,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } } else { kDebug() << "filter is NULL"; - m_isBlocked = false; - mlt_service_unlock(service.get_service()); + service.unlock(); return false; } params.removeParam("kdenlive_id"); @@ -2584,8 +2683,7 @@ 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()); + service.unlock(); if (doRefresh) refresh(); return true; } @@ -2597,7 +2695,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"); @@ -2616,19 +2713,17 @@ 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; QString ser = filter->get("mlt_service"); if (ser == "region") prefix = "filter0."; - mlt_service_lock(service.get_service()); + service.lock(); for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); } - mlt_service_unlock(service.get_service()); + service.unlock(); - m_isBlocked = false; refresh(); return true; @@ -2672,7 +2767,6 @@ 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); @@ -2689,7 +2783,6 @@ 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; @@ -2700,15 +2793,14 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par params.removeParam("_sync_in_out"); filter->set_in_and_out(clip->get_in(), clip->get_out()); } - mlt_service_lock(service.get_service()); + service.lock(); for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); } delete clip; - mlt_service_unlock(service.get_service()); + service.unlock(); - m_isBlocked = false; if (doRefresh) refresh(); return true; } @@ -2735,7 +2827,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) { @@ -2745,8 +2836,6 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in } else ct++; filter = clipService.filter(ct); } - - m_isBlocked = false; if (doRefresh) refresh(); } @@ -2776,7 +2865,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); @@ -2828,7 +2916,6 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) clipService.attach(*(filtersList.at(i))); } - m_isBlocked = false; if (doRefresh) refresh(); } @@ -2838,10 +2925,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); @@ -2892,13 +2976,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)); @@ -2916,10 +2998,9 @@ 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()); + service.lock(); int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps)); //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); @@ -2964,7 +3045,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) } } else if (clipIndex != trackPlaylist.count()) trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); trackPlaylist.consolidate_blanks(0); - mlt_service_unlock(service.get_service()); + service.unlock(); if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(&tractor); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { @@ -2976,7 +3057,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; } @@ -2993,6 +3073,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 @@ -3031,7 +3112,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); @@ -3062,7 +3142,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) @@ -3076,21 +3155,19 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; return false; } - mlt_service_lock(service.get_service()); + service.lock(); int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (clip == NULL) { kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; - mlt_service_unlock(service.get_service()); + service.unlock(); return false; } 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()); + service.unlock(); m_mltConsumer->set("refresh", 1); return true; } @@ -3107,18 +3184,17 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; return false; } - mlt_service_lock(service.get_service()); + service.lock(); int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (clip == NULL || clip->is_blank()) { kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; - mlt_service_unlock(service.get_service()); + service.unlock(); return false; } int previousStart = clip->get_in(); int previousOut = clip->get_out(); - m_isBlocked = true; previousStart += moveFrame; if (previousStart < 0) { @@ -3162,9 +3238,8 @@ 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()); + service.unlock(); m_mltConsumer->set("refresh", 1); return true; } @@ -3175,38 +3250,26 @@ bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTim } -bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) +bool Render::mltUpdateClipProducer(Mlt::Tractor *tractor, int track, int pos, Mlt::Producer *prod) { - if (prod == NULL || !prod->is_valid()) { + if (prod == NULL || !prod->is_valid() || tractor == NULL || !tractor->is_valid()) { kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; return false; } - m_isBlocked++; - //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"; - return false; - } - mlt_service_lock(service.get_service()); - Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(track)); + + Mlt::Producer trackProducer(tractor->track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(pos); Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); if (clipProducer == NULL || clipProducer->is_blank()) { 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()); if (!clip || !clip->is_valid()) { if (clip) delete clip; delete clipProducer; - mlt_service_unlock(service.get_service()); - m_isBlocked--; return false; } // move all effects to the correct producer @@ -3214,15 +3277,11 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) trackPlaylist.insert_at(pos, clip, 1); 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"; @@ -3230,7 +3289,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); + service.lock(); Mlt::Producer trackProducer(tractor.track(startTrack)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(moveStart); @@ -3246,8 +3305,7 @@ 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--; + service.unlock(); return false; } else { trackPlaylist.consolidate_blanks(0); @@ -3264,14 +3322,13 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn }*/ if (newIndex + 1 == trackPlaylist.count()) checkLength = true; } - //mlt_service_unlock(service.get_service()); + //service.unlock(); } else { Mlt::Producer destTrackProducer(tractor.track(endTrack)); Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty - mlt_service_unlock(service.get_service()); - m_isBlocked--; + service.unlock(); return false; } else { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); @@ -3280,8 +3337,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn //int ix = trackPlaylist.get_clip_index_at(moveEnd); if (clipProducer) delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; - mlt_service_unlock(service.get_service()); - m_isBlocked--; + service.unlock(); return false; } trackPlaylist.consolidate_blanks(0); @@ -3329,9 +3385,8 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true; } } - mlt_service_unlock(service.get_service()); + service.unlock(); if (checkLength) mltCheckLength(&tractor); - m_isBlocked--; //askForRefresh(); //m_mltConsumer->set("refresh", 1); return true; @@ -3347,7 +3402,7 @@ QList Render::checkTrackSequence(int track) return list; } Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); + service.lock(); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); @@ -3383,9 +3438,7 @@ 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()); + service.lock(); mlt_service nextservice = mlt_service_get_producer(service.get_service()); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -3420,8 +3473,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - mlt_service_unlock(service.get_service()); - m_isBlocked--; + service.unlock(); if (doRefresh) refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); return found; @@ -3481,7 +3533,6 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G { mlt_service serv = m_mltProducer->parent().get_service(); mlt_service_lock(serv); - m_isBlocked++; mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -3541,7 +3592,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); } @@ -3549,7 +3599,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); @@ -3584,7 +3633,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); } @@ -3685,9 +3733,8 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); + service.lock(); m_mltConsumer->set("refresh", 0); - m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -3713,9 +3760,8 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - mlt_service_unlock(service.get_service()); - m_isBlocked--; - if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); + service.unlock(); + m_mltConsumer->set("refresh", 1); } @@ -3724,9 +3770,8 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); + service.lock(); m_mltConsumer->set("refresh", 0); - m_isBlocked++; mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); @@ -3759,8 +3804,7 @@ 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()); + service.unlock(); m_mltConsumer->set("refresh", 1); } @@ -3795,12 +3839,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()); + service.lock(); mltPlantTransition(field, *transition, a_track, b_track); // field->plant_transition(*transition, a_track, b_track); - mlt_service_unlock(service.get_service()); - m_isBlocked--; + service.unlock(); if (do_refresh) refresh(); return true; } @@ -3888,10 +3930,9 @@ 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()); + service.lock(); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; return; @@ -3923,6 +3964,7 @@ void Render::mltInsertTrack(int ix, bool videoTrack) Mlt::Producer newProd(tractor.track(ix)); if (!videoTrack) newProd.set("hide", 1); } + checkMaxThreads(); // Move transitions mlt_service serv = m_mltProducer->parent().get_service(); @@ -3960,10 +4002,9 @@ void Render::mltInsertTrack(int ix, bool videoTrack) transition->set("combine", 1); field->plant_transition(*transition, 1, ct); //mlt_service_unlock(m_mltConsumer->get_service()); - mlt_service_unlock(service.get_service()); + service.unlock(); //tractor.multitrack()->refresh(); //tractor.refresh(); - m_isBlocked--; blockSignals(false); } @@ -4009,7 +4050,7 @@ void Render::mltDeleteTrack(int ix) } tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); - setSceneList(doc.toString(), m_framePosition); + setSceneList(doc.toString(), m_mltConsumer->position()); emit refreshDocumentProducers(false, false); } @@ -4019,6 +4060,7 @@ void Render::updatePreviewSettings() kDebug() << "////// RESTARTING CONSUMER"; if (!m_mltConsumer || !m_mltProducer) return; if (m_mltProducer->get_playtime() == 0) return; + QMutexLocker locker(&m_mutex); Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) return; @@ -4144,6 +4186,11 @@ Mlt::Producer* Render::getProducer() return m_mltProducer; } +const QString Render::activeClipId() +{ + if (m_mltProducer) return m_mltProducer->get("id"); + return QString(); +} #include "renderer.moc"