X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=0ece7e18ab0ff30ccb7f6e9ee04c0e1d746b0233;hb=4f6ba75aba90feaeeb43f85df08e4e3aaf20a613;hp=32d40d227a001b3d38f15bc94feb8050fafcc613;hpb=77af1331ba958e07487173dc833e09d21bc0817d;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 32d40d22..0ece7e18 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -67,7 +67,7 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr } } -Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) : +Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) : QObject(parent), m_isBlocked(0), m_name(rendererName), @@ -84,14 +84,12 @@ Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget , m_glWidget(0) #endif { - kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); - /*if (rendererName == "project") m_monitorId = 10000; else m_monitorId = 10001;*/ /*m_osdTimer = new QTimer(this); connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/ - - buildConsumer(); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + buildConsumer(profile); m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); @@ -116,12 +114,15 @@ void Render::closeMlt() Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_service nextservicetodisconnect; mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); // Delete all transitions while (mlt_type == "transition") { - 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); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); @@ -148,10 +149,10 @@ void Render::closeMlt() } -void Render::buildConsumer() +void Render::buildConsumer(const QString profileName) { char *tmp; - m_activeProfile = KdenliveSettings::current_profile(); + m_activeProfile = profileName; tmp = decodedString(m_activeProfile); setenv("MLT_PROFILE", tmp, 1); delete m_blackClip; @@ -173,6 +174,7 @@ void Render::buildConsumer() } setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); + //m_mltConsumer->set("fullscreen", 1); #ifdef Q_WS_MAC m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio"); m_mltConsumer->set("preview_off", 1); @@ -229,14 +231,14 @@ void Render::buildConsumer() } -int Render::resetProfile() +int Render::resetProfile(const QString profileName) { if (!m_mltConsumer) return 0; - if (m_activeProfile == KdenliveSettings::current_profile()) { + if (m_activeProfile == profileName) { kDebug() << "reset to same profile, nothing to do"; return 1; } - kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << KdenliveSettings::current_profile(); + kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << profileName; //KdenliveSettings::current_profile(); if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); @@ -244,7 +246,7 @@ int Render::resetProfile() m_mltConsumer = NULL; QString scene = sceneList(); int pos = 0; - + double current_fps = m_mltProfile->fps(); delete m_blackClip; m_blackClip = NULL; @@ -267,11 +269,16 @@ int Render::resetProfile() } m_mltProducer = NULL; - buildConsumer(); - + buildConsumer(profileName); + double new_fps = m_mltProfile->fps(); + if (current_fps != new_fps) { + // fps changed, we must update the scenelist positions + scene = updateSceneListFps(current_fps, new_fps, scene); + } //kDebug() << "//RESET WITHSCENE: " << scene; setSceneList(scene, pos); - + // producers have changed (different profile), so reset them... + emit refreshDocumentProducers(); /*char *tmp = decodedString(scene); Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp); delete[] tmp; @@ -342,14 +349,15 @@ int Render::renderHeight() const return m_mltProfile->height(); } -QPixmap Render::extractFrame(int frame_position, int width, int height) +QImage Render::extractFrame(int frame_position, int width, int height) { if (width == -1) { width = renderWidth(); height = renderHeight(); } else if (width % 2 == 1) width++; - QPixmap pix(width, height); + if (!m_mltProducer) { + QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); return pix; } @@ -635,6 +643,12 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, boo producer->set("id", tmp); delete[] tmp; + if (xml.hasAttribute("templatetext")) { + char *tmp = decodedString(xml.attribute("templatetext")); + producer->set("templatetext", tmp); + delete[] tmp; + } + if (!replaceProducer && xml.hasAttribute("file_hash")) { // Clip already has all properties emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); @@ -896,7 +910,7 @@ int Render::setSceneList(QString playlist, int position) m_isBlocked = true; int error; - //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; + kDebug() << "////// RENDER, SET SCENE LIST: " << playlist; if (m_mltConsumer == NULL) { kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER"; @@ -921,13 +935,15 @@ int Render::setSceneList(QString playlist, int position) Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_service nextservicetodisconnect; mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); // Delete all transitions while (mlt_type == "transition") { - mlt_field_disconnect_service(field->get_field(), nextservice); + nextservicetodisconnect = nextservice; nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); if (nextservice == NULL) break; properties = MLT_SERVICE_PROPERTIES(nextservice); mlt_type = mlt_properties_get(properties, "mlt_type"); @@ -941,6 +957,7 @@ int Render::setSceneList(QString playlist, int position) if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); trackNb--; } + delete field; } mlt_service_unlock(service.get_service()); @@ -999,7 +1016,7 @@ int Render::setSceneList(QString playlist, int position) m_isBlocked = false; blockSignals(false); - emit refreshDocumentProducers(); + return error; //kDebug()<<"// SETSCN LST, POS: "<parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; @@ -1541,6 +1562,7 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro } mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(info.track)); + int trackDuration = trackProducer.get_playtime() - 1; Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); //kDebug()<<"/// INSERT cLIP: "<is_valid()) { + mlt_service_unlock(service.get_service()); + return -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); + int cutPos = (int) info.cropStart.frames(m_fps); + int insertPos = (int) info.startPos.frames(m_fps); + int cutDuration = (int)(info.endPos - info.startPos).frames(m_fps) - 1; + Mlt::Producer *clip = prod->cut(cutPos, cutDuration + cutPos); + if (overwrite && (insertPos < trackDuration)) { + // Replace zone with blanks + //trackPlaylist.split_at(insertPos, true); + trackPlaylist.remove_region(insertPos, cutDuration + 1); + int clipIndex = trackPlaylist.get_clip_index_at(insertPos); + trackPlaylist.insert_blank(clipIndex, cutDuration); + } else if (push) { + trackPlaylist.split_at(insertPos, true); + int clipIndex = trackPlaylist.get_clip_index_at(insertPos); + trackPlaylist.insert_blank(clipIndex, cutDuration); + } + int newIndex = trackPlaylist.insert_at(insertPos, clip, 1); delete clip; /*if (QString(prod->get("transparency")).toInt() == 1) mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/ @@ -1666,11 +1705,48 @@ void Render::mltCutClip(int track, GenTime position) m_isBlocked = false; } -void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { // TODO: optimize - mltRemoveClip(info.track, info.startPos); - mltInsertClip(info, element, prod); + if (prod == NULL) { + kDebug() << "Cannot update clip with null producer //////"; + return false; + } + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(info.track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int startPos = info.startPos.frames(m_fps); + int clipIndex = trackPlaylist.get_clip_index_at(startPos); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + + // keep effects + QList filtersList; + Mlt::Service sourceService(clip->get_service()); + int ct = 0; + Mlt::Filter *filter = sourceService.filter(ct); + while (filter) { + if (filter->get("kdenlive_ix") != 0) { + filtersList.append(filter); + } + ct++; + filter = sourceService.filter(ct); + } + if (!mltRemoveClip(info.track, info.startPos)) return false; + if (mltInsertClip(info, element, prod) == -1) return false; + if (!filtersList.isEmpty()) { + clipIndex = trackPlaylist.get_clip_index_at(startPos); + Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex); + Mlt::Service destService(destclip->get_service()); + delete destclip; + for (int i = 0; i < filtersList.count(); i++) + destService.attach(*(filtersList.at(i))); + } + return true; } @@ -1729,12 +1805,12 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) { if (!m_mltProducer) { kDebug() << "PLAYLIST NOT INITIALISED //////"; - return -1; + return 0; } Mlt::Producer parentProd(m_mltProducer->parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return -1; + return 0; } Mlt::Service service(parentProd.get_service()); @@ -1744,7 +1820,11 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) 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 (clipIndex == trackPlaylist.count()) { + // We are after the end of the playlist + return -1; + } + if (!trackPlaylist.is_blank(clipIndex)) return 0; if (fromBlankStart) return trackPlaylist.clip_length(clipIndex); return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos; } @@ -1914,6 +1994,7 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) { + if (source == dest) return; Mlt::Service sourceService(source->get_service()); Mlt::Service destService(dest->get_service()); @@ -1929,7 +2010,7 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) } } -int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int strobe, Mlt::Producer *prod) +int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double oldspeed, int strobe, Mlt::Producer *prod) { m_isBlocked = true; int newLength = 0; @@ -1946,19 +2027,19 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int int clipIndex = trackPlaylist.get_clip_index_at(startPos); int clipLength = trackPlaylist.clip_length(clipIndex); - Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); - if (clip == NULL) { + Mlt::Producer *original = trackPlaylist.get_clip(clipIndex); + if (original == NULL) { return -1; } - if (!clip->is_valid() || clip->is_blank()) { + if (!original->is_valid() || original->is_blank()) { // invalid clip - delete clip; + delete original; return -1; } - Mlt::Producer clipparent = clip->parent(); + Mlt::Producer clipparent = original->parent(); if (!clipparent.is_valid() || clipparent.is_blank()) { // invalid clip - delete clip; + delete original; return -1; } @@ -1972,8 +2053,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); 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); + char *tmp = decodedString("framebuffer:" + url); + slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); if (strobe > 1) slowprod->set("strobe", strobe); delete[] tmp; QString producerid = "slowmotion:" + id + ':' + QString::number(speed); @@ -1981,10 +2062,18 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; + // copy producer props + double ar = original->parent().get_double("force_aspect_ratio"); + if (ar != 0.0) slowprod->set("force_aspect_ratio", ar); + int threads = original->parent().get_int("threads"); + if (threads != 0) slowprod->set("threads", threads); + int ix = original->parent().get_int("video_index"); + if (ix != 0) slowprod->set("video_index", ix); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); + // 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); @@ -2013,12 +2102,11 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int 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) { + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps)); + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + speedIndependantInfo.cropDuration).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); + cut = prod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = prod->cut(originalStart, (int)(originalStart + speedIndependantInfo.cropDuration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); @@ -2038,8 +2126,8 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); 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); + char *tmp = decodedString("framebuffer:" + url); + slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); delete[] tmp; slowprod->set("strobe", strobe); QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); @@ -2047,23 +2135,30 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int tmp = decodedString(producerid); slowprod->set("id", tmp); delete[] tmp; + // copy producer props + double ar = original->parent().get_double("force_aspect_ratio"); + if (ar != 0.0) slowprod->set("force_aspect_ratio", ar); + int threads = original->parent().get_int("threads"); + if (threads != 0) slowprod->set("threads", threads); + int ix = original->parent().get_int("video_index"); + if (ix != 0) slowprod->set("video_index", ix); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); - GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * (oldspeed / speed); + GenTime duration = speedIndependantInfo.cropDuration / speed; + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps) / 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) { + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + duration).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)); + cut = slowprod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = slowprod->cut(originalStart, (int)(originalStart + duration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); @@ -2076,8 +2171,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int mlt_service_unlock(service.get_service()); } - - delete clip; + delete original; if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); m_isBlocked = false; return newLength; @@ -2135,15 +2229,45 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para Mlt::Service clipService(clip->get_service()); m_isBlocked = true; int duration = clip->get_playtime(); + bool updateIndex = false; delete clip; - // 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) { + // A filter at that position already existed, so we will increase all indexes later + updateIndex = true; + break; + } + ct++; + filter = clipService.filter(ct); + } + + if (params.paramValue("id") == "speed") { + // special case, speed effect is not really inserted, we just update the other effects index (kdenlive_ix) + ct = 0; + filter = clipService.filter(ct); + while (filter) { + if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { + if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + } + ct++; + filter = clipService.filter(ct); + } + m_isBlocked = false; + if (doRefresh) refresh(); + return true; + } + + + // temporarily remove all effects after insert point + QList filtersList; + ct = 0; + filter = clipService.filter(ct); while (filter) { if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { - filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); filtersList.append(filter); clipService.detach(*filter); } else ct++; @@ -2250,9 +2374,11 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para // re-add following filters for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); + Mlt::Filter *filter = filtersList.at(i); + if (updateIndex) + filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + clipService.attach(*filter); } - m_isBlocked = false; if (doRefresh) refresh(); return true; @@ -2287,6 +2413,19 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); + + /* + kDebug() << "EDITING FILTER: "<get("kdenlive_id") <<", IX: "<get("kdenlive_ix"); + ct++; + filter = clipService.filter(ct); + } + kDebug() << "++++++++++++++++++++++++++"; + */ + ct = 0; + filter = clipService.filter(ct); while (filter) { if (filter->get("kdenlive_ix") == index) { break; @@ -2296,24 +2435,10 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par } if (!filter) { - kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!"; + kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT! " << index << ", " << tag; // filter was not found, it was probably a disabled filter, so add it to the correct place... - int ct = 0; - filter = clipService.filter(ct); - QList filtersList; - while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) { - filtersList.append(filter); - clipService.detach(*filter); - } else ct++; - filter = clipService.filter(ct); - } - bool success = mltAddEffect(track, position, params); - - for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); - } + bool success = mltAddEffect(track, position, params); m_isBlocked = false; return success; } @@ -2332,6 +2457,38 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par return true; } +void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) +{ + + kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; + 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(position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + if (!clip) { + kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); + return; + } + Mlt::Service clipService(clip->get_service()); + delete clip; + m_isBlocked = true; + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + int pos = QString(filter->get("kdenlive_ix")).toInt(); + if (pos == oldPos) { + filter->set("kdenlive_ix", newPos); + } else ct++; + filter = clipService.filter(ct); + } + + m_isBlocked = false; + refresh(); +} + void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) { @@ -2591,17 +2748,17 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) return true; } -bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) +bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod, bool overwrite, bool insert) { - return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod); + return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod, overwrite, insert); } -void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) +bool 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; + return false; } kDebug() << "NEW PROD ID: " << prod->get("id"); m_isBlocked++; @@ -2609,24 +2766,24 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; - return; + return false; } mlt_service_lock(m_mltConsumer->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(pos + 1); + int clipIndex = trackPlaylist.get_clip_index_at(pos); Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + if (clipProducer == NULL || clipProducer->is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; - return; + return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); - + if (!clip) return false; // move all effects to the correct producer mltPasteEffects(clipProducer, clip); trackPlaylist.insert_at(pos, clip, 1); @@ -2634,9 +2791,10 @@ void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) delete clipProducer; mlt_service_unlock(m_mltConsumer->get_service()); m_isBlocked--; + return true; } -bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) +bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool insert) { m_isBlocked++; @@ -2655,10 +2813,10 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer->is_blank()) { + if (!overwrite && (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || clipProducer->is_blank())) { // error, destination is not empty if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1); - delete clipProducer; + if (clipProducer) delete clipProducer; //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); @@ -2666,7 +2824,13 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn 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); + } int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + trackPlaylist.consolidate_blanks(1); delete clipProducer; /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); @@ -2677,23 +2841,23 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } else { Mlt::Producer destTrackProducer(tractor.track(endTrack)); Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); - if (!destTrackPlaylist.is_blank_at(moveEnd)) { + if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty mlt_service_unlock(service.get_service()); m_isBlocked--; return false; } else { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + if (!clipProducer || clipProducer->is_blank()) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); - delete clipProducer; + if (clipProducer) delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); m_isBlocked--; return false; } - trackPlaylist.consolidate_blanks(0); + trackPlaylist.consolidate_blanks(1); destTrackPlaylist.consolidate_blanks(1); Mlt::Producer *clip; // check if we are moving a slowmotion producer @@ -2714,7 +2878,14 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn // move all effects to the correct producer mltPasteEffects(clipProducer, clip); + if (overwrite) { + destTrackPlaylist.remove_region(moveEnd, clip->get_playtime()); + int clipIndex = trackPlaylist.get_clip_index_at(moveEnd); + trackPlaylist.insert_blank(clipIndex, clip->get_playtime() - 1); + } + int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); + if (clip == clipProducer) { delete clip; clip = NULL; @@ -2739,40 +2910,71 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return true; } + +QList Render::checkTrackSequence(int track) +{ + QList list; + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return list; + } + Mlt::Tractor tractor(service); + mlt_service_lock(service.get_service()); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipNb = trackPlaylist.count(); + //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; + for (int i = 0; i < clipNb; i++) { + Mlt::Producer *c = trackPlaylist.get_clip(i); + int pos = trackPlaylist.clip_start(i); + if (!list.contains(pos)) list.append(pos); + pos += c->get_playtime(); + if (!list.contains(pos)) list.append(pos); + delete c; + } + return list; +} + 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 serv = m_mltProducer->parent().get_service(); - m_isBlocked++; - mlt_service_lock(serv); - //m_mltConsumer->set("refresh", 0); + Mlt::Service service(m_mltProducer->parent().get_service()); + Mlt::Tractor tractor(service); + Mlt::Field *field = tractor.field(); + m_isBlocked++; + mlt_service_lock(service.get_service()); - mlt_service nextservice = mlt_service_get_producer(serv); + mlt_service nextservice = mlt_service_get_producer(service.get_service()); 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)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; + bool found = false; 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); + Mlt::Transition transition((mlt_transition) nextservice); + int currentTrack = transition.get_b_track(); + int currentIn = (int) transition.get_in(); + int currentOut = (int) transition.get_out(); if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { - mlt_transition_set_in_and_out(tr, new_in, new_out); + found = true; if (newTrack - startTrack != 0) { - //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: "<disconnect_service(transition); + field->plant_transition(new_transition, newTransitionTrack, newTrack); + } else transition.set_in_and_out(new_in, new_out); break; } nextservice = mlt_service_producer(nextservice); @@ -2781,11 +2983,11 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - mlt_service_unlock(serv); + mlt_service_unlock(service.get_service()); m_isBlocked--; refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); - return true; + return found; } void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) @@ -2827,6 +3029,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QString key; mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr); mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt()); + mlt_properties_set_int(transproperties, "automatic", xml.attribute("automatic", "0").toInt()); // update the transition id in case it uses the same MLT service but different Kdenlive id char *tmp = decodedString(xml.attribute("id")); mlt_properties_set(transproperties, "kdenlive_id", tmp); @@ -3345,5 +3548,100 @@ void Render::updatePreviewSettings() setSceneList(scene, pos); } + +QString Render::updateSceneListFps(double current_fps, double new_fps, QString scene) +{ + // Update all frame positions to the new fps value + //WARNING: there are probably some effects or other that hold a frame value + // as parameter and will also need to be updated here! + QDomDocument doc; + doc.setContent(scene); + + double factor = new_fps / current_fps; + QDomNodeList producers = doc.elementsByTagName("producer"); + for (int i = 0; i < producers.count(); i++) { + QDomElement prod = producers.at(i).toElement(); + prod.removeAttribute("in"); + prod.removeAttribute("out"); + + QDomNodeList props = prod.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName.startsWith("meta.") || paramName == "length") { + prod.removeChild(props.at(j)); + j--; + } + } + } + + QDomNodeList entries = doc.elementsByTagName("entry"); + for (int i = 0; i < entries.count(); i++) { + QDomElement entry = entries.at(i).toElement(); + int in = entry.attribute("in").toInt(); + int out = entry.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + entry.setAttribute("in", in); + entry.setAttribute("out", out); + } + + QDomNodeList blanks = doc.elementsByTagName("blank"); + for (int i = 0; i < blanks.count(); i++) { + QDomElement blank = blanks.at(i).toElement(); + int length = blank.attribute("length").toInt(); + length = factor * length + 0.5; + blank.setAttribute("length", QString::number(length)); + } + + QDomNodeList filters = doc.elementsByTagName("filter"); + for (int i = 0; i < filters.count(); i++) { + QDomElement filter = filters.at(i).toElement(); + int in = filter.attribute("in").toInt(); + int out = filter.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + filter.setAttribute("in", in); + filter.setAttribute("out", out); + } + + QDomNodeList transitions = doc.elementsByTagName("transition"); + for (int i = 0; i < transitions.count(); i++) { + QDomElement transition = transitions.at(i).toElement(); + int in = transition.attribute("in").toInt(); + int out = transition.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + transition.setAttribute("in", in); + transition.setAttribute("out", out); + QDomNodeList props = transition.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName == "geometry") { + QString geom = param.firstChild().nodeValue(); + QStringList keys = geom.split(';'); + QStringList newKeys; + for (int k = 0; k < keys.size(); ++k) { + if (keys.at(k).contains('=')) { + int pos = keys.at(k).section('=', 0, 0).toInt(); + pos = factor * pos + 0.5; + newKeys.append(QString::number(pos) + '=' + keys.at(k).section('=', 1)); + } else newKeys.append(keys.at(k)); + } + param.firstChild().setNodeValue(newKeys.join(";")); + } + } + } + QDomElement tractor = doc.elementsByTagName("tractor").at(0).toElement(); + int out = tractor.attribute("out").toInt(); + out = factor * out + 0.5; + tractor.setAttribute("out", out); + emit durationChanged(out); + + //kDebug() << "///////////////////////////// " << out << " \n" << doc.toString() << "\n-------------------------"; + return doc.toString(); +} + #include "renderer.moc"