{
// detect if the producer has finished playing. Is there a better way to do it?
Mlt::Frame frame(frame_ptr);
- self->showFrame(frame);
- if (frame.get_double("_speed") == 0.0) {
- self->emitConsumerStopped();
- } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
- self->pause();
- self->emitConsumerStopped();
+ if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+ self->pause();
+ self->emitConsumerStopped();
}
+ self->showFrame(frame);
}
Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) :
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0.0);
m_refreshTimer.setSingleShot(true);
- m_refreshTimer.setInterval(70);
+ m_refreshTimer.setInterval(100);
connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
connect(this, SIGNAL(multiStreamFound(const QString &,QList<int>,QList<int>,stringMap)), this, SLOT(slotMultiStreamProducerFound(const QString &,QList<int>,QList<int>,stringMap)));
+ connect(this, SIGNAL(checkSeeking()), this, SLOT(slotCheckSeeking()));
}
Render::~Render()
if (requestedSeekPosition == SEEK_INACTIVE) {
requestedSeekPosition = time;
m_mltProducer->seek(time);
- m_mltConsumer->purge();
+ //m_mltConsumer->purge();
if (m_mltProducer->get_speed() == 0) {
refresh();
}
transition->set("mlt_service", "composite");
transition->set("a_track", 0);
transition->set("b_track", i);
- transition->set("distort", 1);
+ transition->set("distort", 0);
+ transition->set("aligned", 0);
transition->set("internal_added", "200");
QString geometry;
switch (screen) {
KUrl url(path);
Mlt::Producer *producer = NULL;
CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt();
-
if (type == COLOR) {
producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + info.xml.attribute("colour")).toUtf8().constData());
} else if (type == TEXT) {
if (producer && producer->is_valid() && info.xml.hasAttribute("xmldata"))
producer->set("xmldata", info.xml.attribute("xmldata").toUtf8().constData());
} else if (url.isEmpty()) {
+ //WARNING: when is this case used? Not sure it is working.. JBM/
QDomDocument doc;
QDomElement mlt = doc.createElement("mlt");
QDomElement play = doc.createElement("playlist");
+ play.setAttribute("id", "playlist0");
doc.appendChild(mlt);
mlt.appendChild(play);
play.appendChild(doc.importNode(info.xml, true));
+ QDomElement tractor = doc.createElement("tractor");
+ tractor.setAttribute("id", "tractor0");
+ QDomElement track = doc.createElement("track");
+ track.setAttribute("producer", "playlist0");
+ tractor.appendChild(track);
+ mlt.appendChild(tractor);
producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData());
} else {
- producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
+ producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData());
}
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
if (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
int length;
if (info.xml.hasAttribute("length")) {
- if (clipOut > 0) duration = clipOut + 1;
length = info.xml.attribute("length").toInt();
clipOut = length - 1;
}
else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt();
producer->set("length", length);
+ duration = length;
}
if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
char property[200];
if (frameNumber > 0) producer->seek(frameNumber);
-
duration = duration > 0 ? duration : producer->get_playtime();
filePropertyMap["duration"] = QString::number(duration);
//kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
int vindex = -1;
const QString mltService = producer->get("mlt_service");
-
if (mltService == "xml" || mltService == "consumer") {
- // MLT playlist
- mlt_profile prof = producer->get_profile();
- filePropertyMap["progressive"] = QString::number(prof->progressive);
- filePropertyMap["colorspace"] = QString::number(prof->colorspace);
- filePropertyMap["fps"] = QString::number(mlt_profile_fps(prof));
+ // MLT playlist, create producer with blank profile to get real profile info
+ // TODO: is there an easier way to get this info (original source clip profile) from MLT?
+ Mlt::Profile *original_profile = new Mlt::Profile();
+ Mlt::Producer *tmpProd = new Mlt::Producer(*original_profile, path.toUtf8().constData());
+ filePropertyMap["progressive"] = QString::number(original_profile->progressive());
+ filePropertyMap["colorspace"] = QString::number(original_profile->colorspace());
+ filePropertyMap["fps"] = QString::number(original_profile->fps());
+ filePropertyMap["aspect_ratio"] = QString::number(original_profile->sar());
+ delete tmpProd;
+ delete original_profile;
}
else if (mltService == "avformat") {
// Get frame rate
filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
filePropertyMap["frequency"] = QString::number(frame->get_int("frequency"));
filePropertyMap["channels"] = QString::number(frame->get_int("channels"));
- filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
+ if (!filePropertyMap.contains("aspect_ratio")) filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
if (frame->get_int("test_image") == 0) {
- if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
+ if (mltService == "xml" || mltService == "consumer") {
filePropertyMap["type"] = "playlist";
metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
} else if (frame->get_int("test_audio") == 0)
if (producer) delete producer;
return -1;
}
+ bool monitorIsActive = false;
m_mltConsumer->set("refresh", 0);
if (!m_mltConsumer->is_stopped()) {
+ monitorIsActive = true;
m_mltConsumer->stop();
}
m_mltConsumer->purge();
if (!producer || !producer->is_valid()) {
if (producer) delete producer;
producer = m_blackClip->cut(0, 1);
+ producer->set("id", "black");
}
if (!producer || !producer->is_valid()) {
emit stopped();
if (position == -1 && producer->get("id") == currentId) position = consumerPosition;
if (position != -1) producer->seek(position);
+ m_fps = producer->get_fps();
int volume = KdenliveSettings::volume();
+ if (producer->get_int("_audioclip") == 1) {
+ // This is an audio only clip, create fake multitrack to apply audiowave filter
+ Mlt::Tractor *tractor = new Mlt::Tractor();
+ Mlt::Producer *color= new Mlt::Producer(*m_mltProfile, "color:red");
+ color->set_in_and_out(0, producer->get_out());
+ tractor->set_track(*producer, 0);
+ tractor->set_track(*color, 1);
+
+ Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:audio_hack");
+ if (!xmlConsumer.is_valid()) return -1;
+ xmlConsumer.set("terminate_on_pause", 1);
+ xmlConsumer.connect(tractor->parent());
+ xmlConsumer.run();
+ delete tractor;
+ delete color;
+ delete producer;
+ QString playlist = QString::fromUtf8(xmlConsumer.get("audio_hack"));
+
+ Mlt::Producer *result = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
+ Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "audiowave");
+ result->attach(*filter);
+ tractor = new Mlt::Tractor();
+ tractor->set_track(*result, 0);
+ delete result;
+ delete filter;
+ producer = &(tractor->parent());
+ m_mltConsumer->connect(*producer);
+ }
+
producer->set("meta.volume", (double)volume / 100);
- m_fps = producer->get_fps();
blockSignals(false);
m_mltConsumer->connect(*producer);
}
m_mltProducer = producer;
m_mltProducer->set_speed(0);
+ if (monitorIsActive) startConsumer();
emit durationChanged(m_mltProducer->get_playtime());
- if (m_mltConsumer->start() == -1) {
+ position = m_mltProducer->position();
+ emit rendererPosition(position);
+ return 0;
+}
+
+void Render::startConsumer() {
+ if (m_mltConsumer->is_stopped() && m_mltConsumer->start() == -1) {
// ARGH CONSUMER BROKEN!!!!
KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
if (m_showFrameEvent) delete m_showFrameEvent;
m_pauseEvent = NULL;
delete m_mltConsumer;
m_mltConsumer = NULL;
- return -1;
+ return;
}
-
- position = m_mltProducer->position();
m_mltConsumer->set("refresh", 1);
// Make sure the first frame is displayed, otherwise if we change producer too fast
// We can crash the avformat producer
Mlt::Event *ev = m_mltConsumer->setup_wait_for("consumer-frame-show");
m_mltConsumer->wait_for(ev);
delete ev;
- emit rendererPosition(position);
- return 0;
}
int Render::setSceneList(QDomDocument list, int position)
blockSignals(true);
m_locale = QLocale();
-
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();
void Render::play(double speed)
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer)
- return;
+ if (!m_mltProducer) return;
+ double current_speed = m_mltProducer->get_speed();
+ if (current_speed == speed) return;
// if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
m_mltProducer->set_speed(speed);
- /*if (speed == 0.0) {
- m_mltProducer->seek((int) m_framePosition + 1);
- m_mltConsumer->purge();
- }*/
- refresh();
+ if (m_mltConsumer->is_stopped()) {
+ m_mltConsumer->start();
+ }
+ if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1);
}
void Render::play(const GenTime & startTime)
else seek(requestedSeekPosition + diff);
}
+void Render::refreshIfActive()
+{
+ if (!m_mltConsumer->is_stopped() && m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start();
+}
+
void Render::doRefresh()
{
if (m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start();
return;
if (m_mltConsumer) {
if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
- m_mltConsumer->purge();
+ //m_mltConsumer->purge();
m_mltConsumer->set("refresh", 1);
}
}
const uchar* image = frame.get_image(format, width, height);
QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
memcpy(qimage.scanLine(0), image, width * height * 4);
-
- /*mlt_image_format format = mlt_image_rgb24;
- int width = 0;
- int height = 0;
- const uchar* image = frame.get_image(format, width, height);
- QImage qimage(width, height, QImage::Format_RGB888);
- memcpy(qimage.bits(), image, width * height * 3);*/
emit frameUpdated(qimage.rgbSwapped());
}
emit rendererPosition(currentPos);
if (requestedSeekPosition != SEEK_INACTIVE) {
m_mltProducer->seek(requestedSeekPosition);
- requestedSeekPosition = SEEK_INACTIVE;
if (m_mltProducer->get_speed() == 0) {
refresh();
}
+ requestedSeekPosition = SEEK_INACTIVE;
}
}
void Render::showFrame(Mlt::Frame& frame)
{
- emit rendererPosition((int) m_mltConsumer->position());
- 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_Premultiplied);
- memcpy(qimage.scanLine(0), image, width * height * 4);
- emit showImageSignal(qimage);
- if (analyseAudio) showAudio(frame);
- if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
- emit frameUpdated(qimage.rgbSwapped());
+ int currentPos = m_mltConsumer->position();
+ if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
+ emit rendererPosition(currentPos);
+ if (frame.is_valid()) {
+ 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_Premultiplied);
+ memcpy(qimage.scanLine(0), image, width * height * 4);
+ emit showImageSignal(qimage);
+ if (analyseAudio) showAudio(frame);
+ if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
+ emit frameUpdated(qimage.rgbSwapped());
+ }
+ }
+ emit checkSeeking();
+}
+
+void Render::slotCheckSeeking()
+{
+ if (requestedSeekPosition != SEEK_INACTIVE) {
+ m_mltProducer->seek(requestedSeekPosition);
+ if (m_mltProducer->get_speed() == 0) {
+ refresh();
+ }
}
}
int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push)
{
+ m_refreshTimer.stop();
if (m_mltProducer == NULL) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return -1;
Mlt::Tractor *Render::lockService()
{
// we are going to replace some clips, purge consumer
- QMutexLocker locker(&m_mutex);
if (!m_mltProducer) return NULL;
+ QMutexLocker locker(&m_mutex);
if (m_mltConsumer) {
- if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
m_mltConsumer->purge();
}
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) {
- kWarning() << "// TRACTOR PROBLEM";
return NULL;
}
service.lock();
bool Render::mltRemoveClip(int track, GenTime position)
{
+ m_refreshTimer.stop();
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) {
kWarning() << "// TRACTOR PROBLEM";
projects / kdenlive / blobdiff