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 && !externalConsumer) {
- refresh();
+ 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;
}
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);
}
}
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_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);
}
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;
}