#include <QTimer>
#include <QDir>
#include <QApplication>
-#include <QPainter>
#include <KDebug>
#include <KStandardDirs>
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
+ //m_mltConsumer->set("fullscreen", 1);
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("rescale", "nearest");
m_mltProfile = NULL;
buildConsumer();
- kDebug() << "//RESET WITHSCENE: " << scene;
+ //kDebug() << "//RESET WITHSCENE: " << scene;
setSceneList(scene);
char *tmp = decodedString(scene);
transition->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%";
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);
return;
}
if (xml.attribute("type").toInt() == COLOR) {
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;
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());
}*/
// Get the video_index
int index = mlt_properties_get_int(properties, "video_index");
+ int default_video = -1;
+ int video_max = 0;
+ int default_audio = -1;
+ int audio_max = 0;
+ // Find default audio stream (borrowed from MLT)
+ for (int ix = 0; ix < context->nb_streams; ix++) {
+ // Get the codec context
+ AVCodecContext *codec_context = context->streams[ ix ]->codec;
+
+ if (avcodec_find_decoder(codec_context->codec_id) == NULL)
+ continue;
+ // Determine the type and obtain the first index of each type
+ switch (codec_context->codec_type) {
+ case CODEC_TYPE_VIDEO:
+ if (default_video < 0) default_video = ix;
+ video_max = ix;
+ break;
+ case CODEC_TYPE_AUDIO:
+ if (default_audio < 0) default_audio = ix;
+ audio_max = ix;
+ break;
+ default:
+ break;
+ }
+ }
+ 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);
+
#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) {
+ if (index > -1 && 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) {
+ if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) {
filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
}
} else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
int index = mlt_properties_get_int(properties, "audio_index");
#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name)
+ if (index > -1 && 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)
+ if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
}
#endif
//if (producer) delete producer;
}
+
/** Create the producer from the Westley QDomDocument */
#if 0
void Render::initSceneList() {
if (m_winid == -1) return;
m_isBlocked = true;
- 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);
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()) {
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);
+ emit rendererPosition(position);
}
/** Create the producer from the Westley QDomDocument */
QString Render::sceneList() {
- KTemporaryFile temp;
- QString result;
-
- if (temp.open()) {
- saveSceneList(temp.fileName());
- QFile file(temp.fileName());
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- kWarning() << "++++++++++++++++ CANNOT READ TMP SCENELIST FILE";
- return QString();
- }
- QTextStream in(&file);
- while (!in.atEnd()) {
- result.append(in.readLine());
- }
- }
- return result;
-}
-
-void Render::saveSceneList(QString path, QDomElement kdenliveData) {
-
- char *tmppath = decodedString("westley:" + path);
- Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+ QString playlist;
+ Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist");
m_mltProducer->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.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();
}
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());
int clipIndex = trackPlaylist.get_clip_index_at(cutPos);
if (trackPlaylist.is_blank(clipIndex)) {
- kDebug() << "// WARMNING, TRYING TO CUT A BLANK";
+ kDebug() << "// WARNING, TRYING TO CUT A BLANK";
m_isBlocked = false;
return;
}
mlt_service_lock(service.get_service());
int clipStart = trackPlaylist.clip_start(clipIndex);
trackPlaylist.split(clipIndex, cutPos - clipStart - 1);
+ mlt_service_unlock(service.get_service());
// duplicate effects
Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart);
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
if (filter->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"));
+ // 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"));
+ 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";
Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
- if (QString(clip.parent().get("transparency")).toInt() == 1)
- mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());
+ /*if (QString(clip.parent().get("transparency")).toInt() == 1)
+ mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());*/
/* // Display playlist info
kDebug()<<"//// AFTER";
return true;
}
-int Render::mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod) {
+int Render::mltGetSpaceLength(const GenTime pos, int track) {
+ 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;
+ return trackPlaylist.clip_length(clipIndex);
+}
+
+
+void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration) {
+ 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;
+ }
+
+ Mlt::Service service(parentProd.get_service());
+ Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
+ int insertPos = pos.frames(m_fps);
+ int diff = duration.frames(m_fps);
+
+ if (track != -1) {
+ // insert space in one track only
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ 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);
+
+ 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 clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ 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);
+
+ 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());
+}
+
+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());
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");
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");
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)), (int)(info.cropStart.frames(m_fps) + 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;
}
}
Mlt::Service clipService(clip->get_service());
m_isBlocked = true;
+
+ // temporarily remove all effects after insert point
+ QList <Mlt::Filter *> filtersList;
+ const int filer_ix = QString(args.value("kdenlive_ix")).toInt();
+ int ct = 0;
+ Mlt::Filter *filter = clipService.filter(ct);
+ while (filter) {
+ if (QString(filter->get("kdenlive_ix")).toInt() > filer_ix) {
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+
// create filter
QString tag = args.value("tag");
kDebug() << " / / INSERTING EFFECT: " << tag;
}
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;
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++;
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 "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
- }*/
- //tractor.multitrack()->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;
transpinfo.endPos = info.startPos + clipDuration;
transpinfo.track = info.track;
mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
- }
+ }*/
m_isBlocked = false;
return true;
}
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);
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;
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());
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) {
+ 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);
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;
} 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());
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;
}
}
void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
-
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
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);
+ int new_out = (int)newOut.frames(m_fps) - 1;
while (mlt_type == "transition") {
mlt_transition tr = (mlt_transition) nextservice;
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();
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);
QMap<QString, QString>::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);
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;
}
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<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
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<QString, QString>::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();
}
QList <Mlt::Producer *> Render::producersList() {
- QList <Mlt::Producer *> prods;
+ QList <Mlt::Producer *> prods = QList <Mlt::Producer *> ();
QStringList ids;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
int trackNb = tractor.count();
for (int t = 1; t < trackNb; t++) {
return prods;
}
+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 <QString, QString> 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);
+ 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);
+}
+
#include "renderer.moc"
projects / kdenlive / blobdiff