{
// detect if the producer has finished playing. Is there a better way to do it?
if (self->m_isBlocked) return;
- if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
+ Mlt::Frame frame(frame_ptr);
+#ifdef Q_WS_MAC
+ self->showFrame(frame);
+#endif
+ if (frame.get_double("_speed") == 0.0) {
self->emitConsumerStopped();
} else {
self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
+ m_mltProfile(NULL),
m_framePosition(0),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_blackClip(NULL),
m_winid(winid)
+#ifdef Q_WS_MAC
+ , m_glWidget(0)
+#endif
{
kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
{
//delete m_osdTimer;
if (m_mltProducer) {
- Mlt::Service service(m_mltProducer->get_service());
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
if (service.type() == tractor_type) {
Mlt::Tractor tractor(service);
- int trackNb = tractor.count();
+ 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") {
+ nextservicetodisconnect = nextservice;
+ nextservice = mlt_service_producer(nextservice);
+ mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
+ nextservice = mlt_service_producer(nextservice);
+ if (nextservice == NULL) break;
+ properties = MLT_SERVICE_PROPERTIES(nextservice);
+ mlt_type = mlt_properties_get(properties, "mlt_type");
+ resource = mlt_properties_get(properties, "mlt_service");
+ }
+ int trackNb = tractor.count();
while (trackNb > 0) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackPlaylist.clear();
+ if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
trackNb--;
}
}
+ mlt_service_unlock(service.get_service());
}
kDebug() << "// // // CLOSE RENDERER " << m_name;
delete m_blackClip;
m_blackClip = NULL;
+ //TODO: uncomment following line when everything is clean
+ //if (m_mltProfile) delete m_mltProfile;
m_mltProfile = new Mlt::Profile(tmp);
delete[] tmp;
}
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
+#ifdef Q_WS_MAC
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio");
+ m_mltConsumer->set("preview_off", 1);
+ m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+#else
m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
+#endif
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
m_mltConsumer = NULL;
QString scene = sceneList();
int pos = 0;
-
+ double current_fps = m_mltProfile->fps();
delete m_blackClip;
m_blackClip = NULL;
}
m_mltProducer = NULL;
- if (m_mltProfile) delete m_mltProfile;
- m_mltProfile = NULL;
-
buildConsumer();
-
+ 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);
}
}
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, bool replaceProducer)
{
KUrl url = KUrl(xml.attribute("resource", QString()));
Mlt::Producer *producer = NULL;
+ //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
/*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
return;
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);
m_mltProducer->set("skip_loop_filter", "all");
m_mltProducer->set("skip_frame", "bidir");
}*/
- if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+ if (!m_mltProducer || !m_mltProducer->is_valid()) {
+ kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+ return -1;
+ }
m_fps = m_mltProducer->get_fps();
int error = connectPlaylist();
if (m_winid == -1) return -1;
m_isBlocked = true;
int error;
- qDeleteAll(m_slowmotionProducers.values());
- m_slowmotionProducers.clear();
//kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
if (!m_mltConsumer->is_stopped()) {
m_mltConsumer->stop();
- //m_mltConsumer->set("refresh", 0);
}
+ m_mltConsumer->set("refresh", 0);
if (m_mltProducer) {
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
- Mlt::Service service(m_mltProducer->get_service());
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
if (service.type() == tractor_type) {
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") {
+ 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");
+ resource = mlt_properties_get(properties, "mlt_service");
+ }
+
int trackNb = tractor.count();
while (trackNb > 0) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackPlaylist.clear();
+ if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
trackNb--;
}
}
+ mlt_service_unlock(service.get_service());
+
+ qDeleteAll(m_slowmotionProducers.values());
+ m_slowmotionProducers.clear();
delete m_mltProducer;
m_mltProducer = NULL;
int dropFrames = 1;
if (show == false) dropFrames = 0;
m_mltConsumer->stop();
+#ifdef Q_WS_MAC
+ m_mltConsumer->set("real_time", dropFrames);
+#else
m_mltConsumer->set("play.real_time", dropFrames);
+#endif
if (m_mltConsumer->start() == -1) {
emit blockMonitors();
delete m_mltProducer;
//if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
}
+#ifdef Q_WS_MAC
+void Render::showFrame(Mlt::Frame& frame)
+{
+ mlt_image_format format = mlt_image_rgb24a;
+ int width = 0;
+ int height = 0;
+ const uchar* image = frame.get_image(format, width, height);
+ QImage qimage(width, height, QImage::Format_ARGB32);
+ memcpy(qimage.scanLine(0), image, width * height * 4);
+ emit showImageSignal(qimage);
+}
+#endif
+
/** MLT PLAYLIST DIRECT MANIPULATON **/
m_isBlocked = true;
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return;
+ }
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
bool Render::mltRemoveClip(int track, GenTime position)
{
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return false;
+ }
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
//kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
m_isBlocked = true;
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
- delete clip;
+ if (clip) delete clip;
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 (insertPos != -1) {
insertPos += offset;
int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
+ if (diff > 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;
+ if (!trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos;
+ }
int position = trackPlaylist.clip_start(clipIndex);
int blankDuration = trackPlaylist.clip_length(clipIndex);
diff = -diff;
- if (blankDuration - diff == 0)
+ if (blankDuration - diff == 0) {
trackPlaylist.remove(clipIndex);
- else trackPlaylist.remove_region(position, diff);
+ } else trackPlaylist.remove_region(position, diff);
}
trackPlaylist.consolidate_blanks(0);
}
int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 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;
+ if (diff > 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);
int blankDuration = trackPlaylist.clip_length(clipIndex);
- if (diff + blankDuration == 0)
+ if (diff + blankDuration == 0) {
trackPlaylist.remove(clipIndex);
- else trackPlaylist.remove_region(position, - diff);
+ } else trackPlaylist.remove_region(position, - diff);
}
trackPlaylist.consolidate_blanks(0);
}
m_isBlocked = true;
int newLength = 0;
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return -1;
+ }
//kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (QString(filter->get("kdenlive_ix")).toInt() > filter_ix) {
+ 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++;
if (trackPlaylist.is_blank(clipIndex)) {
int blankStart = trackPlaylist.clip_start(clipIndex);
int blankDuration = trackPlaylist.clip_length(clipIndex);
- if (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!";
+ if (diff > blankDuration) {
+ kDebug() << "// ERROR blank clip is not large enough to get back required space!!!";
+ }
if (diff - blankDuration == 0) {
trackPlaylist.remove(clipIndex);
} else trackPlaylist.remove_region(blankStart, diff);
kDebug() << "NEW PROD ID: " << prod->get("id");
m_isBlocked++;
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";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return;
+ }
+ mlt_service_lock(m_mltConsumer->get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
m_isBlocked++;
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return false;
+ }
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
fileConsumer.start();
}
-QList <Mlt::Producer *> Render::producersList()
+const QList <Mlt::Producer *> Render::producersList()
{
QList <Mlt::Producer *> prods;
if (m_mltProducer == NULL) return prods;
Mlt::Service service(m_mltProducer->parent().get_service());
mlt_service_lock(service.get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return;
+ }
Mlt::Tractor tractor(service);
//kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
setSceneList(doc.toString(), m_framePosition);
- if (m_mltProducer != NULL) {
- Mlt::Producer parentProd(m_mltProducer->parent());
- if (parentProd.get_producer() != NULL) {
- Mlt::Service service(parentProd.get_service());
- if (service.type() == tractor_type) {
- Mlt::Tractor tractor(service);
- mltCheckLength(&tractor);
+ /* if (m_mltProducer != NULL) {
+ Mlt::Producer parentProd(m_mltProducer->parent());
+ if (parentProd.get_producer() != NULL) {
+ Mlt::Service service(parentProd.get_service());
+ if (service.type() == tractor_type) {
+ Mlt::Tractor tractor(service);
+ mltCheckLength(&tractor);
+ }
}
- }
- }
+ }*/
}
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"
projects / kdenlive / blobdiff