X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=51670b58118d0e16a4a3131f7b337dd36564b34e;hb=f90fd0bd3c420f17c41b4375bbc4e6c520343c4c;hp=bde98fdc2d70bcd56809828bcccd61bf31a58779;hpb=f722d44be27015bce4997277d92f8c71be3af3b4;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index bde98fdc..51670b58 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -53,6 +53,7 @@ #include +#define SEEK_INACTIVE (-1) static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl) { @@ -103,9 +104,9 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ } } -Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : +Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) : AbstractRender(rendererName, parent), - analyseAudio(KdenliveSettings::monitor_audio()), + requestedSeekPosition(SEEK_INACTIVE), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), @@ -119,14 +120,17 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget m_blackClip(NULL), m_winid(winid) { + qRegisterMetaType ("stringMap"); + analyseAudio = KdenliveSettings::monitor_audio(); if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); buildConsumer(profile); 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); + m_refreshTimer.setInterval(70); connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); + connect(this, SIGNAL(multiStreamFound(const QString &,QList,QList,stringMap)), this, SLOT(slotMultiStreamProducerFound(const QString &,QList,QList,stringMap))); } Render::~Render() @@ -137,7 +141,7 @@ Render::~Render() void Render::closeMlt() -{ +{ //delete m_osdTimer; m_requestList.clear(); m_infoThread.waitForFinished(); @@ -174,7 +178,7 @@ void Render::closeMlt() service.unlock(); }*/ - kDebug() << "// // // CLOSE RENDERER " << m_name; + //kDebug() << "// // // CLOSE RENDERER " << m_name; if (m_blackClip) delete m_blackClip; //delete m_osdInfo; } @@ -189,21 +193,29 @@ void Render::buildConsumer(const QString &profileName) delete m_blackClip; m_blackClip = NULL; - //TODO: uncomment following line when everything is clean - // uncommented Feb 2011 --Granjow - if (m_mltProfile) delete m_mltProfile; m_activeProfile = profileName; - char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); - setenv("MLT_PROFILE", tmp, 1); - m_mltProfile = new Mlt::Profile(tmp); + if (m_mltProfile) { + Mlt::Profile tmpProfile(m_activeProfile.toUtf8().constData()); + m_mltProfile->set_colorspace(tmpProfile.colorspace()); + m_mltProfile->set_frame_rate(tmpProfile.frame_rate_num(), tmpProfile.frame_rate_den()); + m_mltProfile->set_height(tmpProfile.height()); + m_mltProfile->set_width(tmpProfile.width()); + m_mltProfile->set_progressive(tmpProfile.progressive()); + m_mltProfile->set_sample_aspect(tmpProfile.sample_aspect_num(), tmpProfile.sample_aspect_den()); + m_mltProfile->get_profile()->display_aspect_num = tmpProfile.display_aspect_num(); + m_mltProfile->get_profile()->display_aspect_den = tmpProfile.display_aspect_den(); + } + else { + m_mltProfile = new Mlt::Profile(m_activeProfile.toUtf8().constData()); + } + setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1); 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") { + if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor) { #ifdef USE_BLACKMAGIC // Use blackmagic card for video output QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName); @@ -211,16 +223,16 @@ void Render::buildConsumer(const QString &profileName) 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) { + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData()); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + mlt_log_set_callback(kdenlive_callback); + } if (m_mltConsumer->is_valid()) { m_externalConsumer = true; - m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("terminate_on_pause", 0); 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())); @@ -242,15 +254,19 @@ void Render::buildConsumer(const QString &profileName) //m_mltConsumer->set("fullscreen", 1); if (m_winid == 0) { // OpenGL monitor - m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); + if (!m_mltConsumer) { + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); + } m_mltConsumer->set("preview_off", 1); m_mltConsumer->set("preview_format", mlt_image_rgb24a); - 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"); - 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); + if (!m_mltConsumer) { + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); + 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); m_mltConsumer->set("terminate_on_pause", 1); @@ -285,7 +301,7 @@ void Render::buildConsumer(const QString &profileName) Mlt::Producer *Render::invalidProducer(const QString &id) { Mlt::Producer *clip; - QString txt = "+" + i18n("Missing clip") + ".txt"; + QString txt = '+' + i18n("Missing clip") + ".txt"; char *tmp = qstrdup(txt.toUtf8().constData()); clip = new Mlt::Producer(*m_mltProfile, tmp); delete[] tmp; @@ -324,12 +340,6 @@ 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(); @@ -360,7 +370,7 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) buildConsumer(profileName); double new_fps = m_mltProfile->fps(); double new_dar = m_mltProfile->dar(); - + if (!dropSceneList) { // We need to recover our playlist if (current_fps != new_fps) { @@ -376,24 +386,23 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) void Render::seek(GenTime time) { - if (!m_mltProducer) - return; - - m_mltProducer->seek((int)(time.frames(m_fps))); - if (m_mltProducer->get_speed() == 0) { - refresh(); - } + int pos = time.frames(m_fps); + seek(pos); } void Render::seek(int time) { if (!m_mltProducer) return; - - m_mltProducer->seek(time); - if (m_mltProducer->get_speed() == 0) { - refresh(); - } + if (requestedSeekPosition == SEEK_INACTIVE) { + requestedSeekPosition = time; + m_mltProducer->seek(time); + m_mltConsumer->purge(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } + } + else requestedSeekPosition = time; } //static @@ -447,7 +456,7 @@ QImage Render::extractFrame(int frame_position, QString path, int width, int hei else delete producer; } } - + if (!m_mltProducer || !path.isEmpty()) { QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); @@ -531,26 +540,25 @@ void Render::slotSplitView(bool doit) transition->set("b_track", i); transition->set("distort", 1); transition->set("internal_added", "200"); - const char *tmp; + QString geometry; switch (screen) { case 0: - tmp = "0,0:50%x50%"; + geometry = "0/0:50%x50%"; break; case 1: - tmp = "50%,0:50%x50%"; + geometry = "50%/0:50%x50%"; break; case 2: - tmp = "0,50%:50%x50%"; + geometry = "0/50%:50%x50%"; break; case 3: default: - tmp = "50%,50%:50%x50%"; + geometry = "50%/50%:50%x50%"; break; } - transition->set("geometry", tmp); + transition->set("geometry", geometry.toUtf8().constData()); transition->set("always_active", "1"); field->plant_transition(*transition, 0, i); - //delete[] tmp; screen++; } } @@ -561,13 +569,16 @@ void Render::slotSplitView(bool doit) 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; while (mlt_type == "transition") { QString added = mlt_properties_get(MLT_SERVICE_PROPERTIES(nextservice), "internal_added"); if (added == "200") { - mlt_field_disconnect_service(field->get_field(), nextservice); + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); } - nextservice = mlt_service_producer(nextservice); + else nextservice = mlt_service_producer(nextservice); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -644,7 +655,7 @@ void Render::processFileProperties() info = m_requestList.takeFirst(); m_processingClipId = info.clipId; m_infoMutex.unlock(); - + QString path; bool proxyProducer; if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") { @@ -784,7 +795,7 @@ void Render::processFileProperties() 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) { @@ -805,9 +816,9 @@ void Render::processFileProperties() 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(); @@ -857,20 +868,54 @@ void Render::processFileProperties() } } } - - // 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 (!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"); - } + int vindex = -1; + const QString mltService = producer->get("mlt_service"); + + if (mltService == "xml" || mltService == "consumer") { + // MLT playlist + mlt_profile prof = producer->get_profile(); + filePropertyMap["progressive"] = QString::number(prof->progressive); + filePropertyMap["colorspace"] = QString::number(prof->colorspace); + filePropertyMap["fps"] = QString::number(mlt_profile_fps(prof)); + } + else if (mltService == "avformat") { + // Get frame rate + vindex = producer->get_int("video_index"); + + // List streams + int streams = producer->get_int("meta.media.nb_streams"); + QList audio_list; + QList video_list; + for (int i = 0; i < streams; i++) { + QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); + QString type = producer->get(propertyName.data()); + if (type == "audio") audio_list.append(i); + else if (type == "video") video_list.append(i); + } + + if (!info.xml.hasAttribute("video_index") && video_list.count() > 1) { + // Clip has more than one video stream, ask which one should be used + QMap data; + if (info.xml.hasAttribute("group")) data.insert("group", info.xml.attribute("group")); + if (info.xml.hasAttribute("groupId")) data.insert("groupId", info.xml.attribute("groupId")); + emit multiStreamFound(path, audio_list, video_list, data); + // Force video index so that when reloading the clip we don't ask again for other streams + filePropertyMap["video_index"] = QString::number(vindex); + } + + if (vindex > -1) { + snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", vindex); + if (producer->get(property)) + filePropertyMap["fps"] = producer->get(property); + } + + 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"); + } + } Mlt::Frame *frame = producer->get_frame(); if (frame && frame->is_valid()) { @@ -914,61 +959,63 @@ void Render::processFileProperties() // Retrieve audio / video codec name // If there is a - 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 video_max = 0; - int default_audio = producer->get_int("audio_index"); - int audio_max = 0; - - int scan = producer->get_int("meta.media.progressive"); - filePropertyMap["progressive"] = QString::number(scan); - - // 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); - } 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); - } - } + if (mltService == "avformat") { + 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 video_max = 0; + int default_audio = producer->get_int("audio_index"); + int audio_max = 0; + + int scan = producer->get_int("meta.media.progressive"); + filePropertyMap["progressive"] = QString::number(scan); + + // 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); + } 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; @@ -1029,6 +1076,7 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { m_refreshTimer.stop(); + requestedSeekPosition = SEEK_INACTIVE; QMutexLocker locker(&m_mutex); QString currentId; int consumerPosition = 0; @@ -1103,6 +1151,7 @@ int Render::setSceneList(QDomDocument list, int position) int Render::setSceneList(QString playlist, int position) { + requestedSeekPosition = SEEK_INACTIVE; m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; @@ -1261,7 +1310,6 @@ const QString Render::sceneList() if (split) slotSplitView(false); xmlConsumer.connect(prod); xmlConsumer.run(); - //while (!xmlConsumer.is_stopped()) {} playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist")); if (split) slotSplitView(true); return playlist; @@ -1272,6 +1320,7 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) QFile file(path); QDomDocument doc; doc.setContent(sceneList(), false); + if (doc.isNull()) return false; QDomElement root = doc.documentElement(); if (!kdenliveData.isNull() && !root.isNull()) { // add Kdenlive specific tags @@ -1295,7 +1344,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); - if (m_name == "clip") { + if (m_name == Kdenlive::clipMonitor) { Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y()); Mlt::Playlist list; list.insert_at(0, prod, 0); @@ -1317,6 +1366,34 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) xmlConsumer.start(); } + +bool Render::saveClip(int track, GenTime position, KUrl url, QString desc) +{ + // find clip + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (!clip) { + kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); + return false; + } + + Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); + xmlConsumer.set("terminate_on_pause", 1); + Mlt::Playlist list; + list.insert_at(0, clip, 0); + //delete clip; + list.set("title", desc.toUtf8().constData()); + xmlConsumer.connect(list); + xmlConsumer.run(); + kDebug()<<"// SAVED: "<get_speed() == 0.0) return; @@ -1421,11 +1501,12 @@ void Render::pause() void Render::switchPlay(bool play) { QMutexLocker locker(&m_mutex); + requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; if (m_isZoneMode) resetZoneMode(); if (play && m_mltProducer->get_speed() == 0.0) { - if (m_name == "clip" && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); + if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); if (m_mltConsumer->is_stopped()) { m_mltConsumer->start(); } @@ -1437,7 +1518,7 @@ void Render::switchPlay(bool play) 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(); @@ -1451,6 +1532,7 @@ void Render::switchPlay(bool play) void Render::play(double speed) { + requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer) return; // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); @@ -1464,6 +1546,7 @@ void Render::play(double speed) void Render::play(const GenTime & startTime) { + requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1473,6 +1556,7 @@ void Render::play(const GenTime & startTime) void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) { + requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; //m_mltProducer->set("eof", "loop"); @@ -1483,6 +1567,7 @@ void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { + requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; @@ -1496,7 +1581,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) void Render::resetZoneMode() { - if (!m_isZoneMode && !m_isLoopMode) return; + if (!m_mltProducer || (!m_isZoneMode && !m_isLoopMode)) return; m_mltProducer->set("out", m_originalOut); //m_mltProducer->set("eof", "pause"); m_isZoneMode = false; @@ -1505,22 +1590,16 @@ void Render::resetZoneMode() void Render::seekToFrame(int pos) { - if (!m_mltProducer) - return; resetZoneMode(); - m_mltProducer->seek(pos); - if (m_mltProducer->get_speed() == 0) { - refresh(); - } + seek(pos); } void Render::seekToFrameDiff(int diff) { - if (!m_mltProducer) - return; resetZoneMode(); - m_mltProducer->seek(m_mltProducer->position() + diff); - refresh(); + if (requestedSeekPosition == SEEK_INACTIVE) + seek(m_mltProducer->position() + diff); + else seek(requestedSeekPosition + diff); } void Render::doRefresh() @@ -1567,7 +1646,8 @@ double Render::playSpeed() const GenTime Render::seekPosition() const { - if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps); + if (m_mltConsumer) return GenTime((int) m_mltConsumer->position(), m_fps); + //if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps); else return GenTime(); } @@ -1578,25 +1658,36 @@ int Render::seekFramePosition() const return 0; } -const QString & Render::rendererName() const -{ - return m_name; -} - void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24; + mlt_image_format format = mlt_image_rgb24a; + int width = 0; + int height = 0; + const uchar* image = frame.get_image(format, width, height); + QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 4); + + /*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_RGB888); - memcpy(qimage.bits(), image, width * height * 3); - emit frameUpdated(qimage); + memcpy(qimage.bits(), image, width * height * 3);*/ + emit frameUpdated(qimage.rgbSwapped()); } void Render::emitFrameNumber() { - if (m_mltConsumer) emit rendererPosition((int) m_mltConsumer->position()); + int currentPos = m_mltConsumer->position(); + if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; + emit rendererPosition(currentPos); + if (requestedSeekPosition != SEEK_INACTIVE) { + m_mltProducer->seek(requestedSeekPosition); + requestedSeekPosition = SEEK_INACTIVE; + if (m_mltProducer->get_speed() == 0) { + refresh(); + } + } } void Render::emitConsumerStopped() @@ -1658,14 +1749,25 @@ void Render::showFrame(Mlt::Frame& frame) } } +void Render::disablePreview(bool disable) +{ + if (m_mltConsumer) { + m_mltConsumer->stop(); + m_mltConsumer->set("preview_off", (int) disable); + m_mltConsumer->set("refresh", 0); + m_mltConsumer->start(); + } +} + void Render::showAudio(Mlt::Frame& frame) { 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; + //FIXME: should not be hardcoded.. + int freq = 48000; + int num_channels = 2; int samples = 0; int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples); @@ -1831,12 +1933,12 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro } -void Render::mltCutClip(int track, GenTime position) +bool Render::mltCutClip(int track, GenTime position) { Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; - return; + return false; } Mlt::Tractor tractor(service); @@ -1859,7 +1961,7 @@ 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"; - return; + return false; } service.lock(); int clipStart = trackPlaylist.clip_start(clipIndex); @@ -1869,12 +1971,16 @@ void Render::mltCutClip(int track, GenTime position) // duplicate effects Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart); Mlt::Producer *clip = trackPlaylist.get_clip_at(cutPos); - + if (original == NULL || clip == NULL) { kDebug() << "// ERROR GRABBING CLIP AFTER SPLIT"; + return false; } + Mlt::Service clipService(original->get_service()); Mlt::Service dupService(clip->get_service()); + + delete original; delete clip; int ct = 0; @@ -1896,7 +2002,7 @@ void Render::mltCutClip(int track, GenTime position) ct++; filter = clipService.filter(ct); } - + return true; /* // Display playlist info kDebug()<<"//////////// AFTER"; for (int i = 0; i < trackPlaylist.count(); i++) { @@ -1925,7 +2031,7 @@ Mlt::Tractor *Render::lockService() } service.lock(); return new Mlt::Tractor(service); - + } void Render::unlockService(Mlt::Tractor *tractor) @@ -2527,7 +2633,6 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int { bool updateIndex = false; const int filter_ix = params.paramValue("kdenlive_ix").toInt(); - const QString region = params.paramValue("region"); int ct = 0; service.lock(); @@ -2571,15 +2676,30 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter = service.filter(ct); } - // create filter + addFilterToService(service, params, duration); + + // re-add following filters + for (int i = 0; i < filtersList.count(); i++) { + Mlt::Filter *filter = filtersList.at(i); + if (updateIndex) + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); + service.attach(*filter); + } + service.unlock(); + if (doRefresh) refresh(); + return true; +} + + +bool Render::addFilterToService(Mlt::Service service, EffectsParameterList params, int duration) +{ + // create filter QString tag = params.paramValue("tag"); //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; char *filterTag = qstrdup(tag.toUtf8().constData()); char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); - QHash::Iterator it; QString kfr = params.paramValue("keyframes"); - - if (!kfr.isEmpty()) { + if (!kfr.isEmpty()) { QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData()); @@ -2640,20 +2760,9 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } else { Mlt::Filter *filter; QString prefix; - if (!region.isEmpty()) { - filter = new Mlt::Filter(*m_mltProfile, "region"); - } else filter = new Mlt::Filter(*m_mltProfile, filterTag); + filter = new Mlt::Filter(*m_mltProfile, filterTag); if (filter && filter->is_valid()) { filter->set("kdenlive_id", filterId); - if (!region.isEmpty()) { - filter->set("resource", region.toUtf8().constData()); - filter->set("kdenlive_ix", params.paramValue("kdenlive_ix").toUtf8().constData()); - filter->set("filter0", filterTag); - prefix = "filter0."; - params.removeParam("id"); - params.removeParam("region"); - params.removeParam("kdenlive_ix"); - } } else { kDebug() << "filter is NULL"; service.unlock(); @@ -2685,22 +2794,12 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int //kDebug() << "SOX EFFECTS: " << effectArgs.simplified(); filter->set("effect", effectArgs.simplified().toUtf8().constData()); } - // attach filter to the clip service.attach(*filter); } + delete[] filterId; delete[] filterTag; - - // re-add following filters - for (int i = 0; i < filtersList.count(); i++) { - Mlt::Filter *filter = filtersList.at(i); - if (updateIndex) - filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); - service.attach(*filter); - } - service.unlock(); - if (doRefresh) refresh(); return true; } @@ -2742,7 +2841,6 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params) refresh(); return true; - } bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) @@ -2750,7 +2848,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par 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")) { + if (!params.paramValue("keyframes").isEmpty() || (tag == "affine" && params.hasParam("background")) || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { // 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; @@ -2801,18 +2899,46 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par bool success = mltAddEffect(track, position, params); return success; } - QString prefix; + ct = 0; QString ser = filter->get("mlt_service"); - if (ser == "region") prefix = "filter0."; + QList filtersList; + service.lock(); + if (ser != tag) { + // Effect service changes, delete effect and re-add it + clip->detach(*filter); + + // Delete all effects after deleted one + filter = clip->filter(ct); + while (filter) { + if (filter->get_int("kdenlive_ix") > index) { + filtersList.append(filter); + clip->detach(*filter); + } + else ct++; + filter = clip->filter(ct); + } + + // re-add filter + addFilterToService(*clip, params, clip->get_playtime()); + delete clip; + service.unlock(); + + if (doRefresh) refresh(); + return true; + } 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()); } - 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()); - } + filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData()); + } + + for (int j = 0; j < filtersList.count(); j++) { + clip->attach(*(filtersList.at(j))); + } delete clip; service.unlock(); @@ -2821,6 +2947,71 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par return true; } +bool Render::mltEnableEffects(int track, GenTime position, QList effectIndexes, bool disable) +{ + if (position < GenTime()) { + return mltEnableTrackEffects(track, effectIndexes, disable); + } + // find filter + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (!clip) { + kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); + return false; + } + + 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; + int ct = 0; + + Mlt::Filter *filter = clip->filter(ct); + while (filter) { + if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) { + filter->set("disable", (int) disable); + } + ct++; + filter = clip->filter(ct); + } + + delete clip; + service.unlock(); + + if (doRefresh) refresh(); + return true; +} + +bool Render::mltEnableTrackEffects(int track, QList effectIndexes, bool disable) +{ + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + Mlt::Service clipService(trackPlaylist.get_service()); + int ct = 0; + + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (effectIndexes.contains(filter->get_int("kdenlive_ix"))) { + filter->set("disable", (int) disable); + } + ct++; + filter = clipService.filter(ct); + } + service.unlock(); + + refresh(); + return true; +} + void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) { Mlt::Service service(m_mltProducer->parent().get_service()); @@ -3105,7 +3296,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) trackProducer.set("hide", 0); } if (audioMixingBroken) fixAudioMixing(tractor); - + tractor.multitrack()->refresh(); tractor.refresh(); refresh(); @@ -3160,10 +3351,10 @@ void Render::fixAudioMixing(Mlt::Tractor tractor) mlt_service_unlock(serv); } -bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) +bool Render::mltResizeClipCrop(ItemInfo info, GenTime newCropStart) { Mlt::Service service(m_mltProducer->parent().get_service()); - int frameOffset = (int) diff.frames(m_fps); + int newCropFrame = (int) newCropStart.frames(m_fps); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -3182,7 +3373,13 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) int previousStart = clip->get_in(); int previousOut = clip->get_out(); delete clip; - trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset); + if (previousStart == newCropFrame) { + kDebug() << "//////// No ReSIZING Required"; + service.unlock(); + return true; + } + int frameOffset = newCropFrame - previousStart; + trackPlaylist.resize_clip(clipIndex, newCropFrame, previousOut + frameOffset); service.unlock(); m_mltConsumer->set("refresh", 1); return true; @@ -3309,41 +3506,59 @@ 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; + int clipDuration = trackPlaylist.clip_length(clipIndex); bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) { - // error, destination is not empty - if (clipProducer) { - if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1); - delete clipProducer; + if (!overwrite) { + bool success = true; + if (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) { + success = false; + } + else { + // Check that the destination region is empty + trackPlaylist.consolidate_blanks(0); + int destinationIndex = trackPlaylist.get_clip_index_at(moveEnd); + if (destinationIndex < trackPlaylist.count() - 1) { + // We are not at the end of the track + int blankSize = trackPlaylist.blanks_from(destinationIndex, 1); + // Make sure we have enough place to insert clip + if (blankSize - clipDuration - (moveEnd - trackPlaylist.clip_start(destinationIndex)) < 0) success = false; + } } - //int ix = trackPlaylist.get_clip_index_at(moveEnd); - kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; - service.unlock(); - return false; - } else { - trackPlaylist.consolidate_blanks(0); - if (overwrite) { - trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime()); - int clipIndex = trackPlaylist.get_clip_index_at(moveEnd); - trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1); + if (!success) { + if (clipProducer) { + trackPlaylist.insert_at(moveStart, clipProducer, 1); + delete clipProducer; + } + kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; + service.unlock(); + return false; } - int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); - trackPlaylist.consolidate_blanks(1); + } + + if (overwrite) { + trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime()); + int clipIndex = trackPlaylist.get_clip_index_at(moveEnd); + trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1); + } + int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + if (newIndex == -1) { + kDebug()<<"// CANNOT MOVE CLIP TO: "<parent().get("mlt_service"); QString currentid = clipProducer->parent().get("id"); - if (serv == "framebuffer" || currentid.endsWith("_video")) { + if (serv == "framebuffer") { clip = clipProducer; } else { if (prod == NULL) { @@ -3465,6 +3680,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n while (mlt_type == "transition") { Mlt::Transition transition((mlt_transition) nextservice); + nextservice = mlt_service_producer(nextservice); int currentTrack = transition.get_b_track(); int currentIn = (int) transition.get_in(); int currentOut = (int) transition.get_out(); @@ -3483,7 +3699,6 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n } else transition.set_in_and_out(new_in, new_out); break; } - nextservice = mlt_service_producer(nextservice); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -3503,12 +3718,16 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); QList trList; + mlt_properties insertproperties = tr.get_properties(); + QString insertresource = mlt_properties_get(insertproperties, "mlt_service"); + bool isMixTransition = insertresource == "mix"; while (mlt_type == "transition") { Mlt::Transition transition((mlt_transition) nextservice); + nextservice = mlt_service_producer(nextservice); int aTrack = transition.get_a_track(); int bTrack = transition.get_b_track(); - if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) { + if ((isMixTransition || resource != "mix") && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) { Mlt::Properties trans_props(transition.get_properties()); Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service")); Mlt::Properties new_trans_props(cp->get_properties()); @@ -3518,7 +3737,6 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr } //else kDebug() << "// FOUND TRANS OK, "<get_a_track()<<", "<get_b_track(); field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track()); } + qDeleteAll(trList); } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force) @@ -3834,29 +4053,29 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); - Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, tag.toUtf8().constData()); + Mlt::Transition transition(*m_mltProfile, tag.toUtf8().constData()); if (out != GenTime()) - transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1); + transition.set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1); if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false; QMap::Iterator it; QString key; - if (xml.attribute("automatic") == "1") transition->set("automatic", 1); + if (xml.attribute("automatic") == "1") transition.set("automatic", 1); //kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count(); if (xml.hasAttribute("id")) - transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData()); + transition.set("kdenlive_id", xml.attribute("id").toUtf8().constData()); if (xml.hasAttribute("force_track")) - transition->set("force_track", xml.attribute("force_track").toInt()); + transition.set("force_track", xml.attribute("force_track").toInt()); for (it = args.begin(); it != args.end(); ++it) { key = it.key(); if (!it.value().isEmpty()) - transition->set(key.toUtf8().constData(), it.value().toUtf8().constData()); + transition.set(key.toUtf8().constData(), it.value().toUtf8().constData()); //kDebug() << " ------ ADDING TRANS PARAM: " << key << ": " << it.value(); } // attach transition service.lock(); - mltPlantTransition(field, *transition, a_track, b_track); + mltPlantTransition(field, transition, a_track, b_track); // field->plant_transition(*transition, a_track, b_track); service.unlock(); if (do_refresh) refresh(); @@ -3943,19 +4162,17 @@ void Render::fillSlowMotionProducers() } } -void Render::mltInsertTrack(int ix, bool videoTrack) +QList Render::mltInsertTrack(int ix, bool videoTrack) { - blockSignals(true); - Mlt::Service service(m_mltProducer->parent().get_service()); - service.lock(); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; - return; + return QList (); } - + blockSignals(true); + service.lock(); Mlt::Tractor tractor(service); - + QList transitionInfos; Mlt::Playlist playlist; int ct = tractor.count(); if (ix > ct) { @@ -3988,20 +4205,51 @@ void Render::mltInsertTrack(int ix, bool videoTrack) 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::Field *field = tractor.field(); + QList trList; while (mlt_type == "transition") { if (resource != "mix") { - mlt_transition tr = (mlt_transition) nextservice; - int currentTrack = mlt_transition_get_b_track(tr); - int currentaTrack = mlt_transition_get_a_track(tr); - mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); - - if (currentTrack >= ix) { - mlt_properties_set_int(properties, "b_track", currentTrack + 1); - mlt_properties_set_int(properties, "a_track", currentaTrack + 1); - } + Mlt::Transition transition((mlt_transition) nextservice); + nextservice = mlt_service_producer(nextservice); + int currentbTrack = transition.get_b_track(); + int currentaTrack = transition.get_a_track(); + bool trackChanged = false; + bool forceTransitionTrack = false; + if (currentbTrack >= ix) { + if (currentbTrack == ix && currentaTrack < ix) forceTransitionTrack = true; + currentbTrack++; + trackChanged = true; + } + if (currentaTrack >= ix) { + currentaTrack++; + trackChanged = true; + } + kDebug()<<"// Newtrans: "<get_properties()); + new_trans_props.inherit(trans_props); + + if (trackChanged) { + // Transition track needs to be adjusted + cp->set("a_track", currentaTrack); + cp->set("b_track", currentbTrack); + // Check if transition track was changed and needs to be forced + if (forceTransitionTrack) cp->set("force_track", 1); + TransitionInfo trInfo; + trInfo.startPos = GenTime(transition.get_in(), m_fps); + trInfo.a_track = currentaTrack; + trInfo.b_track = currentbTrack; + trInfo.forceTrack = cp->get_int("force_track"); + transitionInfos.append(trInfo); + } + trList.append(cp); + field->disconnect_service(transition); } - nextservice = mlt_service_producer(nextservice); + else nextservice = mlt_service_producer(nextservice); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -4009,19 +4257,23 @@ void Render::mltInsertTrack(int ix, bool videoTrack) } // Add audio mix transition to last track - Mlt::Field *field = tractor.field(); - Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); - transition->set("a_track", 1); - transition->set("b_track", ct); - transition->set("always_active", 1); - transition->set("internal_added", 237); - transition->set("combine", 1); - field->plant_transition(*transition, 1, ct); - //mlt_service_unlock(m_mltConsumer->get_service()); + Mlt::Transition transition(*m_mltProfile, "mix"); + transition.set("a_track", 1); + transition.set("b_track", ct); + transition.set("always_active", 1); + transition.set("internal_added", 237); + transition.set("combine", 1); + mltPlantTransition(field, transition, 1, ct); + + // re-add transitions + for (int i = trList.count() - 1; i >= 0; i--) { + field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track()); + } + qDeleteAll(trList); + service.unlock(); - //tractor.multitrack()->refresh(); - //tractor.refresh(); blockSignals(false); + return transitionInfos; } @@ -4211,5 +4463,110 @@ const QString Render::activeClipId() return QString(); } +//static +bool Render::getBlackMagicDeviceList(KComboBox *devicelist) +{ + if (!KdenliveSettings::decklink_device_found()) return false; + Mlt::Profile profile; + Mlt::Producer bm(profile, "decklink"); + int found_devices = 0; + if (bm.is_valid()) { + bm.set("list_devices", 1); + found_devices = bm.get_int("devices"); + } + else KdenliveSettings::setDecklink_device_found(false); + if (found_devices <= 0) { + devicelist->setEnabled(false); + return false; + } + for (int i = 0; i < found_devices; i++) { + char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); + devicelist->addItem(bm.get(tmp)); + delete[] tmp; + } + return true; +} + +bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist) +{ + if (!KdenliveSettings::decklink_device_found()) return false; + Mlt::Profile profile; + Mlt::Consumer bm(profile, "decklink"); + int found_devices = 0; + if (bm.is_valid()) { + bm.set("list_devices", 1); + found_devices = bm.get_int("devices"); + } + else KdenliveSettings::setDecklink_device_found(false); + if (found_devices <= 0) { + devicelist->setEnabled(false); + return false; + } + for (int i = 0; i < found_devices; i++) { + char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); + devicelist->addItem(bm.get(tmp)); + delete[] tmp; + } + return true; +} + +void Render::slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data) +{ + int width = 60.0 * m_mltProfile->dar(); + int swidth = 60.0 * m_mltProfile->width() / m_mltProfile->height(); + if (width % 2 == 1) width++; + + KDialog dialog(qApp->activeWindow()); + dialog.setCaption("Multi Stream Clip"); + dialog.setButtons(KDialog::Ok | KDialog::Cancel); + dialog.setButtonText(KDialog::Ok, i18n("Import selected clips")); + QWidget *content = new QWidget(&dialog); + dialog.setMainWidget(content); + QVBoxLayout *vbox = new QVBoxLayout(content); + QLabel *lab1 = new QLabel(i18n("Additional streams for clip\n %1", path), content); + vbox->addWidget(lab1); + QList groupList; + QList comboList; + // We start loading the list at 1, video index 0 should already be loaded + for (int j = 1; j < video_list.count(); j++) { + Mlt::Producer multiprod(* m_mltProfile, path.toUtf8().constData()); + multiprod.set("video_index", video_list.at(j)); + kDebug()<<"// LOADING: "<setProperty("vindex", video_list.at(j)); + groupList << streamFrame; + streamFrame->setCheckable(true); + streamFrame->setChecked(false); + QVBoxLayout *vh = new QVBoxLayout( streamFrame ); + QLabel *iconLabel = new QLabel(content); + iconLabel->setPixmap(QPixmap::fromImage(thumb)); + vh->addWidget(iconLabel); + if (audio_list.count() > 1) { + QComboBox *cb = new QComboBox(content); + for (int k = 0; k < audio_list.count(); k++) { + cb->addItem(i18n("Audio stream %1", audio_list.at(k)), audio_list.at(k)); + } + comboList << cb; + cb->setCurrentIndex(j); + vh->addWidget(cb); + } + vbox->addWidget(streamFrame); + } + if (dialog.exec() == QDialog::Accepted) { + // import selected streams + for (int i = 0; i < groupList.count(); i++) { + if (groupList.at(i)->isChecked()) { + int vindex = groupList.at(i)->property("vindex").toInt(); + int aindex = comboList.at(i)->itemData(comboList.at(i)->currentIndex()).toInt(); + data.insert("video_index", QString::number(vindex)); + data.insert("audio_index", QString::number(aindex)); + data.insert("bypassDuplicate", "1"); + emit addClip(KUrl(path), data); + } + } + } +} + #include "renderer.moc"