Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
QObject(parent),
m_isBlocked(0),
- sendFrameForAnalysis(false),
analyseAudio(KdenliveSettings::monitor_audio()),
+ sendFrameForAnalysis(false),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("buffer", 12);
m_mltConsumer->set("deinterlace_method", "onefield");
+ m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
mlt_log_set_callback(kdenlive_callback);
}
if (m_mltConsumer && m_mltConsumer->is_valid()) return;
m_mltConsumer->set("progressive", 1);
m_mltConsumer->set("audio_buffer", 1024);
m_mltConsumer->set("frequency", 48000);
+ m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
Mlt::Producer *Render::invalidProducer(const QString &id)
refresh();
}
+void Render::seek(int time)
+{
+ if (!m_mltProducer)
+ return;
+ m_isBlocked = false;
+ m_mltProducer->seek(time);
+ refresh();
+}
+
//static
/*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) {
QPixmap pix(width, height);
return m_mltProfile->dar();
}
+double Render::sar() const
+{
+ return m_mltProfile->sar();
+}
void Render::slotSplitView(bool doit)
{
}
}
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip)
{
- KUrl url = KUrl(xml.attribute("resource", QString()));
+ QString path;
+ if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") path = xml.attribute("proxy");
+ else path = xml.attribute("resource");
+
+
+ KUrl url = KUrl(path);
Mlt::Producer *producer = NULL;
CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
-
//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);
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
- emit removeInvalidClip(clipId, replaceProducer);
+ if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") {
+ // Proxy file is corrupted
+ emit removeInvalidProxy(clipId);
+ }
+ else emit removeInvalidClip(clipId, replaceProducer);
delete producer;
return;
}
int full_luma = xml.attribute("full_luma").toInt();
if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
}
-
+
+ int clipOut = 0;
+ int duration = 0;
+ if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt();
+
// setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger
- if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW)
- producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+ if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
+ int length;
+ if (xml.hasAttribute("length")) {
+ if (clipOut > 0) duration = clipOut + 1;
+ length = xml.attribute("length").toInt();
+ clipOut = length - 1;
+ }
+ else length = xml.attribute("out").toInt() - xml.attribute("in").toInt();
+ producer->set("length", length);
+ }
- if (xml.hasAttribute("out"))
- producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+ if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut);
producer->set("id", clipId.toUtf8().constData());
if (xml.hasAttribute("templatetext"))
producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
- if (!replaceProducer && xml.hasAttribute("file_hash")) {
+ if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
// Clip already has all properties
- emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+ emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
return;
}
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
- filePropertyMap["duration"] = QString::number(producer->get_playtime());
- //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+ filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime());
+ //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
Mlt::Frame *frame = producer->get_frame();
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip);
// FIXME: should delete this to avoid a leak...
//delete producer;
}
//kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
+ // Remove previous profile info
+ QDomDocument doc;
+ doc.setContent(playlist);
+ QDomElement profile = doc.documentElement().firstChildElement("profile");
+ doc.documentElement().removeChild(profile);
+ playlist = doc.toString();
+
if (m_mltConsumer) {
if (!m_mltConsumer->is_stopped()) {
m_mltConsumer->stop();
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
-
Mlt::Service service(m_mltProducer->parent().get_service());
mlt_service_lock(service.get_service());
}
blockSignals(true);
-
// TODO: Better way to do this
if (KdenliveSettings::projectloading_avformatnovalidate())
playlist.replace(">avformat</property>", ">avformat-novalidate</property>");
playlist.replace(">avformat-novalidate</property>", ">avformat</property>");
m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
-
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData();
m_mltProducer = m_blackClip->cut(0, 50);
void Render::setDropFrames(bool show)
{
if (m_mltConsumer) {
- int dropFrames = 1;
- if (show == false) dropFrames = 0;
+ int dropFrames = KdenliveSettings::mltthreads();
+ if (show == false) dropFrames = -dropFrames;
m_mltConsumer->stop();
if (m_winid == 0)
m_mltConsumer->set("real_time", dropFrames);
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
+ // Make sure muting will not produce problems with our audio mixing transition,
+ // because audio mixing is done between each track and the lowest one
+ bool audioMixingBroken = false;
+ if (mute && trackProducer.get_int("hide") < 2 ) {
+ // We mute a track with sound
+ if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+ }
+ else if (!mute && trackProducer.get_int("hide") > 1 ) {
+ // We un-mute a previously muted track
+ if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+ }
+
if (mute) {
if (blind) trackProducer.set("hide", 3);
else trackProducer.set("hide", 2);
} else {
trackProducer.set("hide", 0);
}
+ if (audioMixingBroken) fixAudioMixing(tractor);
+
tractor.multitrack()->refresh();
tractor.refresh();
refresh();
}
+int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
+{
+ for (int i = 1; i < tractor.count(); i++) {
+ Mlt::Producer trackProducer(tractor.track(i));
+ if (trackProducer.get_int("hide") < 2) return i;
+ }
+ return tractor.count() - 1;
+}
+
+void Render::fixAudioMixing(Mlt::Tractor tractor)
+{
+ // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track
+ int lowestTrack = getLowestNonMutedAudioTrack(tractor);
+
+ mlt_service serv = m_mltProducer->parent().get_service();
+ mlt_service_lock(serv);
+ m_isBlocked++;
+
+ 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;
+ if (resource == "mix") {
+ mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr);
+ mlt_properties_set_int(transproperties, "a_track", lowestTrack);
+ }
+ 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(serv);
+ m_isBlocked--;
+}
bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
{
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
-
field->plant_transition(tr, a_track, b_track);
// re-add upper transitions
- for (int i = 0; i < trList.count(); i++) {
- // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+ for (int i = trList.count() - 1; i >= 0; i--) {
+ //kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
}
}
{
if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
else {
+ kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
//kDebug() << " ------ ADDING TRANS PARAM: " << key << ": " << it.value();
}
// attach transition
+ m_isBlocked++;
+ mlt_service_lock(service.get_service());
mltPlantTransition(field, *transition, a_track, b_track);
// field->plant_transition(*transition, a_track, b_track);
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
if (do_refresh) refresh();
return true;
}
projects / kdenlive / blobdiff