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);
}
-static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+//static
+void Render::consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
{
// detect if the producer has finished playing. Is there a better way to do it?
self->emitFrameNumber();
else self->emitConsumerStopped();
}*/
-
-static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+// static
+void Render::consumer_gl_frame_show(mlt_consumer consumer, Render * self, mlt_frame frame_ptr)
{
// detect if the producer has finished playing. Is there a better way to do it?
+ if (self->externalConsumer && !self->analyseAudio && !self->sendFrameForAnalysis) {
+ emit self->rendererPosition((int) mlt_consumer_position(consumer));
+ return;
+ }
Mlt::Frame frame(frame_ptr);
if (frame.get_double("_speed") == 0) self->emitConsumerStopped();
else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
self->pause();
self->emitConsumerStopped(true);
}
- self->showFrame(frame);
+ emit self->mltFrameReceived(new Mlt::Frame(frame_ptr));
}
Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) :
AbstractRender(rendererName, parent),
requestedSeekPosition(SEEK_INACTIVE),
+ showFrameSemaphore(1),
+ externalConsumer(false),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltProfile(NULL),
m_showFrameEvent(NULL),
m_pauseEvent(NULL),
- m_externalConsumer(false),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
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()));
+ connect(this, SIGNAL(mltFrameReceived(Mlt::Frame *)), this, SLOT(showFrame(Mlt::Frame *)), Qt::UniqueConnection);
}
Render::~Render()
mlt_log_set_callback(kdenlive_callback);
}
if (m_mltConsumer->is_valid()) {
- m_externalConsumer = true;
+ externalConsumer = true;
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("deinterlace_method", "onefield");
m_mltConsumer->set("rescale", "nearest");
m_mltConsumer->set("buffer", "1");
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
- if (m_mltConsumer && m_mltConsumer->is_valid()) return;
+ if (m_mltConsumer && m_mltConsumer->is_valid()) {
+ return;
+ }
KMessageBox::information(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()));
}
}
- m_externalConsumer = false;
+ externalConsumer = false;
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
if (m_mltConsumer) {
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("deinterlace_method", "onefield");
- m_externalConsumer = true;
+ externalConsumer = true;
}
}
}
{
m_refreshTimer.stop();
if (m_mltConsumer) {
- if (m_externalConsumer == KdenliveSettings::external_display()) {
+ if (externalConsumer == KdenliveSettings::external_display()) {
if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
QString videoDriver = KdenliveSettings::videodrivername();
QString currentDriver = m_mltConsumer->get("video_driver");
void Render::seek(int time)
{
resetZoneMode();
+ time = qMax(0, time);
+ 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 && !m_externalConsumer) {
- refresh();
+ if (m_paused && !externalConsumer) {
+ m_mltConsumer->set("refresh", 1);
+ m_paused = false;
+ }
+ else if (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;
void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer)
{
+ // Make sure we don't request the info for same clip twice
+ m_infoMutex.lock();
+ if (m_processingClipId.contains(clipId)) {
+ m_infoMutex.unlock();
+ return;
+ }
+ for (int i = 0; i < m_requestList.count(); i++) {
+ if (m_requestList.at(i).clipId == clipId) {
+ // Clip is already queued
+ m_infoMutex.unlock();
+ return;
+ }
+ }
requestClipInfo info;
info.xml = xml;
info.clipId = clipId;
info.imageHeight = imageHeight;
info.replaceProducer = replaceProducer;
- // Make sure we don't request the info for same clip twice
- m_infoMutex.lock();
- m_requestList.removeAll(info);
m_requestList.append(info);
m_infoMutex.unlock();
if (!m_infoThread.isRunning()) {
void Render::forceProcessing(const QString &id)
{
- if (m_processingClipId == id) return;
+ if (m_processingClipId.contains(id)) return;
QMutexLocker lock(&m_infoMutex);
for (int i = 0; i < m_requestList.count(); i++) {
requestClipInfo info = m_requestList.at(i);
int Render::processingItems()
{
QMutexLocker lock(&m_infoMutex);
- int count = m_requestList.count();
- if (!m_processingClipId.isEmpty()) {
- // one clip is currently processed
- count++;
- }
+ int count = m_requestList.count() + m_processingClipId.count();
return count;
}
+void Render::processingDone(const QString &id)
+{
+ QMutexLocker lock(&m_infoMutex);
+ m_processingClipId.removeAll(id);
+}
+
bool Render::isProcessing(const QString &id)
{
- if (m_processingClipId == id) return true;
+ if (m_processingClipId.contains(id)) return true;
QMutexLocker lock(&m_infoMutex);
for (int i = 0; i < m_requestList.count(); i++) {
- requestClipInfo info = m_requestList.at(i);
- if (info.clipId == id) {
+ if (m_requestList.at(i).clipId == id) {
return true;
}
}
while (!m_requestList.isEmpty()) {
m_infoMutex.lock();
info = m_requestList.takeFirst();
- m_processingClipId = info.clipId;
+ m_processingClipId.append(info.clipId);
m_infoMutex.unlock();
QString path;
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<<path;
- m_processingClipId.clear();
+ m_processingClipId.removeAll(info.clipId);
if (proxyProducer) {
// Proxy file is corrupted
emit removeInvalidProxy(info.clipId, false);
producer->set("out", info.xml.attribute("proxy_out").toInt());
if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) {
// Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
- m_processingClipId.clear();
+ m_processingClipId.removeAll(info.clipId);
emit removeInvalidProxy(info.clipId, true);
delete producer;
continue;
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;
+ else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt() + 1;
+ // Pass duration if it was forced
+ if (info.xml.hasAttribute("duration")) {
+ duration = info.xml.attribute("duration").toInt();
+ if (length < duration) {
+ length = duration;
+ if (clipOut > 0) clipOut = length - 1;
+ }
+ }
+ if (duration == 0) duration = length;
+ producer->set("length", length);
}
if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
}
if (frame) delete frame;
}
- m_processingClipId.clear();
emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer);
continue;
}
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";
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
- m_processingClipId.clear();
emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer);
}
- m_processingClipId.clear();
}
return;
}
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;
}
int Render::setSceneList(QDomDocument list, int position)
m_mltProducer = m_blackClip->cut(0, 1);
error = -1;
}
+ m_mltProducer->set("eof", "pause");
checkMaxThreads();
int volume = KdenliveSettings::volume();
m_mltProducer->set("meta.volume", (double)volume / 100);
} else if (!play) {
m_paused = true;
m_mltProducer->set_speed(0.0);
- //m_mltProducer->pause();
}
}
m_mltProducer->seek((int)(startTime.frames(m_fps)));
m_paused = false;
m_mltProducer->set_speed(1.0);
- m_mltConsumer->set("refresh", 1);
if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+ 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();
+ m_mltConsumer->set("refresh", 1);
//m_mltConsumer->purge();
- m_mltConsumer->set("refresh", 1);
}
}
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;
emit rendererPosition(currentPos);
if (requestedSeekPosition != SEEK_INACTIVE) {
+ m_mltConsumer->purge();
m_mltProducer->seek(requestedSeekPosition);
- if (m_paused) {
- refresh();
+ if (m_mltProducer->get_speed() == 0 && m_paused) {
+ m_paused = false;
+ m_mltConsumer->set("refresh", 1);
}
requestedSeekPosition = SEEK_INACTIVE;
}
}
-void Render::showFrame(Mlt::Frame& frame)
+void Render::showFrame(Mlt::Frame* frame)
{
int currentPos = m_mltConsumer->position();
if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
emit rendererPosition(currentPos);
- if (frame.is_valid()) {
+ 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);
+ 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);
+ if (analyseAudio) showAudio(*frame);
+ delete frame;
emit showImageSignal(qimage);
- if (analyseAudio) showAudio(frame);
- if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
+ if (sendFrameForAnalysis) {
emit frameUpdated(qimage.rgbSwapped());
}
- }
+ } else delete frame;
+ showFrameSemaphore.release();
emit checkSeeking();
}
if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
return;
}
+
mlt_audio_format audio_format = mlt_audio_s16;
//FIXME: should not be hardcoded..
int freq = 48000;
}
delete blackclip;
+ if (m_mltConsumer->position() > duration) {
+ m_mltConsumer->purge();
+ m_mltProducer->seek(duration);
+ }
m_mltProducer->set("out", duration);
emit durationChanged(duration);
}
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());
}*/
- m_mltConsumer->set("refresh", 1);
+ if (refresh) m_mltConsumer->set("refresh", 1);
return true;
}
projects / kdenlive / blobdiff