X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=503f02ffbc994e219bc9f0acd3a125dbd85a7305;hb=f9dbfa756b78f336576b42f041de325c98aa48e8;hp=629a4d5ed75d2274018a9da640c41699385b3158;hpb=55ba35a302896d935b1eb69900a937a44b0f8964;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 629a4d5e..503f02ff 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -22,18 +22,11 @@ * * ***************************************************************************/ -// ffmpeg Header files - -extern "C" { -#include -} - #include #include #include #include -#include #include #include @@ -48,12 +41,6 @@ extern "C" { #include -#if LIBAVCODEC_VERSION_MAJOR > 51 || (LIBAVCODEC_VERSION_MAJOR > 50 && LIBAVCODEC_VERSION_MINOR > 54) -// long_name was added in FFmpeg avcodec version 51.55 -#define ENABLE_FFMPEG_CODEC_DESCRIPTION 1 -#endif - - static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it ? @@ -65,24 +52,21 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr } } -Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid), m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false) { +Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid), m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false), m_isZoneMode(false), m_isLoopMode(false) { kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); refreshTimer = new QTimer(this); connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); - if (rendererName == "project") m_monitorId = 10000; - else m_monitorId = 10001; + /*if (rendererName == "project") m_monitorId = 10000; + else m_monitorId = 10001;*/ osdTimer = new QTimer(this); connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout())); m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties"); + buildConsumer(); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_mltProducer = producer; - if (m_blackClip) delete m_blackClip; - m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_blackClip->set("id", "black"); + m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); } @@ -106,11 +90,15 @@ void Render::closeMlt() { void Render::buildConsumer() { char *tmp; - tmp = decodedString(KdenliveSettings::current_profile()); + m_activeProfile = KdenliveSettings::current_profile(); + tmp = decodedString(m_activeProfile); + setenv("MLT_PROFILE", tmp, 1); + if (m_blackClip) delete m_blackClip; + m_blackClip = NULL; + m_mltProfile = new Mlt::Profile(tmp); delete[] tmp; - QString videoDriver = KdenliveSettings::videodrivername(); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { @@ -120,11 +108,14 @@ void Render::buildConsumer() { unsetenv("SDL_VIDEO_YUV_HWACCEL"); } } + setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_id", m_winid); m_mltConsumer->set("terminate_on_pause", 1); + m_mltConsumer->set("window_background", decodedString(KdenliveSettings::window_background().name())); + m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("rescale", "nearest"); @@ -152,39 +143,49 @@ void Render::buildConsumer() { 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"); + } int Render::resetProfile() { if (!m_mltConsumer) return 0; - QString currentProfile = getenv("MLT_PROFILE"); - if (currentProfile == KdenliveSettings::current_profile()) { + if (m_activeProfile == KdenliveSettings::current_profile()) { kDebug() << "reset to same profile, nothing to do"; return 1; } + kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << KdenliveSettings::current_profile(); if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); delete m_mltConsumer; m_mltConsumer = NULL; QString scene = sceneList(); - if (m_mltProducer) delete m_mltProducer; + int pos = 0; + if (m_mltProducer) { + pos = m_mltProducer->position(); + delete m_mltProducer; + } m_mltProducer = NULL; - if (m_mltProfile) delete m_mltProfile; - m_mltProfile = NULL; + + //WARNING: Trying to delete the profile will crash when trying to display a clip afterwards... + /*if (m_mltProfile) delete m_mltProfile; + m_mltProfile = NULL;*/ + buildConsumer(); - kDebug() << "//RESET WITHSCENE: " << scene; - setSceneList(scene); + //kDebug() << "//RESET WITHSCENE: " << scene; + setSceneList(scene, pos); - char *tmp = decodedString(scene); + /*char *tmp = decodedString(scene); Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp); delete[] tmp; m_mltProducer = producer; - if (m_blackClip) delete m_blackClip; m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); m_mltProducer->optimise(); m_mltProducer->set_speed(0); - connectPlaylist(); + connectPlaylist();*/ //delete m_mltProfile; // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer()); @@ -201,8 +202,11 @@ int Render::resetProfile() { /** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */ void Render::seek(GenTime time) { - sendSeekCommand(time); - //emit positionChanged(time); + if (!m_mltProducer) + return; + m_isBlocked = false; + m_mltProducer->seek((int)(time.frames(m_fps))); + refresh(); } //static @@ -266,7 +270,7 @@ QPixmap Render::getImageThumbnail(KUrl url, int width, int height) { filter << "*." + fileType; filter << "*." + fileType.toUpper(); more = dir.entryList(filter, QDir::Files); - im.load(url.directory() + "/" + more.at(0)); + im.load(url.directory() + '/' + more.at(0)); } else im.load(url.path()); //pixmap = im.scaled(width, height); return pixmap; @@ -348,8 +352,8 @@ void Render::getImage(KUrl url, int frame_position, QPoint size) more = dir.entryList( QDir::Files ); for ( it = more.begin() ; it != more.end() ; ++it ) { if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) { - if (!im.load(url.directory() + "/" + *it)) - kDebug()<<"++ ERROR LOADIN IMAGE: "<set("b_track", i); transition->set("distort", 1); transition->set("internal_added", "200"); - char *tmp; + const char *tmp; switch (screen) { case 0: tmp = "0,0:50%x50%"; @@ -457,14 +461,18 @@ void Render::slotSplitView(bool doit) { } } -void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { +void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) { int height = 50; int width = (int)(height * m_mltProfile->dar()); QMap < QString, QString > filePropertyMap; QMap < QString, QString > metadataPropertyMap; KUrl url = KUrl(xml.attribute("resource", QString::null)); - Mlt::Producer *producer; + Mlt::Producer *producer = NULL; + if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); + return; + } if (xml.attribute("type").toInt() == COLOR) { char *tmp = decodedString("colour:" + xml.attribute("colour")); producer = new Mlt::Producer(*m_mltProfile, "fezzik", tmp); @@ -476,22 +484,49 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { doc.appendChild(westley); westley.appendChild(play); play.appendChild(doc.importNode(xml, true)); - kDebug() << "/ / / / /CLIP XML: " << doc.toString(); char *tmp = decodedString(doc.toString()); producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); delete[] tmp; } else { - char *tmp = decodedString(url.path()); + QString urlpath = url.path(); + /*if (urlpath.contains(':')) { + if (!urlpath.startsWith("file:")) urlpath.prepend("file:"); + char *tmp = decodedString(urlpath); + producer = new Mlt::Producer(*m_mltProfile, "avformat", tmp); + delete[] tmp; + } + else {*/ + char *tmp = decodedString(urlpath); producer = new Mlt::Producer(*m_mltProfile, tmp); delete[] tmp; + + 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("threads")) { + int threads = xml.attribute("threads").toInt(); + if (threads != 1) producer->set("threads", threads); + } + if (xml.hasAttribute("video_index")) { + int vindex = xml.attribute("video_index").toInt(); + if (vindex != 0) producer->set("video_index", vindex); + } + if (xml.hasAttribute("audio_index")) { + int aindex = xml.attribute("audio_index").toInt(); + if (aindex != 0) producer->set("audio_index", aindex); + } + //} } - if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); - if (producer->is_blank()) { + if (producer == NULL || producer->is_blank() || !producer->is_valid()) { kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: "; emit removeInvalidClip(clipId); return; } + + if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); + char *tmp = decodedString(clipId); producer->set("id", tmp); delete[] tmp; @@ -499,30 +534,31 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { if (frameNumber != 0) producer->seek(frameNumber); mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer()); - filePropertyMap["filename"] = url.path(); filePropertyMap["duration"] = QString::number(producer->get_playtime()); //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime(); - Mlt::Frame * frame = producer->get_frame(); + Mlt::Frame *frame = producer->get_frame(); if (xml.attribute("type").toInt() == SLIDESHOW) { if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt()); if (xml.attribute("fade") == "1") { // user wants a fade effect to slideshow Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); - if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); - if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); - if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { - char *tmp = decodedString(xml.attribute("luma_file")); - filter->set("luma.resource", tmp); - delete[] tmp; - if (xml.hasAttribute("softness")) { - int soft = xml.attribute("softness").toInt(); - filter->set("luma.softness", (double) soft / 100.0); + if (filter && filter->is_valid()) { + if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); + if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); + if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { + char *tmp = decodedString(xml.attribute("luma_file")); + filter->set("luma.resource", tmp); + delete[] tmp; + if (xml.hasAttribute("softness")) { + int soft = xml.attribute("softness").toInt(); + filter->set("luma.softness", (double) soft / 100.0); + } } + Mlt::Service clipService(producer->get_service()); + clipService.attach(*filter); } - Mlt::Service clipService(producer->get_service()); - clipService.attach(*filter); } } @@ -530,7 +566,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { filePropertyMap["fps"] = producer->get("source_fps"); if (frame && frame->is_valid()) { - filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + "x" + QString::number(frame->get_int("height")); + filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height")); filePropertyMap["frequency"] = QString::number(frame->get_int("frequency")); filePropertyMap["channels"] = QString::number(frame->get_int("channels")); filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio"); @@ -538,7 +574,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { if (frame->get_int("test_image") == 0) { if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) { filePropertyMap["type"] = "playlist"; - metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title")); + metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title")); } else if (frame->get_int("test_audio") == 0) filePropertyMap["type"] = "av"; else @@ -558,71 +594,103 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId) { QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); if (!image.isNull()) { - pix = pix.fromImage(image.rgbSwapped()); + pix = QPixmap::fromImage(image.rgbSwapped()); } else pix.fill(Qt::black); mlt_pool_release(new_image); - emit replyGetImage(clipId, 0, pix, width, height); + emit replyGetImage(clipId, pix); } else if (frame->get_int("test_audio") == 0) { QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height)); - emit replyGetImage(clipId, 0, pixmap, width, height); + emit replyGetImage(clipId, pixmap); filePropertyMap["type"] = "audio"; } } // Retrieve audio / video codec name - // Fetch the video_context -#if 1 - - AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL); - if (context != NULL) { + // If there is a + char property[200]; + if (producer->get_int("video_index") > -1) { + /*if (context->duration == AV_NOPTS_VALUE) { + kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION"; + emit removeInvalidClip(clipId); + return; + }*/ // Get the video_index - int index = mlt_properties_get_int(properties, "video_index"); + int default_video = producer->get_int("video_index"); + int video_max = 0; + int default_audio = producer->get_int("audio_index"); + int audio_max = 0; + + // Find maximum stream index values + for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) { + snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix); + QString type = producer->get(property); + if (type == "video") + video_max = ix; + else if (type == "audio") + audio_max = ix; + } + filePropertyMap["default_video"] = QString::number(default_video); + filePropertyMap["video_max"] = QString::number(video_max); + filePropertyMap["default_audio"] = QString::number(default_audio); + filePropertyMap["audio_max"] = QString::number(audio_max); + + snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video); + if (producer->get(property)) { + filePropertyMap["videocodec"] = producer->get(property); + } else { + snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); + if (producer->get(property)) + filePropertyMap["videocodec"] = producer->get(property); + } -#if ENABLE_FFMPEG_CODEC_DESCRIPTION - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) { - filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->long_name; - } else -#endif - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) { - filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name; + 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"); } + } + } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!"; - context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL); - if (context != NULL) { + if (producer->get_int("audio_index") > -1) { // Get the audio_index - int index = mlt_properties_get_int(properties, "audio_index"); + int index = producer->get_int("audio_index"); -#if ENABLE_FFMPEG_CODEC_DESCRIPTION - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) - filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->long_name; - else -#endif - if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) - filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name; + 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); + } } -#endif - // metadata - mlt_properties metadata = mlt_properties_new(); - mlt_properties_pass(metadata, properties, "meta.attr."); - int count = mlt_properties_count(metadata); + // metadata + Mlt::Properties metadata; + metadata.pass_values(*producer, "meta.attr."); + int count = metadata.count(); for (int i = 0; i < count; i ++) { - QString name = mlt_properties_get_name(metadata, i); - QString value = QString::fromUtf8(mlt_properties_get_value(metadata, i)); + QString name = metadata.get_name(i); + QString value = QString::fromUtf8(metadata.get(i)); if (name.endsWith("markup") && !value.isEmpty()) metadataPropertyMap[ name.section(".", 0, -2)] = value; } - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap); + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); kDebug() << "REquested fuile info for: " << url.path(); if (frame) delete frame; //if (producer) delete producer; } + /** Create the producer from the Westley QDomDocument */ #if 0 void Render::initSceneList() { @@ -670,6 +738,8 @@ void Render::setProducer(Mlt::Producer *producer, int position) { m_mltConsumer->stop(); } else return; + m_mltConsumer->purge(); + m_isBlocked = true; if (m_mltProducer) { m_mltProducer->set_speed(0); @@ -677,8 +747,13 @@ void Render::setProducer(Mlt::Producer *producer, int position) { m_mltProducer = NULL; emit stopped(); } - if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer()); - else m_mltProducer = new Mlt::Producer(); + if (producer) { + 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: "; m_fps = m_mltProducer->get_fps(); @@ -701,13 +776,17 @@ void Render::setSceneList(QDomDocument list, int position) { void Render::setSceneList(QString playlist, int position) { if (m_winid == -1) return; m_isBlocked = true; + m_slowmotionProducers.clear(); - kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; + //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; if (m_mltConsumer) { m_mltConsumer->stop(); //m_mltConsumer->set("refresh", 0); - } else return; + } else { + m_isBlocked = false; + return; + } if (m_mltProducer) { m_mltProducer->set_speed(0); @@ -718,13 +797,14 @@ void Render::setSceneList(QString playlist, int position) { emit stopped(); } + blockSignals(true); char *tmp = decodedString(playlist); m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp); delete[] tmp; - if (m_blackClip) delete m_blackClip; - m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); - m_blackClip->set("id", "black"); - if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; + + if (!m_mltProducer || !m_mltProducer->is_valid()) { + kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; + } m_mltProducer->optimise(); /*if (KdenliveSettings::osdtimecode()) { @@ -753,71 +833,86 @@ void Render::setSceneList(QString playlist, int position) { m_fps = m_mltProducer->get_fps(); kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); connectPlaylist(); + fillSlowMotionProducers(); if (position != 0) { //TODO: seek to correct place after opening project. // Needs to be done from another place since it crashes here. - //m_mltProducer->seek(position); - //emit rendererPosition(position); + m_mltProducer->seek(position); } m_isBlocked = false; - + blockSignals(false); + //kDebug()<<"// SETSCN LST, POS: "<optimise(); - delete[] tmppath; westleyConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); bool split = m_isSplitView; if (split) slotSplitView(false); westleyConsumer.connect(prod); - //prod.set("title", "kdenlive document"); - //westleyConsumer.listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); westleyConsumer.start(); while (!westleyConsumer.is_stopped()) {} + playlist = QString::fromUtf8(westleyConsumer.get("kdenlive_playlist")); + if (split) slotSplitView(true); + return playlist; +} + +void Render::saveSceneList(QString path, QDomElement kdenliveData) { + QFile file(path); + QDomDocument doc; + doc.setContent(sceneList(), false); if (!kdenliveData.isNull()) { // add Kdenlive specific tags - QFile file(path); - QDomDocument doc; - doc.setContent(&file, false); QDomNode wes = doc.elementsByTagName("westley").at(0); wes.appendChild(doc.importNode(kdenliveData, true)); - file.close(); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - kWarning() << "////// ERROR writing to file: " << path; - return; - } - QTextStream out(&file); - out << doc.toString(); - file.close(); } - if (split) slotSplitView(true); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + kWarning() << "////// ERROR writing to file: " << path; + return; + } + QTextStream out(&file); + out << doc.toString(); + file.close(); } +void Render::saveZone(KUrl url, QString desc, QPoint zone) { + kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name; + char *tmppath = decodedString("westley:" + url.path()); + Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath); + m_mltProducer->optimise(); + delete[] tmppath; + westleyConsumer.set("terminate_on_pause", 1); + if (m_name == "clip") { + Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y()); + tmppath = decodedString(desc); + Mlt::Playlist list; + list.insert_at(0, prod, 0); + list.set("title", tmppath); + delete[] tmppath; + westleyConsumer.connect(list); + + } else { + //TODO: not working yet, save zone from timeline + Mlt::Producer *p1 = new Mlt::Producer(m_mltProducer->get_producer()); + /* Mlt::Service service(p1->parent().get_service()); + if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";*/ + + //Mlt::Producer *prod = p1->cut(zone.x(), zone.y()); + tmppath = decodedString(desc); + //prod->set("title", tmppath); + delete[] tmppath; + westleyConsumer.connect(*p1); //list); + } + + westleyConsumer.start(); +} + const double Render::fps() const { return m_fps; } @@ -928,7 +1023,7 @@ void Render::stop() { if (m_mltConsumer && !m_mltConsumer->is_stopped()) { kDebug() << "///////////// RENDER STOPPED: " << m_name; m_isBlocked = true; - m_mltConsumer->set("refresh", 0); + //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); // delete m_mltConsumer; // m_mltConsumer = NULL; @@ -937,6 +1032,7 @@ void Render::stop() { m_isBlocked = true; if (m_mltProducer) { + if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); //m_mltProducer->set("out", m_mltProducer->get_length() - 1); //kDebug() << m_mltProducer->get_length(); @@ -948,26 +1044,41 @@ void Render::stop(const GenTime & startTime) { kDebug() << "///////////// RENDER STOP-------2"; if (m_mltProducer) { + if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); m_mltProducer->seek((int) startTime.frames(m_fps)); } m_mltConsumer->purge(); } +void Render::pause() { + if (!m_mltProducer || !m_mltConsumer) + return; + if (m_mltProducer->get_speed() == 0.0) return; + if (m_isZoneMode) resetZoneMode(); + m_isBlocked = true; + m_mltConsumer->set("refresh", 0); + m_mltProducer->set_speed(0.0); + emit rendererPosition(m_framePosition); + m_mltProducer->seek(m_framePosition); + m_mltConsumer->purge(); +} + void Render::switchPlay() { if (!m_mltProducer || !m_mltConsumer) return; + if (m_isZoneMode) resetZoneMode(); if (m_mltProducer->get_speed() == 0.0) { - //m_isBlocked = false; + m_isBlocked = false; m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); - kDebug() << " ********* RENDER PLAY: " << m_mltProducer->get_speed(); } else { - //m_isBlocked = true; + m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); - //m_isBlocked = true; - m_mltProducer->seek((int) m_framePosition); + 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() ); @@ -984,10 +1095,10 @@ void Render::switchPlay() { } void Render::play(double speed) { - kDebug() << " ********* REDNER PLAY"; if (!m_mltProducer) return; // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); + m_isBlocked = false; m_mltProducer->set_speed(speed); /*if (speed == 0.0) { m_mltProducer->seek((int) m_framePosition + 1); @@ -996,44 +1107,50 @@ void Render::play(double speed) { refresh(); } -void Render::play(double speed, const GenTime & startTime) { - kDebug() << "///////////// RENDER PLAY2-------" << speed; - if (!m_mltProducer) +void Render::play(const GenTime & startTime) { + if (!m_mltProducer || !m_mltConsumer) return; - //m_mltProducer->set("out", m_mltProducer->get_length() - 1); - //if (speed == 0.0) m_mltConsumer->set("refresh", 0); - m_mltProducer->set_speed(speed); + m_isBlocked = false; m_mltProducer->seek((int)(startTime.frames(m_fps))); - //m_mltConsumer->purge(); - //refresh(); + m_mltProducer->set_speed(1.0); + m_mltConsumer->set("refresh", 1); } -void Render::play(double speed, const GenTime & startTime, - const GenTime & stopTime) { - kDebug() << "///////////// RENDER PLAY3-------" << speed << stopTime.frames(m_fps); - if (!m_mltProducer) +void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) { + if (!m_mltProducer || !m_mltConsumer) + return; + //m_mltProducer->set("eof", "loop"); + m_isLoopMode = true; + m_loopStart = startTime; + playZone(startTime, stopTime); +} + +void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { + if (!m_mltProducer || !m_mltConsumer) return; + m_isBlocked = false; + if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; m_mltProducer->set("out", stopTime.frames(m_fps)); m_mltProducer->seek((int)(startTime.frames(m_fps))); - m_mltConsumer->purge(); - m_mltProducer->set_speed(speed); - refresh(); + m_mltProducer->set_speed(1.0); + m_mltConsumer->set("refresh", 1); + m_isZoneMode = true; } - -void Render::sendSeekCommand(GenTime time) { - //kDebug()<<" ********* RENDER SEND SEEK"; - if (!m_mltProducer) - return; - //kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps)); - m_mltProducer->seek((int)(time.frames(m_fps))); - refresh(); +void Render::resetZoneMode() { + if (!m_isZoneMode && !m_isLoopMode) return; + m_mltProducer->set("out", m_originalOut); + //m_mltProducer->set("eof", "pause"); + m_isZoneMode = false; + m_isLoopMode = false; } void Render::seekToFrame(int pos) { //kDebug()<<" ********* RENDER SEEK TO POS"; if (!m_mltProducer) return; + m_isBlocked = false; + resetZoneMode(); m_mltProducer->seek(pos); refresh(); } @@ -1057,17 +1174,6 @@ void Render::refresh() { } } -/** Sets the description of this renderer to desc. */ -void Render::setDescription(const QString & description) { - m_description = description; -} - -/** Returns the description of this renderer */ -QString Render::description() { - return m_description; -} - - double Render::playSpeed() { if (m_mltProducer) return m_mltProducer->get_speed(); return 0.0; @@ -1094,6 +1200,8 @@ void Render::emitConsumerStopped() { // This is used to know when the playing stopped if (m_mltProducer) { double pos = m_mltProducer->position(); + 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)); @@ -1135,7 +1243,7 @@ void Render::exportCurrentFrame(KUrl url, bool notify) { /** MLT PLAYLIST DIRECT MANIPULATON **/ -void Render::mltCheckLength(bool reload) { +void Render::mltCheckLength() { //kDebug()<<"checking track length: "<get_service()); @@ -1210,12 +1318,34 @@ void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pr mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + //kDebug()<<"/// INSERT cLIP: "<get("resource"); + url.append('?' + QString::number(speed)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + delete[] tmp; + QString id = prod->get("id"); + if (id.contains('_')) id = id.section('_', 0, 0); + QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + prod = slowprod; + } - Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + Mlt::Producer *clip = prod->cut((int) info.cropStart.frames(m_fps), (int)(info.endPos - info.startPos + info.cropStart).frames(m_fps) - 1); int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1); - if (QString(prod->get("transparency")).toInt() == 1) - mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt()); + /*if (QString(prod->get("transparency")).toInt() == 1) + mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/ mlt_service_unlock(service.get_service()); @@ -1244,20 +1374,21 @@ void Render::mltCutClip(int track, GenTime position) { int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "<get("kdenlive_id") != "") { - kDebug() << "++ ADDING FILTER: " << filter->get("kdenlive_id"); - Mlt::Filter *dup = new Mlt::Filter(filter->get_filter()); - dup->set("kdenlive_ix", filter->get("kdenlive_ix")); - dup->set("kdenlive_id", filter->get("kdenlive_id")); - dupService.attach(*dup); + if (filter->is_valid() && filter->get("kdenlive_id") != "") { + // looks like there is no easy way to duplicate a filter, + // so we will create a new one and duplicate its properties + Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service")); + if (dup && dup->is_valid()) { + Mlt::Properties entries(filter->get_properties()); + for (int i = 0;i < entries.count();i++) { + dup->set(entries.get_name(i), entries.get(i)); + } + dupService.attach(*dup); + } } ct++; filter = clipService.filter(ct); } - mlt_service_unlock(service.get_service()); /* // Display playlist info kDebug()<<"//////////// AFTER"; @@ -1290,7 +1425,7 @@ void Render::mltCutClip(int track, GenTime position) { int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "< clipIndex) mltCheckLength(); + if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(); m_isBlocked = false; return true; } -int Render::mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod) { +int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) { + if (!m_mltProducer) { + kDebug() << "PLAYLIST NOT INITIALISED //////"; + return -1; + } + Mlt::Producer parentProd(m_mltProducer->parent()); + if (parentProd.get_producer() == NULL) { + kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; + return -1; + } + + Mlt::Service service(parentProd.get_service()); + Mlt::Tractor tractor(service); + int insertPos = pos.frames(m_fps); + + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at(insertPos); + if (!trackPlaylist.is_blank(clipIndex)) return -1; + if (fromBlankStart) return trackPlaylist.clip_length(clipIndex); + return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos; +} + + +void Render::mltInsertSpace(QMap trackClipStartList, QMap trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) { + if (!m_mltProducer) { + kDebug() << "PLAYLIST NOT INITIALISED //////"; + return; + } + Mlt::Producer parentProd(m_mltProducer->parent()); + if (parentProd.get_producer() == NULL) { + kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; + return; + } + //kDebug()<<"// CLP STRT LST: "< 0) trackPlaylist.insert_blank(clipIndex, diff - 1); + else { + if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; + if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + int position = trackPlaylist.clip_start(clipIndex); + trackPlaylist.remove_region(position, - diff - 1); + } + trackPlaylist.consolidate_blanks(0); + } + // now move transitions + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentTrack = mlt_transition_get_b_track(tr); + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + insertPos = trackTransitionStartList.value(track); + if (insertPos != -1) { + insertPos += offset; + if (track == currentTrack && currentOut > insertPos && resource != "mix") { + mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff); + } + } + 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"); + } + } else { + int trackNb = tractor.count(); + while (trackNb > 1) { + Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + + + int clipNb = trackPlaylist.count(); + insertPos = trackClipStartList.value(trackNb - 1); + if (insertPos != -1) { + insertPos += offset; + + /* kDebug()<<"-------------\nTRACK "< 0) trackPlaylist.insert_blank(clipIndex, diff - 1); + else { + if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; + if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + int position = trackPlaylist.clip_start(clipIndex); + trackPlaylist.remove_region(position, - diff - 1); + } + trackPlaylist.consolidate_blanks(0); + } + trackNb--; + } + // now move transitions + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + mlt_transition tr = (mlt_transition) nextservice; + int currentIn = (int) mlt_transition_get_in(tr); + int currentOut = (int) mlt_transition_get_out(tr); + int currentTrack = mlt_transition_get_b_track(tr); + insertPos = trackTransitionStartList.value(currentTrack); + if (insertPos != -1) { + insertPos += offset; + if (currentOut > insertPos && resource != "mix") { + mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff); + } + } + 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"); + } + } + mlt_service_unlock(service.get_service()); + mltCheckLength(); + m_mltConsumer->set("refresh", 1); +} + +int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) { m_isBlocked = true; int newLength = 0; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; - kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; + //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps)); + int startPos = info.startPos.frames(m_fps); + int clipIndex = trackPlaylist.get_clip_index_at(startPos); + int clipLength = trackPlaylist.clip_length(clipIndex); + Mlt::Producer clip(trackPlaylist.get_clip(clipIndex)); - QString serv = clip.parent().get("mlt_service"); - QString id = clip.parent().get("id"); - kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service"); + if (!clip.is_valid() || clip.is_blank()) { + // invalid clip + return -1; + } + Mlt::Producer clipparent = clip.parent(); + if (!clipparent.is_valid() || clipparent.is_blank()) { + // invalid clip + return -1; + } + QString serv = clipparent.get("mlt_service"); + QString id = clipparent.get("id"); + //kDebug() << "CLIP SERVICE: " << serv; if (serv == "avformat" && speed != 1.0) { mlt_service_lock(service.get_service()); - QString url = clip.parent().get("resource"); - url.append("?" + QString::number(speed)); + QString url = clipparent.get("resource"); + url.append('?' + QString::number(speed)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { char *tmp = decodedString(url); slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); delete[] tmp; - QString producerid = "slowmotion:" + id + ":" + QString::number(speed); + QString producerid = "slowmotion:" + id + ':' + QString::number(speed); tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; m_slowmotionProducers.insert(url, slowprod); } - Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); - newLength = cut->get_length(); trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); - trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + // Check that the blank space is long enough for our new duration + clipIndex = trackPlaylist.get_clip_index_at(startPos); + int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); + Mlt::Producer *cut; + if (clipIndex + 1 < trackPlaylist.count() && (startPos + clipLength / speed > blankEnd)) { + GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; + cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1)); + } else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart.frames(m_fps) + clipLength) / speed - 1)); + trackPlaylist.insert_at(startPos, *cut, 1); + clipIndex = trackPlaylist.get_clip_index_at(startPos); + newLength = trackPlaylist.clip_length(clipIndex); mlt_service_unlock(service.get_service()); } else if (speed == 1.0) { mlt_service_lock(service.get_service()); - Mlt::Producer *cut = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); + trackPlaylist.replace_with_blank(clipIndex); - newLength = cut->get_length(); trackPlaylist.consolidate_blanks(0); - trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + + // Check that the blank space is long enough for our new duration + clipIndex = trackPlaylist.get_clip_index_at(startPos); + int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); + + Mlt::Producer *cut; + GenTime oldDuration = GenTime(clipLength, m_fps); + GenTime newDuration = oldDuration * oldspeed; + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; + cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1)); + } else cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)((info.cropStart + newDuration).frames(m_fps)) - 1); + trackPlaylist.insert_at(startPos, *cut, 1); + clipIndex = trackPlaylist.get_clip_index_at(startPos); + newLength = trackPlaylist.clip_length(clipIndex); mlt_service_unlock(service.get_service()); + } else if (serv == "framebuffer") { mlt_service_lock(service.get_service()); - QString url = clip.parent().get("resource"); - url = url.section("?", 0, 0); - url.append("?" + QString::number(speed)); + QString url = clipparent.get("resource"); + url = url.section('?', 0, 0); + url.append('?' + QString::number(speed)); Mlt::Producer *slowprod = m_slowmotionProducers.value(url); if (!slowprod || slowprod->get_producer() == NULL) { char *tmp = decodedString(url); slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); delete[] tmp; - QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed); + QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; m_slowmotionProducers.insert(url, slowprod); } - Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1); - newLength = cut->get_length(); trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); - trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1); + + GenTime oldDuration = GenTime(clipLength, m_fps); + GenTime newDuration = oldDuration * oldspeed / speed; + + // Check that the blank space is long enough for our new duration + clipIndex = trackPlaylist.get_clip_index_at(startPos); + int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); + + Mlt::Producer *cut; + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; + cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1)); + } else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart / speed + newDuration).frames(m_fps) - 1)); + + trackPlaylist.insert_at(startPos, *cut, 1); + clipIndex = trackPlaylist.get_clip_index_at(startPos); + newLength = trackPlaylist.clip_length(clipIndex); + mlt_service_unlock(service.get_service()); - kDebug() << "AVFORMAT CLIP!!!:"; } - + if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(); m_isBlocked = false; return newLength; } -bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) { - +bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) { + kDebug() << "// TRYing to remove effect at: " << index; Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; Mlt::Tractor tractor(service); @@ -1442,6 +1776,10 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; kDebug() << " / / / DLEETED EFFECT: " << ct; + } else if (updateIndex) { + // Adjust the other effects index + if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + ct++; } else ct++; filter = clipService.filter(ct); } @@ -1451,7 +1789,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do } -bool Render::mltAddEffect(int track, GenTime position, QHash args, bool doRefresh) { +bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) { Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1465,55 +1803,72 @@ bool Render::mltAddEffect(int track, GenTime position, QHash } Mlt::Service clipService(clip->get_service()); m_isBlocked = true; + + // temporarily remove all effects after insert point + QList filtersList; + const int filter_ix = params.paramValue("kdenlive_ix").toInt(); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() > filter_ix) { + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + // create filter - QString tag = args.value("tag"); + QString tag = params.paramValue("tag"); kDebug() << " / / INSERTING EFFECT: " << tag; if (tag.startsWith("ladspa")) tag = "ladspa"; char *filterTag = decodedString(tag); - char *filterId = decodedString(args.value("id")); + char *filterId = decodedString(params.paramValue("id")); QHash::Iterator it; - QString kfr = args.value("keyframes"); + QString kfr = params.paramValue("keyframes"); if (!kfr.isEmpty()) { - QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts); - kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes"); - char *starttag = decodedString(args.value("starttag", "start")); - char *endtag = decodedString(args.value("endtag", "end")); + QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); + kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); + char *starttag = decodedString(params.paramValue("starttag", "start")); + char *endtag = decodedString(params.paramValue("endtag", "end")); kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; int duration = clip->get_playtime(); - double max = args.value("max").toDouble(); - double min = args.value("min").toDouble(); - double factor = args.value("factor", "1").toDouble(); - args.remove("starttag"); - args.remove("endtag"); - args.remove("keyframes"); - args.remove("min"); - args.remove("max"); - args.remove("factor"); + double max = params.paramValue("max").toDouble(); + double min = params.paramValue("min").toDouble(); + double factor = params.paramValue("factor", "1").toDouble(); + params.removeParam("starttag"); + params.removeParam("endtag"); + params.removeParam("keyframes"); + params.removeParam("min"); + params.removeParam("max"); + params.removeParam("factor"); int offset = 0; for (int i = 0; i < keyFrames.size() - 1; ++i) { Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); - filter->set("kdenlive_id", filterId); - int x1 = keyFrames.at(i).section(":", 0, 0).toInt() + offset; - double y1 = keyFrames.at(i).section(":", 1, 1).toDouble(); - int x2 = keyFrames.at(i + 1).section(":", 0, 0).toInt(); - double y2 = keyFrames.at(i + 1).section(":", 1, 1).toDouble(); - if (x2 == -1) x2 = duration; - for (it = args.begin(); it != args.end(); ++it) { - char *name = decodedString(it.key()); - char *value = decodedString(it.value()); - filter->set(name, value); - delete[] name; - delete[] value; - } + if (filter && filter->is_valid()) { + filter->set("kdenlive_id", filterId); + int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset; + double y1 = keyFrames.at(i).section(':', 1, 1).toDouble(); + int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt(); + double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble(); + if (x2 == -1) x2 = duration; + + for (int j = 0; j < params.count(); j++) { + char *name = decodedString(params.at(j).name()); + char *value = decodedString(params.at(j).value()); + filter->set(name, value); + delete[] name; + delete[] value; + } - filter->set("in", x1); - filter->set("out", x2); - //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); - filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); - clipService.attach(*filter); - offset = 1; + filter->set("in", x1); + filter->set("out", x2); + //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); + clipService.attach(*filter); + offset = 1; + } } delete[] starttag; delete[] endtag; @@ -1527,31 +1882,58 @@ bool Render::mltAddEffect(int track, GenTime position, QHash return false; } - for (it = args.begin(); it != args.end(); ++it) { - char *name = decodedString(it.key()); - char *value = decodedString(it.value()); + params.removeParam("kdenlive_id"); + + for (int j = 0; j < params.count(); j++) { + char *name = decodedString(params.at(j).name()); + char *value = decodedString(params.at(j).value()); filter->set(name, value); delete[] name; delete[] value; } + + if (tag == "sox") { + QString effectArgs = params.paramValue("id").section('_', 1); + + params.removeParam("id"); + params.removeParam("kdenlive_ix"); + params.removeParam("tag"); + params.removeParam("disabled"); + + for (int j = 0; j < params.count(); j++) { + effectArgs.append(' ' + params.at(j).value()); + } + //kDebug() << "SOX EFFECTS: " << effectArgs.simplified(); + char *value = decodedString(effectArgs.simplified()); + filter->set("effect", value); + delete[] value; + } + + // attach filter to the clip clipService.attach(*filter); } delete[] filterId; delete[] filterTag; + + // re-add following filters + for (int i = 0; i < filtersList.count(); i++) { + clipService.attach(*(filtersList.at(i))); + } + m_isBlocked = false; if (doRefresh) refresh(); return true; } -bool Render::mltEditEffect(int track, GenTime position, QHash args) { - QString index = args.value("kdenlive_ix"); - QString tag = args.value("tag"); - QHash::Iterator it = args.begin(); - if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { +bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) { + QString index = params.paramValue("kdenlive_ix"); + QString tag = params.paramValue("tag"); + + if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { // This is a keyframe effect, to edit it, we remove it and re-add it. - mltRemoveEffect(track, position, index); - bool success = mltAddEffect(track, position, args); + mltRemoveEffect(track, position, index, true); + bool success = mltAddEffect(track, position, params); return success; } @@ -1592,7 +1974,7 @@ bool Render::mltEditEffect(int track, GenTime position, QHash } else ct++; filter = clipService.filter(ct); } - bool success = mltAddEffect(track, position, args); + bool success = mltAddEffect(track, position, params); for (int i = 0; i < filtersList.count(); i++) { clipService.attach(*(filtersList.at(i))); @@ -1602,14 +1984,14 @@ bool Render::mltEditEffect(int track, GenTime position, QHash return success; } - for (it = args.begin(); it != args.end(); ++it) { - kDebug() << " / / EDITING EFFECT ARGS: " << it.key() << ": " << it.value(); - char *name = decodedString(it.key()); - char *value = decodedString(it.value()); + for (int j = 0; j < params.count(); j++) { + char *name = decodedString(params.at(j).name()); + char *value = decodedString(params.at(j).value()); filter->set(name, value); delete[] name; delete[] value; } + m_isBlocked = false; refresh(); return true; @@ -1670,7 +2052,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) while (filter) { int pos = QString(filter->get("kdenlive_ix")).toInt(); if (pos >= newPos) { - if (pos < oldPos) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + if (pos < oldPos) filter->set("kdenlive_ix", pos + 1); filtersList.append(filter); clipService.detach(*filter); } else ct++; @@ -1702,7 +2084,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "< 0) { // clip was made longer, trim next blank if there is one. - if (trackPlaylist.is_blank(clipIndex)) { - int blankStart = trackPlaylist.clip_start(clipIndex); - int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; - if (diff - blankDuration == 1) { - trackPlaylist.remove(clipIndex); - } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff); - } else { - kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; + if (clipIndex < trackPlaylist.count()) { + // If this is not the last clip in playlist + if (trackPlaylist.is_blank(clipIndex)) { + int blankStart = trackPlaylist.clip_start(clipIndex); + int blankDuration = trackPlaylist.clip_length(clipIndex) - 1; + if (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!"; + if (diff - blankDuration == 1) { + trackPlaylist.remove(clipIndex); + } else trackPlaylist.remove_region(blankStart, diff - 1); + } else { + kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; + } } } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); trackPlaylist.consolidate_blanks(0); - /* // Display playlist info - kDebug()<<"//////////// AFTER RESIZE"; - for (int i = 0; i < trackPlaylist.count(); i++) { - int blankStart = trackPlaylist.clip_start(i); - int blankDuration = trackPlaylist.clip_length(i) - 1; - QString blk; - if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "<refresh(); - //tractor.refresh(); if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); - if (QString(clip->parent().get("transparency")).toInt() == 1) { + /*if (QString(clip->parent().get("transparency")).toInt() == 1) { //mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt()); mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); ItemInfo transpinfo; @@ -1758,8 +2133,9 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) { transpinfo.endPos = info.startPos + clipDuration; transpinfo.track = info.track; mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); - } + }*/ m_isBlocked = false; + m_mltConsumer->set("refresh", 1); return true; } @@ -1767,7 +2143,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) { Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); - Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + if (mute) { if (blind) trackProducer.set("hide", 3); else trackProducer.set("hide", 2); @@ -1781,6 +2157,35 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) { refresh(); } + +bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) { + Mlt::Service service(m_mltProducer->parent().get_service()); + int frameOffset = (int) diff.frames(m_fps); + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) { + kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!"; + return false; + } + mlt_service_lock(service.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + if (clip == NULL) { + kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; + mlt_service_unlock(service.get_service()); + return false; + } + int previousStart = clip->get_in(); + int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + m_isBlocked = true; + trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset); + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + m_mltConsumer->set("refresh", 1); + return true; +} + bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { //kDebug() << "//////// RSIZING CLIP from: "<parent().get_service()); @@ -1794,16 +2199,12 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { } mlt_service_lock(service.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); - /*int previousStart = trackPlaylist.clip_start(clipIndex); - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/ - //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (clip == NULL) { kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; mlt_service_unlock(service.get_service()); return false; } - //m_mltConsumer->set("refresh", 0); int previousStart = clip->get_in(); int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; @@ -1822,7 +2223,7 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1); } trackPlaylist.consolidate_blanks(0); - if (QString(clip->parent().get("transparency")).toInt() == 1) { + /*if (QString(clip->parent().get("transparency")).toInt() == 1) { //mltResizeTransparency(previousStart, (int) moveEnd.frames(m_fps), (int) (moveEnd + out - in).frames(m_fps), track, QString(clip->parent().get("id")).toInt()); mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); ItemInfo transpinfo; @@ -1830,19 +2231,64 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) { transpinfo.endPos = info.startPos + diff + (info.endPos - info.startPos); transpinfo.track = info.track; mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt()); - } + }*/ m_isBlocked = false; //m_mltConsumer->set("refresh", 1); mlt_service_unlock(service.get_service()); + m_mltConsumer->set("refresh", 1); return true; } -bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) { - return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps)); +bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) { + return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod); } -bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) { +void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) { + if (prod == NULL || !prod->is_valid()) { + kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; + return; + } + kDebug() << "NEW PROD ID: " << prod->get("id"); + m_mltConsumer->set("refresh", 0); + kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; + mlt_service_lock(m_mltConsumer->get_service()); + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + + 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(pos + 1); + Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); + if (clipProducer.is_blank()) { + kDebug() << "// ERROR UPDATING CLIP PROD"; + mlt_service_unlock(m_mltConsumer->get_service()); + m_isBlocked = false; + return; + } + Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); + + // move all effects to the correct producer + Mlt::Service clipService(clipProducer.get_service()); + Mlt::Service newClipService(clip->get_service()); + + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get("kdenlive_ix") != 0) { + clipService.detach(*filter); + newClipService.attach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + + trackPlaylist.insert_at(pos, clip, 1); + mlt_service_unlock(m_mltConsumer->get_service()); + m_isBlocked = false; +} + +bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) { m_isBlocked = true; m_mltConsumer->set("refresh", 0); @@ -1859,8 +2305,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn if (endTrack == startTrack) { //mlt_service_lock(service.get_service()); Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); - - if (!trackPlaylist.is_blank_at(moveEnd)) { + if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer.is_blank()) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; @@ -1870,9 +2315,9 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } else { trackPlaylist.consolidate_blanks(0); int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); - if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { - mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); - } + /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); + }*/ if (newIndex + 1 == trackPlaylist.count()) checkLength = true; } //mlt_service_unlock(service.get_service()); @@ -1886,14 +2331,43 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return false; } else { Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); + if (clipProducer.is_blank()) { + // error, destination is not empty + //int ix = trackPlaylist.get_clip_index_at(moveEnd); + kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; + mlt_service_unlock(m_mltConsumer->get_service()); + m_isBlocked = false; + return false; + } trackPlaylist.consolidate_blanks(0); destTrackPlaylist.consolidate_blanks(1); - int newIndex = destTrackPlaylist.insert_at(moveEnd, clipProducer, 1); + Mlt::Producer *clip; + // check if we are moving a slowmotion producer + QString serv = clipProducer.parent().get("mlt_service"); + if (serv == "framebuffer") { + clip = &clipProducer; + } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); + + // move all effects to the correct producer + Mlt::Service clipService(clipProducer.get_service()); + Mlt::Service newClipService(clip->get_service()); + + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get("kdenlive_ix") != 0) { + clipService.detach(*filter); + newClipService.attach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + + int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); destTrackPlaylist.consolidate_blanks(0); - if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { + /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { kDebug() << "//////// moving clip transparency"; mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); - } + }*/ if (clipIndex > trackPlaylist.count()) checkLength = true; else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true; } @@ -1906,7 +2380,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return true; } -void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { +bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { + int new_in = (int)newIn.frames(m_fps); + int new_out = (int)newOut.frames(m_fps) - 1; + if (new_in >= new_out) return false; Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); @@ -1923,9 +2400,6 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n QString resource = mlt_properties_get(properties, "mlt_service"); int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; - int new_in = (int)newIn.frames(m_fps); - int new_out = (int)newOut.frames(m_fps); - while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); @@ -1935,12 +2409,12 @@ void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { mlt_transition_set_in_and_out(tr, new_in, new_out); if (newTrack - startTrack != 0) { - kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << "x" << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << "x" << newTransitionTrack; + kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack; mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); mlt_properties_set_int(properties, "a_track", newTransitionTrack); mlt_properties_set_int(properties, "b_track", newTrack); - //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<set("refresh", 1); + return true; } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { @@ -1967,7 +2442,6 @@ void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) { m_isBlocked = true; - Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); @@ -1980,22 +2454,26 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); int in_pos = (int) in.frames(m_fps); - int out_pos = (int) out.frames(m_fps); + int out_pos = (int) out.frames(m_fps) - 1; while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); + int currentBTrack = mlt_transition_get_a_track(tr); int currentIn = (int) mlt_transition_get_in(tr); int currentOut = (int) mlt_transition_get_out(tr); - // kDebug()<<"Looking for transition : " << currentIn <<"x"< map = mltGetTransitionParamsFromXml(xml); QMap::Iterator it; QString key; mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr); - + mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt()); + if (currentBTrack != a_track) { + mlt_properties_set_int(properties, "a_track", a_track); + } for (it = map.begin(); it != map.end(); ++it) { key = it.key(); char *name = decodedString(key); @@ -2023,24 +2501,24 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); - if (do_refresh) m_mltConsumer->set("refresh", 0); + //if (do_refresh) m_mltConsumer->set("refresh", 0); mlt_service serv = m_mltProducer->parent().get_service(); mlt_service nextservice = mlt_service_get_producer(serv); mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); - int old_pos = (int)((in + out).frames(m_fps) / 2); + + const int old_pos = (int)((in + out).frames(m_fps) / 2); while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); int currentIn = (int) mlt_transition_get_in(tr); int currentOut = (int) mlt_transition_get_out(tr); - kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack; + //kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack; if (resource == tag && b_track == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { - //kDebug() << " / / / / /DELETE TRANS DOOOMNE"; mlt_field_disconnect_service(field->get_field(), nextservice); break; } @@ -2050,7 +2528,7 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - if (do_refresh) m_mltConsumer->set("refresh", 1); + //if (do_refresh) m_mltConsumer->set("refresh", 1); } QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { @@ -2069,7 +2547,7 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . , } - if (e.attribute("namedesc").contains(";")) { + if (e.attribute("namedesc").contains(';')) { QString format = e.attribute("format"); QStringList separators = format.split("%d", QString::SkipEmptyParts); QStringList values = e.attribute("value").split(QRegExp("[,:;x]")); @@ -2155,16 +2633,16 @@ void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int t mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); - kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id; + kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << 'x' << newEnd << ", " << track << ", " << id; while (mlt_type == "transition") { mlt_transition tr = (mlt_transition) nextservice; int currentTrack = mlt_transition_get_b_track(tr); int currentIn = (int) mlt_transition_get_in(tr); //mlt_properties props = MLT_TRANSITION_PROPERTIES(tr); int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); - kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ; + kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << 'x' << transitionId ; if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) { - kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd; + kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << 'x' << newEnd; mlt_transition_set_in_and_out(tr, newStart, newEnd); break; } @@ -2203,7 +2681,7 @@ void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int int currentOut = (int) mlt_transition_get_out(tr); //mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt(); - //kDebug()<<" + TRANSITION "<= out) return false; QMap args = mltGetTransitionParamsFromXml(xml); Mlt::Service service(m_mltProducer->parent().get_service()); @@ -2237,11 +2715,11 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, char *transId = decodedString(tag); Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId); if (out != GenTime()) - transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps)); + transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1); QMap::Iterator it; QString key; - - kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count(); + if (xml.attribute("automatic") == "1") transition->set("automatic", 1); + //kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count(); for (it = args.begin(); it != args.end(); ++it) { key = it.key(); @@ -2257,6 +2735,7 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, field->plant_transition(*transition, a_track, b_track); delete[] transId; refresh(); + return true; } void Render::mltSavePlaylist() { @@ -2268,7 +2747,260 @@ void Render::mltSavePlaylist() { fileConsumer.connect(service); fileConsumer.start(); +} + +QList Render::producersList() { + QList prods = QList (); + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return prods; + Mlt::Tractor tractor(service); + QStringList ids; + + int trackNb = tractor.count(); + for (int t = 1; t < trackNb; t++) { + Mlt::Producer trackProducer(tractor.track(t)); + 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 *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent()); + if (nprod && !nprod->is_blank() && !ids.contains(nprod->get("id"))) { + ids.append(nprod->get("id")); + prods.append(nprod); + } + } + } + return prods; +} + +void Render::fillSlowMotionProducers() { + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return; + + Mlt::Tractor tractor(service); + + int trackNb = tractor.count(); + for (int t = 1; t < trackNb; t++) { + Mlt::Producer trackProducer(tractor.track(t)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipNb = trackPlaylist.count(); + for (int i = 0; i < clipNb; i++) { + Mlt::Producer *nprod = new Mlt::Producer(trackPlaylist.get_clip(i)->get_parent()); + if (nprod && !nprod->is_blank()) { + QString id = nprod->get("id"); + if (id.startsWith("slowmotion:")) { + // this is a slowmotion producer, add it to the list + QString url = nprod->get("resource"); + if (!m_slowmotionProducers.contains(url)) { + m_slowmotionProducers.insert(url, nprod); + } + } + } + } + } +} + +void Render::mltInsertTrack(int ix, bool videoTrack) { + blockSignals(true); + m_isBlocked = true; + + m_mltConsumer->set("refresh", 0); + mlt_service_lock(m_mltConsumer->get_service()); + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + Mlt::Tractor tractor(service); + + Mlt::Playlist playlist;// = new Mlt::Playlist(); + int ct = tractor.count(); + // kDebug() << "// TRACK INSERT: " << ix << ", MAX: " << ct; + int pos = ix; + if (pos < ct) { + Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos)); + tractor.set_track(playlist, pos); + Mlt::Producer newProd(tractor.track(pos)); + if (!videoTrack) newProd.set("hide", 1); + pos++; + for (; pos <= ct; pos++) { + Mlt::Producer *prodToMove2 = new Mlt::Producer(tractor.track(pos)); + tractor.set_track(*prodToMove, pos); + prodToMove = prodToMove2; + } + } else { + tractor.set_track(playlist, ix); + Mlt::Producer newProd(tractor.track(ix)); + if (!videoTrack) newProd.set("hide", 1); + } + + // Move transitions + mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + 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); + } + } + 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"); + } + + // Add audio mix transition to last track + Mlt::Field *field = tractor.field(); + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); + //transition->set("mlt_service", "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()); + m_isBlocked = false; + blockSignals(false); +} + + +void Render::mltDeleteTrack(int ix) { + QDomDocument doc; + doc.setContent(sceneList(), false); + int tracksCount = doc.elementsByTagName("track").count() - 1; + QDomNode track = doc.elementsByTagName("track").at(ix); + QDomNode tractor = doc.elementsByTagName("tractor").at(0); + QDomNodeList transitions = doc.elementsByTagName("transition"); + for (int i = 0; i < transitions.count(); i++) { + QDomElement e = transitions.at(i).toElement(); + QDomNodeList props = e.elementsByTagName("property"); + QMap mappedProps; + for (int j = 0; j < props.count(); j++) { + QDomElement f = props.at(j).toElement(); + mappedProps.insert(f.attribute("name"), f.firstChild().nodeValue()); + } + if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) { + tractor.removeChild(transitions.at(i)); + } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) { + // Transition needs to be moved + int a_track = mappedProps.value("a_track").toInt(); + int b_track = mappedProps.value("b_track").toInt(); + if (a_track > 0) a_track --; + if (b_track > 0) b_track --; + for (int j = 0; j < props.count(); j++) { + QDomElement f = props.at(j).toElement(); + if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track)); + else if (f.attribute("name") == "b_track") f.firstChild().setNodeValue(QString::number(b_track)); + } + + } + } + tractor.removeChild(track); + setSceneList(doc.toString(), m_framePosition); + mltCheckLength(); + return; + + blockSignals(true); + m_isBlocked = true; + + m_mltConsumer->set("refresh", 0); + mlt_service_lock(m_mltConsumer->get_service()); + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + + /*Mlt::Tractor tractor(service); + + + Mlt::Multitrack *multi = tractor.multitrack(); + + + int ct = tractor.count(); + kDebug() << "// TRACK REMOVE: " << ix << ", MAX: " << ct; + int pos = ix; + for (; pos < ct ; pos++) { + Mlt::Service *lastTrack = new Mlt::Service(tractor.track(pos)->get_service()); + //mlt_service_close(lastTrack->get_service()); + delete lastTrack; + Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos + 1)); + Mlt::Producer *prodToClose = new Mlt::Producer(tractor.track(pos)); + mlt_service_close(prodToMove->get_service()); + mlt_service_close(prodToClose->get_service()); + tractor.set_track(*prodToMove, pos); + }*/ + + // Move transitions + /*mlt_service serv = m_mltProducer->parent().get_service(); + mlt_service nextservice = mlt_service_get_producer(serv); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + + while (mlt_type == "transition") { + 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); + } + } + 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"); + } + + // Add audio mix transition to last track + Mlt::Field *field = tractor.field(); + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); + //transition->set("mlt_service", "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()); + m_isBlocked = false; + blockSignals(false); +} + + +void Render::updatePreviewSettings() { + kDebug() << "////// RESTARTING CONSUMER"; + if (!m_mltConsumer || !m_mltProducer) return; + if (m_mltProducer->get_playtime() == 0) return; + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) return; + + //m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + m_mltConsumer->purge(); + QString scene = sceneList(); + int pos = 0; + if (m_mltProducer) { + pos = m_mltProducer->position(); + delete m_mltProducer; + } + m_mltProducer = NULL; + setSceneList(scene, pos); } #include "renderer.moc"