static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
{
-// kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
if (level > MLT_LOG_ERROR) return;
+ //kDebug() << "log level" << level << QString().vsprintf(fmt, vl).simplified();
QString error;
QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
va_end(vl);
time = qMin(m_mltProducer->get_playtime(), time);
if (requestedSeekPosition == SEEK_INACTIVE) {
requestedSeekPosition = time;
+ m_mltConsumer->purge();
m_mltProducer->seek(time);
- //m_mltConsumer->purge();
if (m_paused && !externalConsumer) {
m_mltConsumer->set("refresh", 1);
- //refresh();
+ m_paused = false;
+ }
+ else if (m_winid != 0 && m_mltProducer->get_speed() == 0) {
+ // workaround specific bug in MLT's SDL consumer
+ m_mltConsumer->stop();
+ m_mltConsumer->start();
+ m_mltConsumer->set("refresh", 1);
}
}
else requestedSeekPosition = time;
screen++;
}
}
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
} else {
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
properties = MLT_SERVICE_PROPERTIES(nextservice);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
}
}
}
Mlt::Frame *frame = producer->get_frame();
if (frame && frame->is_valid()) {
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"));
+ int af = frame->get_int("audio_frequency");
+ int ac = frame->get_int("audio_channels");
+ // keep for compatibility with MLT <= 0.8.6
+ if (af == 0) af = frame->get_int("frequency");
+ if (ac == 0) ac = frame->get_int("channels");
+ if (af > 0) filePropertyMap["frequency"] = QString::number(af);
+ if (ac > 0) filePropertyMap["channels"] = QString::number(ac);
if (!filePropertyMap.contains("aspect_ratio")) filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
if (frame->get_int("test_image") == 0) {
if (mltService == "xml" || mltService == "consumer") {
filePropertyMap["type"] = "playlist";
metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
- } else if (frame->get_int("test_audio") == 0)
+ } else if (!mlt_frame_is_test_audio(frame->get_frame()))
filePropertyMap["type"] = "av";
else
filePropertyMap["type"] = "video";
snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex);
if (producer->get(property)) {
filePropertyMap["videocodec"] = producer->get(property);
- } else {
- snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex);
- if (producer->get(property))
- filePropertyMap["videocodec"] = producer->get(property);
+ }
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex);
+ if (producer->get(property)) {
+ filePropertyMap["videocodecid"] = producer->get(property);
}
QString query;
query = QString("meta.media.%1.codec.pix_fmt").arg(vindex);
for (int i = 0; i < count; i ++) {
QString name = metadata.get_name(i);
QString value = QString::fromUtf8(metadata.get(i));
- if (name.endsWith("markup") && !value.isEmpty())
+ if (name.endsWith(".markup") && !value.isEmpty())
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
}
#endif
+void Render::loadUrl(const QString &url)
+{
+ Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, url.toUtf8().constData());
+ setProducer(producer, 0);
+}
+
int Render::setProducer(Mlt::Producer *producer, int position)
{
m_refreshTimer.stop();
m_mltConsumer = NULL;
return;
}
- refreshConsumerDisplay();
-}
-
-void Render::refreshConsumerDisplay()
-{
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
- m_mltConsumer->wait_for("consumer-frame-show");
}
int Render::setSceneList(QDomDocument list, int position)
kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR";
} else {
m_mltConsumer->purge();
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
}
}
}
m_refreshTimer.stop();
QMutexLocker locker(&m_mutex);
if (m_mltProducer == NULL) return;
- if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
- m_mltConsumer->stop();
+ if (m_mltConsumer) {
+ m_mltConsumer->set("refresh", 0);
+ if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
m_mltConsumer->purge();
}
if (m_mltConsumer->is_stopped()) {
m_mltConsumer->start();
}
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
} else if (!play) {
m_paused = true;
- m_mltProducer->set_speed(0.0);
+ if (m_winid == 0) {
+ // OpenGL consumer
+ m_mltProducer->set_speed(0.0);
+ }
+ else {
+ // SDL consumer, hack to allow pausing near the end of the playlist
+ m_mltConsumer->set("refresh", 0);
+ m_mltConsumer->stop();
+ m_mltProducer->set_speed(0.0);
+ m_mltProducer->seek(m_mltConsumer->position());
+ m_mltConsumer->start();
+ }
}
}
m_mltConsumer->start();
}
m_paused = speed == 0;
- if (current_speed == 0 && speed != 0) refreshConsumerDisplay();
+ if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1);
}
void Render::play(const GenTime & startTime)
m_paused = false;
m_mltProducer->seek((int)(startTime.frames(m_fps)));
m_mltProducer->set_speed(1.0);
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
}
void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
m_paused = false;
m_mltProducer->set_speed(1.0);
if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
m_isZoneMode = true;
}
{
if (!m_isZoneMode && !m_isLoopMode) return;
m_mltProducer->set("out", m_mltProducer->get_length());
- //m_mltProducer->set("eof", "pause");
m_isZoneMode = false;
m_isLoopMode = false;
}
void Render::refresh()
{
+ m_refreshTimer.stop();
QMutexLocker locker(&m_mutex);
if (!m_mltProducer)
return;
if (m_mltConsumer) {
if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
//m_mltConsumer->purge();
}
}
emit frameUpdated(qimage.rgbSwapped());
}
+int Render::getCurrentSeekPosition() const
+{
+ if (requestedSeekPosition != SEEK_INACTIVE) return requestedSeekPosition;
+ return (int) m_mltProducer->position();
+}
+
void Render::emitFrameNumber()
{
int currentPos = m_mltConsumer->position();
- if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
+ if (currentPos == requestedSeekPosition) {
+ requestedSeekPosition = SEEK_INACTIVE;
+ m_paused = true;
+ }
emit rendererPosition(currentPos);
if (requestedSeekPosition != SEEK_INACTIVE) {
+ m_mltConsumer->purge();
m_mltProducer->seek(requestedSeekPosition);
+ if (m_mltProducer->get_speed() == 0 && !m_paused) {
+ m_mltConsumer->set("refresh", 1);
+ }
requestedSeekPosition = SEEK_INACTIVE;
}
}
}
delete blackclip;
+ if (m_mltConsumer->position() > duration) {
+ m_mltConsumer->purge();
+ m_mltProducer->seek(duration);
+ }
m_mltProducer->set("out", duration);
emit durationChanged(duration);
}
kWarning() << "// TRACTOR PROBLEM";
return false;
}
- //service.lock();
+ service.lock();
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.is_blank(clipIndex)) {
kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps);
- //service.unlock();
+ service.unlock();
return false;
}
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
if (trackPlaylist.is_blank(i)) blk = "(blank)";
kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
- //service.unlock();
+ service.unlock();
if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(&tractor);
return true;
}
}
service.unlock();
mltCheckLength(&tractor);
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
}
refresh();
}
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
+bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh)
{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
transpinfo.track = info.track;
mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}*/
- refreshConsumerDisplay();
+ if (refresh) m_mltConsumer->set("refresh", 1);
return true;
}
int frameOffset = newCropFrame - previousStart;
trackPlaylist.resize_clip(clipIndex, newCropFrame, previousOut + frameOffset);
service.unlock();
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
return true;
}
}*/
//m_mltConsumer->set("refresh", 1);
service.unlock();
- refreshConsumerDisplay();
+ m_mltConsumer->set("refresh", 1);
return true;
}
}
}
+//static
+bool Render::checkX11Grab()
+{
+ if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::ffmpegpath().isEmpty()) return false;
+ QProcess p;
+ QStringList args;
+ args << "avformat:f-list";
+ p.start(KdenliveSettings::rendererpath(), args);
+ if (!p.waitForStarted()) return false;
+ if (!p.waitForFinished()) return false;
+ QByteArray result = p.readAllStandardError();
+ return result.contains("x11grab");
+}
+
#include "renderer.moc"
projects / kdenlive / blobdiff