X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=14b71cc04802ee92e1f843df3635f36602b34606;hb=fc7b1b8dcdedceac156f8f3068fe04909bc9d007;hp=2f554c903cd6eb8638ec6eb37605ebd7d110f722;hpb=7893afa29547c481ca7e58363a7e82bdb824ebf8;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 2f554c90..14b71cc0 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -28,6 +28,8 @@ #include "kthumb.h" #include "definitions.h" #include "slideshowclip.h" +#include "profilesdialog.h" +#include "blackmagic/devices.h" #include @@ -45,10 +47,11 @@ #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())); @@ -66,15 +69,24 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr if (self->sendFrameForAnalysis && frame_ptr->convert_image) { self->emitFrameUpdated(frame); } - self->showAudio(frame); - if (frame.get_double("_speed") == 0.0) { - self->emitConsumerStopped(); - } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + if (self->analyseAudio) { + self->showAudio(frame); + } + if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { self->pause(); self->emitConsumerStopped(); } } + +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(); +} + + 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? @@ -90,24 +102,21 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ } Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : - QObject(parent), + AbstractRender(rendererName, parent), m_isBlocked(0), - sendFrameForAnalysis(false), + analyseAudio(KdenliveSettings::monitor_audio()), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltProfile(NULL), m_framePosition(0), + m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), m_isSplitView(false), m_blackClip(NULL), m_winid(winid) { - /*if (rendererName == "project") m_monitorId = 10000; - else m_monitorId = 10001;*/ - /*m_osdTimer = new QTimer(this); - connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/ if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); buildConsumer(profile); @@ -120,13 +129,16 @@ Render::~Render() { m_isBlocked = 1; closeMlt(); + delete m_mltProfile; } void Render::closeMlt() -{ +{ //delete m_osdTimer; - if (m_mltProducer) { + 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()); @@ -143,26 +155,20 @@ void Render::closeMlt() nextservicetodisconnect = nextservice; nextservice = mlt_service_producer(nextservice); mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); - nextservice = mlt_service_producer(nextservice); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - 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; } @@ -173,17 +179,47 @@ void Render::slotSwitchFullscreen() 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 - //if (m_mltProfile) delete m_mltProfile; + // 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->set_explicit(true); delete[] tmp; + m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); + m_blackClip->set("id", "black"); + m_blackClip->set("mlt_type", "producer"); + + if (KdenliveSettings::external_display() && m_name != "clip") { + // Use blackmagic card for video output + QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName); + int device = KdenliveSettings::blackmagic_output_device(); + if (device >= 0) { + if (BMInterface::isSupportedProfile(device, profileProperties)) { + QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); + tmp = qstrdup(decklink.toUtf8().constData()); + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp); + delete[] tmp; + if (m_mltConsumer->is_valid()) { + m_externalConsumer = true; + 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); + } + if (m_mltConsumer && m_mltConsumer->is_valid()) return; + } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device())); + } + } + m_externalConsumer = false; QString videoDriver = KdenliveSettings::videodrivername(); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { @@ -206,6 +242,7 @@ void Render::buildConsumer(const QString profileName) 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_mltConsumer->set("window_id", m_winid); } m_mltConsumer->set("resize", 1); @@ -232,39 +269,45 @@ void Render::buildConsumer(const QString profileName) if (!audioDriver.isEmpty()) m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData()); - int volume = KdenliveSettings::volume(); - m_mltConsumer->set("volume", (float)volume / 100); - m_mltConsumer->set("progressive", 1); m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); - - m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); - m_blackClip->set("id", "black"); - m_blackClip->set("mlt_type", "producer"); + m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } 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; + if (!dropSceneList) scene = sceneList(); if (m_mltConsumer) { - QString videoDriver = KdenliveSettings::videodrivername(); - QString currentDriver = m_mltConsumer->get("video_driver"); - if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel"; - QString background = KdenliveSettings::window_background().name(); - QString currentBackground = m_mltConsumer->get("window_background"); - int volume = KdenliveSettings::volume(); - int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0); - if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) { - kDebug() << "reset to same profile, nothing to do"; - return 1; + if (m_externalConsumer == KdenliveSettings::external_display()) { + if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; + QString videoDriver = KdenliveSettings::videodrivername(); + QString currentDriver = m_mltConsumer->get("video_driver"); + if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel"; + QString background = KdenliveSettings::window_background().name(); + QString currentBackground = m_mltConsumer->get("window_background"); + if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) { + kDebug() << "reset to same profile, nothing to do"; + return 1; + } } if (m_isSplitView) slotSplitView(false); @@ -273,9 +316,9 @@ int Render::resetProfile(const QString profileName) delete m_mltConsumer; m_mltConsumer = NULL; } - QString scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); + double current_dar = m_mltProfile->dar(); delete m_blackClip; m_blackClip = NULL; @@ -297,31 +340,18 @@ int Render::resetProfile(const QString profileName) m_mltProducer = NULL; buildConsumer(profileName); double new_fps = m_mltProfile->fps(); - if (current_fps != new_fps) { - // fps changed, we must update the scenelist positions - scene = updateSceneListFps(current_fps, new_fps, scene); + double new_dar = m_mltProfile->dar(); + + 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(); - /*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; } @@ -334,6 +364,15 @@ void Render::seek(GenTime time) refresh(); } +void Render::seek(int time) +{ + if (!m_mltProducer) + return; + m_isBlocked = false; + m_mltProducer->seek(time); + refresh(); +} + //static /*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) { QPixmap pix(width, height); @@ -367,14 +406,26 @@ int Render::renderHeight() const return m_mltProfile->height(); } -QImage Render::extractFrame(int frame_position, int width, int height) +QImage Render::extractFrame(int frame_position, QString path, int width, int height) { if (width == -1) { width = renderWidth(); height = renderHeight(); } else if (width % 2 == 1) width++; - if (!m_mltProducer) { + 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); + delete producer; + return img; + } + else delete producer; + } + } + + if (!m_mltProducer || !path.isEmpty()) { QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); return pix; @@ -433,6 +484,10 @@ double Render::dar() const return m_mltProfile->dar(); } +double Render::sar() const +{ + return m_mltProfile->sar(); +} void Render::slotSplitView(bool doit) { @@ -499,18 +554,32 @@ void Render::slotSplitView(bool doit) } } -void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer) +void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip) { - KUrl url = KUrl(xml.attribute("resource", QString())); + 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; }*/ - if (xml.attribute("type").toInt() == COLOR) { + + if (type == COLOR) { producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData()); - } else if (xml.attribute("type").toInt() == TEXT) { + } 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()); @@ -523,21 +592,48 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int play.appendChild(doc.importNode(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()); + char *resTag = qstrdup(QString("nocache:" + path).toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); + delete[] resTag; } + if (producer == NULL || producer->is_blank() || !producer->is_valid()) { - kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "; - emit removeInvalidClip(clipId, replaceProducer); + 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; + } + } + 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); @@ -548,6 +644,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int 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); @@ -560,23 +661,45 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int 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 (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT - || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW) - producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1); + 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 length = xml.attribute("out").toInt() - xml.attribute("in").toInt(); + producer->set("length", length); + } - if (xml.hasAttribute("out")) - producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); + if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut); producer->set("id", clipId.toUtf8().constData()); if (xml.hasAttribute("templatetext")) producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData()); - if (!replaceProducer && xml.hasAttribute("file_hash")) { + if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) { // Clip already has all properties - emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); + 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; } @@ -587,12 +710,12 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int int frameNumber = xml.attribute("thumbnail", "0").toInt(); if (frameNumber != 0) producer->seek(frameNumber); - filePropertyMap["duration"] = QString::number(producer->get_playtime()); - //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); + filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime()); + //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime(); Mlt::Frame *frame = producer->get_frame(); - if (xml.attribute("type").toInt() == SLIDESHOW) { + if (type == SLIDESHOW) { int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; if (ttl) producer->set("ttl", ttl); if (!xml.attribute("animation").isEmpty()) { @@ -638,8 +761,9 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int } } - - filePropertyMap["fps"] = producer->get("source_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"); if (frame && frame->is_valid()) { filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height")); @@ -656,22 +780,35 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int else filePropertyMap["type"] = "video"; + int variance; mlt_image_format format = mlt_image_rgb24a; int frame_width = width; int frame_height = imageHeight; - uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); - QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied); QPixmap pix; - - 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()); - } else - pix.fill(Qt::black); - + 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); } else if (frame->get_int("test_audio") == 0) { @@ -720,17 +857,10 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int if (producer->get(property)) filePropertyMap["videocodec"] = producer->get(property); } - - if (KdenliveSettings::dropbframes()) { - kDebug() << "// LOOKING FOR H264 on: " << default_video; - snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); - kDebug() << "PROP: " << property << " = " << producer->get(property); - if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) { - kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS"; - producer->set("skip_loop_filter", "all"); - producer->set("skip_frame", "bidir"); - } - } + 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) { @@ -758,8 +888,8 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); - kDebug() << "REquested fuile info for: " << url.path(); - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); + if (replaceProducer) emit blockClipMonitor(clipId); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip); // FIXME: should delete this to avoid a leak... //delete producer; } @@ -805,13 +935,17 @@ 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; - - m_mltConsumer->purge(); + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); + } + m_mltConsumer->set("refresh", 0); + } + else { + return -1; + } m_isBlocked = true; if (m_mltProducer) { @@ -820,19 +954,19 @@ int Render::setProducer(Mlt::Producer *producer, int position) 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); - /*if (KdenliveSettings::dropbframes()) { - m_mltProducer->set("skip_loop_filter", "all"); - m_mltProducer->set("skip_frame", "bidir"); - }*/ + if (!m_mltProducer || !m_mltProducer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; 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) { @@ -854,7 +988,14 @@ int Render::setSceneList(QString playlist, int position) 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; + doc.setContent(playlist); + QDomElement profile = doc.documentElement().firstChildElement("profile"); + doc.documentElement().removeChild(profile); + playlist = doc.toString(); if (m_mltConsumer) { if (!m_mltConsumer->is_stopped()) { @@ -870,8 +1011,7 @@ int Render::setSceneList(QString playlist, int position) 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) { @@ -893,6 +1033,7 @@ int Render::setSceneList(QString playlist, int position) 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()); @@ -900,7 +1041,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(); @@ -911,14 +1052,17 @@ int Render::setSceneList(QString playlist, int position) } blockSignals(true); - m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); + 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); error = -1; } - + int volume = KdenliveSettings::volume(); + m_mltProducer->set("meta.volume", (double)volume / 100); m_mltProducer->optimise(); /*if (KdenliveSettings::osdtimecode()) { @@ -964,7 +1108,8 @@ int Render::setSceneList(QString playlist, int position) const QString Render::sceneList() { QString playlist; - Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:kdenlive_playlist"); + Mlt::Profile profile((mlt_profile) 0); + Mlt::Consumer xmlConsumer(profile, "xml:kdenlive_playlist"); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); @@ -1003,7 +1148,6 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) void Render::saveZone(KUrl url, QString desc, QPoint zone) { - kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name; Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); @@ -1072,9 +1216,17 @@ void Render::refreshDisplay() refresh(); } -void Render::setVolume(double /*volume*/) +int Render::volume() const +{ + if (!m_mltConsumer || !m_mltProducer) return -1; + return ((int) 100 * m_mltProducer->get_double("meta.volume")); +} + +void Render::slotSetVolume(int volume) { if (!m_mltConsumer || !m_mltProducer) return; + m_mltProducer->set("meta.volume", (double)volume / 100.0); + return; /*osdTimer->stop(); m_mltConsumer->set("refresh", 0); // Attach filter for on screen display of timecode @@ -1103,18 +1255,15 @@ 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(); } @@ -1126,14 +1275,12 @@ void Render::stop() { if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - kDebug() << "///////////// RENDER STOPPED: " << m_name; - m_isBlocked = true; + //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) { @@ -1142,13 +1289,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); @@ -1173,36 +1317,24 @@ void Render::pause() m_mltConsumer->purge(); } -void Render::switchPlay() +void Render::switchPlay(bool play) { if (!m_mltProducer || !m_mltConsumer) return; if (m_isZoneMode) resetZoneMode(); - if (m_mltProducer->get_speed() == 0.0) { + 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); - } else { + } else if (!play) { m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); //emit rendererPosition(m_framePosition); m_mltProducer->seek(m_framePosition); - m_mltConsumer->purge(); - //kDebug()<<" ********* RENDER PAUSE: "<get_speed(); - //m_mltConsumer->set("refresh", 0); - /*mlt_position position = mlt_producer_position( m_mltProducer->get_producer() ); - m_mltProducer->set_speed(0); - m_mltProducer->seek( position ); - //m_mltProducer->seek((int) m_framePosition); - m_isBlocked = false;*/ + //m_mltConsumer->purge(); } - /*if (speed == 0.0) { - m_mltProducer->seek((int) m_framePosition + 1); - m_mltConsumer->purge(); - }*/ - //refresh(); } void Render::play(double speed) @@ -1301,8 +1433,8 @@ void Render::refresh() void Render::setDropFrames(bool show) { if (m_mltConsumer) { - int dropFrames = 1; - if (show == false) dropFrames = 0; + int dropFrames = KdenliveSettings::mltthreads(); + if (show == false) dropFrames = -dropFrames; m_mltConsumer->stop(); if (m_winid == 0) m_mltConsumer->set("real_time", dropFrames); @@ -1341,13 +1473,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) @@ -1364,8 +1496,6 @@ void Render::emitConsumerStopped() if (m_isLoopMode) play(m_loopStart); else if (m_isZoneMode) resetZoneMode(); emit rendererStopped((int) pos); - //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent(GenTime((int) pos, m_fps), m_monitorId + 100)); - //new QCustomEvent(10002)); } } @@ -1412,7 +1542,7 @@ void Render::showFrame(Mlt::Frame& frame) QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); memcpy(qimage.scanLine(0), image, width * height * 4); emit showImageSignal(qimage); - showAudio(frame); + if (analyseAudio) showAudio(frame); if (sendFrameForAnalysis && frame.get_frame()->convert_image) { emit frameUpdated(qimage.rgbSwapped()); } @@ -1420,46 +1550,27 @@ void Render::showFrame(Mlt::Frame& frame) void Render::showAudio(Mlt::Frame& frame) { - if (!frame.is_valid() || frame.get_int("test_audio") != 0) return; - mlt_audio_format audio_format = mlt_audio_pcm; + if (!frame.is_valid() || frame.get_int("test_audio") != 0) { + return; + } + mlt_audio_format audio_format = mlt_audio_s16; int freq = 0; int num_channels = 0; int samples = 0; - uint8_t* data = (uint8_t*)frame.get_audio(audio_format, freq, num_channels, samples); - if (!data) + int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples); + + if (!data) { return; - int value = 0; - QByteArray channels; - for (int i = 0; i < num_channels; i++) { - /* switch (audio_format) - { - case 0: - value=( ( (uint8_t*)data) [i] ); - break; - case 1: - value=( ( (uint16_t*)data) [i] >> 8 ); - break; - case 2: - value=( ((uint32_t*)data) [i] >> 16 ); - break; - case 3: - value=( ((float*)data) [i]*255); - break; - default: - value=0; - } - */ - long val = 0; - int num_samples = 20; - for (int s = 0; s < samples; s += samples / num_samples) { - val += (data[i+s*num_channels] - 127); - } - channels.append(val / num_samples); } + // Data format: [ c00 c10 c01 c11 c02 c12 c03 c13 ... c0{samples-1} c1{samples-1} for 2 channels. + // So the vector is of size samples*channels. + QVector sampleVector(samples*num_channels); + memcpy(sampleVector.data(), data, samples*num_channels*sizeof(int16_t)); - if (samples > 0) - emit showAudioSignal(channels); + if (samples > 0) { + emit audioSamplesSignal(sampleVector, freq, num_channels, samples); + } } /* @@ -1522,20 +1633,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, "framebuffer", url.toUtf8().constData()); + 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); @@ -1704,7 +1815,7 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr return false; } Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(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); @@ -1735,7 +1846,8 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr 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)); + + 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); delete clip2; @@ -1761,34 +1873,21 @@ bool Render::mltRemoveClip(int track, GenTime position) kWarning() << "// TRACTOR PROBLEM"; return false; } - + //service.lock(); Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); - // Display playlist info - //kDebug() << "//// BEFORE -( " << position.frames(m_fps) << " )-------------------------------"; - /*for (int i = 0; i < trackPlaylist.count(); i++) { - int blankStart = trackPlaylist.clip_start(i); - int blankDuration = trackPlaylist.clip_length(i) - 1; - QString blk; - if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "< trackClipStartList, QMap } int position = trackPlaylist.clip_start(clipIndex); int blankDuration = trackPlaylist.clip_length(clipIndex); - diff = -diff; - if (blankDuration - diff == 0) { + if (blankDuration + diff == 0) { trackPlaylist.remove(clipIndex); - } else trackPlaylist.remove_region(position, diff); + } else trackPlaylist.remove_region(position, -diff); } trackPlaylist.consolidate_blanks(0); } @@ -2020,6 +2118,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou 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)); @@ -2048,16 +2147,16 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou QString id = clipparent.get("id"); if (speed <= 0 && speed > -1) speed = 1.0; //kDebug() << "CLIP SERVICE: " << serv; - if (serv == "avformat" && (speed != 1.0 || strobe > 1)) { + 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 @@ -2069,8 +2168,14 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou if (threads != 0) slowprod->set("threads", threads); if (original->parent().get("force_progressive")) slowprod->set("force_progressive", original->parent().get_int("force_progressive")); + if (original->parent().get("force_tff")) + slowprod->set("force_tff", original->parent().get_int("force_tff")); int ix = original->parent().get_int("video_index"); if (ix != 0) slowprod->set("video_index", ix); + int colorspace = original->parent().get_int("force_colorspace"); + if (colorspace != 0) slowprod->set("force_colorspace", colorspace); + int full_luma = original->parent().get_int("set.force_full_luma"); + if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); @@ -2124,13 +2229,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 @@ -2140,10 +2245,16 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou if (fps != 0.0) slowprod->set("force_fps", fps); if (original->parent().get("force_progressive")) slowprod->set("force_progressive", original->parent().get_int("force_progressive")); + if (original->parent().get("force_tff")) + slowprod->set("force_tff", original->parent().get_int("force_tff")); int threads = original->parent().get_int("threads"); if (threads != 0) slowprod->set("threads", threads); int ix = original->parent().get_int("video_index"); if (ix != 0) slowprod->set("video_index", ix); + int colorspace = original->parent().get_int("force_colorspace"); + if (colorspace != 0) slowprod->set("force_colorspace", colorspace); + int full_luma = original->parent().get_int("set.force_full_luma"); + if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); @@ -2179,7 +2290,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou 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; @@ -2193,11 +2304,11 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) 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); @@ -2208,7 +2319,7 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) 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 @@ -2236,18 +2347,17 @@ 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); @@ -2265,7 +2375,7 @@ bool Render::mltAddTrackEffect(int track, EffectsParameterList params) Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist - return mltAddEffect(trackService, params, 15000, true); + return mltAddEffect(trackService, params, trackProducer.get_playtime() - 1, true); } @@ -2347,8 +2457,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int // create filter QString tag = params.paramValue("tag"); - kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; - if (tag.startsWith("ladspa")) tag = "ladspa"; + //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; char *filterTag = qstrdup(tag.toUtf8().constData()); char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); QHash::Iterator it; @@ -2356,10 +2465,10 @@ 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(); @@ -2382,7 +2491,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) / factor).toUtf8().data()); service.attach(*filter); } } else for (int i = 0; i < keyFrames.size() - 1; ++i) { @@ -2402,8 +2511,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) / factor).toUtf8().data()); + filter->set(endtag, m_locale.toString((min + y2) / factor).toUtf8().data()); service.attach(*filter); offset = 1; } @@ -2434,6 +2543,11 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int 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()); @@ -2455,10 +2569,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); } @@ -2524,16 +2634,18 @@ 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")) { // This is a keyframe effect, to edit it, we remove it and re-add it. bool success = mltRemoveEffect(track, position, index, false); - if (!success) kDebug() << "// ERROR Removing effect : " << index; - if (position < GenTime()) success = mltAddTrackEffect(track, params); - else success = mltAddEffect(track, position, params); - if (!success) kDebug() << "// ERROR Adding effect : " << index; +// if (!success) kDebug() << "// ERROR Removing effect : " << index; + if (position < GenTime()) + success = mltAddTrackEffect(track, params); + else + success = mltAddEffect(track, position, params); +// if (!success) kDebug() << "// ERROR Adding effect : " << index; return success; } if (position < GenTime()) { @@ -2552,33 +2664,22 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par return false; } - Mlt::Service clipService(clip->get_service()); int duration = clip->get_playtime(); bool doRefresh = true; // Check if clip is visible in monitor int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); - if (diff < 0 || diff > duration) doRefresh = false; - delete clip; + if (diff < 0 || diff > duration) + doRefresh = false; m_isBlocked = true; int ct = 0; - /* kDebug() << "EDITING FILTER: "<get("kdenlive_id") <<", IX: "<get("kdenlive_ix"); - ct++; - filter = clipService.filter(ct); - } - kDebug() << "++++++++++++++++++++++++++"; - ct = 0; - filter = clipService.filter(ct); */ - Mlt::Filter *filter = clipService.filter(ct); + 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++; - filter = clipService.filter(ct); + filter = clip->filter(ct); } if (!filter) { @@ -2592,10 +2693,17 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par 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()); - } + } + + delete clip; mlt_service_unlock(service.get_service()); m_isBlocked = false; @@ -2818,11 +2926,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) int newDuration = (int) clipDuration.frames(m_fps) - 1; int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1); - int currentOut; - if (info.cropStart < GenTime()) - currentOut = newDuration - info.cropStart.frames(m_fps); - else - currentOut = newDuration + previousStart; + int currentOut = newDuration + previousStart; if (currentOut > clip->get_length()) { clip->parent().set("length", currentOut + 1); clip->parent().set("out", currentOut); @@ -2881,6 +2985,18 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); + // Make sure muting will not produce problems with our audio mixing transition, + // because audio mixing is done between each track and the lowest one + bool audioMixingBroken = false; + if (mute && trackProducer.get_int("hide") < 2 ) { + // We mute a track with sound + if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true; + } + else if (!mute && trackProducer.get_int("hide") > 1 ) { + // We un-mute a previously muted track + if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true; + } + if (mute) { if (blind) trackProducer.set("hide", 3); else trackProducer.set("hide", 2); @@ -2889,11 +3005,63 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) } else { trackProducer.set("hide", 0); } + if (audioMixingBroken) fixAudioMixing(tractor); + tractor.multitrack()->refresh(); tractor.refresh(); refresh(); } +int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor) +{ + for (int i = 1; i < tractor.count(); i++) { + Mlt::Producer trackProducer(tractor.track(i)); + if (trackProducer.get_int("hide") < 2) return i; + } + return tractor.count() - 1; +} + +void Render::fixAudioMixing(Mlt::Tractor tractor) +{ + // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track + int lowestTrack = getLowestNonMutedAudioTrack(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); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + mlt_service nextservicetodisconnect; + // Delete all audio mixing transitions + while (mlt_type == "transition") { + if (resource == "mix") { + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); + } + else nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + + // Re-add correct audio transitions + for (int i = lowestTrack + 1; i < tractor.count(); i++) { + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); + transition->set("always_active", 1); + transition->set("combine", 1); + transition->set("internal_added", 237); + field->plant_transition(*transition, lowestTrack, i); + } + mlt_service_unlock(serv); + m_isBlocked--; +} bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) { @@ -2950,8 +3118,9 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) m_isBlocked = true; previousStart += moveFrame; + if (previousStart < 0) { - // special case, in point becoming negative (resizing images) + // this is possible for images and color clips previousOut -= previousStart; previousStart = 0; } @@ -2976,8 +3145,10 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) if (! trackPlaylist.is_blank(blankIndex)) { kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK"; } - if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex); - else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); + if (blankLength + moveFrame == 0) + trackPlaylist.remove(blankIndex); + else + trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); } trackPlaylist.consolidate_blanks(0); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { @@ -3008,9 +3179,8 @@ 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"; @@ -3062,7 +3232,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); @@ -3284,12 +3454,11 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - field->plant_transition(tr, a_track, b_track); // re-add upper transitions - for (int i = 0; i < trList.count(); i++) { - // kDebug()<< "REPLANT ON TK: "<get_a_track()<<", "<get_b_track(); + for (int i = trList.count() - 1; i >= 0; i--) { + //kDebug()<< "REPLANT ON TK: "<get_a_track()<<", "<get_b_track(); field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track()); } } @@ -3298,6 +3467,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: "< map = mltGetTransitionParamsFromXml(xml); QMap::Iterator it; @@ -3393,7 +3562,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; @@ -3430,8 +3599,8 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) if (!e.attribute("value").isEmpty()) { map[name] = e.attribute("value"); } - if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) { - map[name] = QString::number(map[name].toDouble() / e.attribute("factor").toDouble()); + if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) { + map[name] = m_locale.toString(map.value(name).toDouble() / e.attribute("factor").toDouble()); //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . , } @@ -3614,6 +3783,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(); @@ -3622,8 +3793,12 @@ 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; } @@ -3656,15 +3831,16 @@ const QList Render::producersList() delete tt; Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); - //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; 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) { - if (!nprod->is_blank() && !ids.contains(nprod->get("id"))) { - 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; } @@ -3691,7 +3867,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")); @@ -3832,17 +4008,7 @@ void Render::mltDeleteTrack(int ix) tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); - - /* if (m_mltProducer != NULL) { - Mlt::Producer parentProd(m_mltProducer->parent()); - if (parentProd.get_producer() != NULL) { - Mlt::Service service(parentProd.get_service()); - if (service.type() == tractor_type) { - Mlt::Tractor tractor(service); - mltCheckLength(&tractor); - } - } - }*/ + emit refreshDocumentProducers(false, false); } @@ -3971,6 +4137,11 @@ void Render::sendFrameUpdate() } } +Mlt::Producer* Render::getProducer() +{ + return m_mltProducer; +} + #include "renderer.moc"