X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=0618aaf5a3211bf8bb6e294a4f30f877774a7303;hb=b71bbe0b32508be57fd6d2314daf3ab5f36b47e1;hp=76730ffcafcc388a5a840695f57719827dfa2386;hpb=bd63606c2e7aa216d502d3a1ce0414ba0072bdbc;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 76730ffc..0618aaf5 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -19,7 +19,7 @@ #include "projectlist.h" #include "projectitem.h" -#include "addfoldercommand.h" +#include "commands/addfoldercommand.h" #include "kdenlivesettings.h" #include "slideshowclip.h" #include "ui_colorclip_ui.h" @@ -33,10 +33,10 @@ #include "projectlistview.h" #include "timecodedisplay.h" #include "profilesdialog.h" -#include "editclipcommand.h" -#include "editclipcutcommand.h" -#include "editfoldercommand.h" -#include "addclipcutcommand.h" +#include "commands/editclipcommand.h" +#include "commands/editclipcutcommand.h" +#include "commands/editfoldercommand.h" +#include "commands/addclipcutcommand.h" #include "ui_templateclip_ui.h" @@ -112,6 +112,7 @@ ProjectList::ProjectList(QWidget *parent) : m_commandStack(NULL), m_openAction(NULL), m_reloadAction(NULL), + m_stabilizeAction(NULL), m_transcodeAction(NULL), m_doc(NULL), m_refreshed(false), @@ -229,25 +230,42 @@ void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) m_menu->addActions(addMenu->actions()); } -void ProjectList::setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu) +void ProjectList::setupGeneratorMenu(const QHash& menus) { - if (!addMenu) + if (!menus.contains("addMenu") && ! menus.value("addMenu") ) return; QMenu *menu = m_addButton->menu(); - menu->addMenu(addMenu); - m_addButton->setMenu(menu); - - m_menu->addMenu(addMenu); - if (addMenu->isEmpty()) - addMenu->setEnabled(false); - m_menu->addMenu(transcodeMenu); - if (transcodeMenu->isEmpty()) - transcodeMenu->setEnabled(false); - m_transcodeAction = transcodeMenu; + if (menus.contains("addMenu") && menus.value("addMenu")){ + QMenu* addMenu=menus.value("addMenu"); + menu->addMenu(addMenu); + m_addButton->setMenu(menu); + + m_menu->addMenu(addMenu); + if (addMenu->isEmpty()) + addMenu->setEnabled(false); + } + if (menus.contains("transcodeMenu") && menus.value("transcodeMenu") ){ + QMenu* transcodeMenu=menus.value("transcodeMenu"); + m_menu->addMenu(transcodeMenu); + if (transcodeMenu->isEmpty()) + transcodeMenu->setEnabled(false); + m_transcodeAction = transcodeMenu; + } + if (menus.contains("stabilizeMenu") && menus.value("stabilizeMenu") ){ + QMenu* stabilizeMenu=menus.value("stabilizeMenu"); + m_menu->addMenu(stabilizeMenu); + if (stabilizeMenu->isEmpty()) + stabilizeMenu->setEnabled(false); + m_stabilizeAction=stabilizeMenu; + + } m_menu->addAction(m_reloadAction); m_menu->addAction(m_proxyAction); - m_menu->addMenu(inTimelineMenu); - inTimelineMenu->setEnabled(false); + if (menus.contains("inTimelineMenu") && menus.value("inTimelineMenu")){ + QMenu* inTimelineMenu=menus.value("inTimelineMenu"); + m_menu->addMenu(inTimelineMenu); + inTimelineMenu->setEnabled(false); + } m_menu->addAction(m_editButton->defaultAction()); m_menu->addAction(m_openAction); m_menu->addAction(m_deleteButton->defaultAction()); @@ -636,6 +654,7 @@ void ProjectList::slotClipSelected() m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); } else { if (item->type() == PROJECTSUBCLIPTYPE) { // this is a sub item, use base clip @@ -645,6 +664,7 @@ void ProjectList::slotClipSelected() SubProjectItem *sub = static_cast (item); emit clipSelected(clip->referencedClip(), sub->zone()); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); m_reloadAction->setEnabled(false); adjustProxyActions(clip); return; @@ -656,6 +676,7 @@ void ProjectList::slotClipSelected() m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_stabilizeAction->setEnabled(true); if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -667,6 +688,7 @@ void ProjectList::slotClipSelected() } // Display relevant transcoding actions only adjustTranscodeActions(clip); + adjustStabilizeActions(clip); // Display uses in timeline emit findInTimeline(clip->clipId()); } @@ -677,6 +699,7 @@ void ProjectList::slotClipSelected() m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); } adjustProxyActions(clip); } @@ -693,6 +716,17 @@ void ProjectList::adjustProxyActions(ProjectItem *clip) const m_proxyAction->blockSignals(false); } +void ProjectList::adjustStabilizeActions(ProjectItem *clip) const +{ + + if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { + m_stabilizeAction->setEnabled(false); + return; + } + m_stabilizeAction->setEnabled(true); + +} + void ProjectList::adjustTranscodeActions(ProjectItem *clip) const { if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST || clip->clipType() == SLIDESHOW) { @@ -736,6 +770,7 @@ void ProjectList::slotUpdateClipProperties(const QString &id, QMap referencedClip(), item->referencedClip()->zone(), true); } else if (properties.contains("full_luma") || properties.contains("force_colorspace") || properties.contains("loop")) { emit refreshClip(id, false); } @@ -840,21 +875,25 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) m_deleteButton->defaultAction()->setEnabled(enable); m_reloadAction->setEnabled(enable); m_transcodeAction->setEnabled(enable); + m_stabilizeAction->setEnabled(enable); if (enable) { ProjectItem *clip = NULL; if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) { clip = static_cast (item->parent()); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); adjustProxyActions(clip); } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) { clip = static_cast (item); // Display relevant transcoding actions only adjustTranscodeActions(clip); + adjustStabilizeActions(clip); adjustProxyActions(clip); // Display uses in timeline emit findInTimeline(clip->clipId()); } else { m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); } if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); @@ -932,6 +971,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_stabilizeAction->setEnabled(true); return; } else if (item && item->type() == PROJECTFOLDERTYPE && item->childCount() > 0) { @@ -942,6 +982,7 @@ void ProjectList::updateButtons() const m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); m_transcodeAction->setEnabled(false); + m_stabilizeAction->setEnabled(false); m_proxyAction->setEnabled(false); } @@ -1091,7 +1132,6 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) else if (item->hasProxy() && !item->isProxyRunning()) { slotCreateProxy(clip->getId()); } - clip->askForAudioThumbs(); KUrl url = clip->fileURL(); #ifdef NEPOMUK @@ -1103,6 +1143,13 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) item->setText(2, QString::number(f.rating())); } #endif + + // Add info to date column + QFileInfo fileInfo(url.path()); + if (fileInfo.exists()) { + item->setText(3, fileInfo.lastModified().toString(QString("yyyy/MM/dd hh:mm:ss"))); + } + // Add cut zones QList cuts = clip->cutZones(); if (!cuts.isEmpty()) { @@ -1141,7 +1188,7 @@ void ProjectList::slotGotProxy(const QString &proxyPath) void ProjectList::slotGotProxy(ProjectItem *item) { - if (item == NULL || !m_refreshed) return; + if (item == NULL) return; DocClipBase *clip = item->referencedClip(); if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { // Clip is being reprocessed, abort @@ -1227,7 +1274,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item) else requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos)); } -void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips) { if (!m_allClipsProcessed) m_listView->setEnabled(false); m_listView->setSortingEnabled(false); @@ -1270,6 +1317,13 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) item = static_cast (*it); clip = item->referencedClip(); if (item->referencedClip()->getProducer() == NULL) { + bool replace = false; + if (brokenClips.contains(item->clipId())) { + // if this is a proxy clip, disable proxy + item->setProxyStatus(NOPROXY); + clip->setProperty("proxy", "-"); + replace = true; + } if (clip->isPlaceHolder() == false && !item->isProxyRunning()) { QDomElement xml = clip->toXML(); if (fpsChanged) { @@ -1277,7 +1331,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged) xml.removeAttribute("file_hash"); xml.removeAttribute("proxy_out"); } - bool replace = xml.attribute("replace") == "1"; + if (!replace) replace = xml.attribute("replace") == "1"; if (replace) resetThumbsProducer(clip); m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), replace); } @@ -1469,6 +1523,7 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) { ProjectItem *item = getItemById(id); if (item) { + kDebug()<<"// Proxy for clip "<setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled); if (durationError) { kDebug() << "Proxy duration is wrong, try changing transcoding parameters."; @@ -1482,6 +1537,14 @@ void ProjectList::slotRemoveInvalidProxy(const QString &id, bool durationError) if (proxyFolder.isParentOf(KUrl(path))) { QFile::remove(path); } + if (item->referencedClip()->getProducer() == NULL) { + // Clip has no valid producer, request it + slotProxyCurrentItem(false, item); + } + else { + // refresh thumbs producer + item->referencedClip()->reloadThumbProducer(); + } } m_processingClips.removeAll(id); m_thumbnailQueue.removeAll(id); @@ -1500,7 +1563,6 @@ void ProjectList::slotAddColorClip() TimecodeDisplay *t = new TimecodeDisplay(m_timecode); t->setValue(KdenliveSettings::color_duration()); - t->setTimeCodeFormat(false); dia_ui.clip_durationBox->addWidget(t); dia_ui.clip_color->setColor(KdenliveSettings::colorclipcolor()); @@ -1633,7 +1695,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) connect(m_doc->clipManager(), SIGNAL(modifiedClip(const QString &)), this, SLOT(slotModifiedClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &))); connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &))); - connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool)), this, SLOT(updateAllClips(bool, bool))); + connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList))); } QList ProjectList::documentClipList() const @@ -1740,28 +1802,30 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update) return; } QPixmap pix; + QImage img; int height = m_listView->iconSize().height(); int swidth = (int)(height * m_render->frameRenderWidth() / m_render->renderHeight()+ 0.5); int dwidth = (int)(height * m_render->dar() + 0.5); if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height)); else if (clip->clipType() == IMAGE) - pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height)); + img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height); else { - pix = item->referencedClip()->extractImage(frame, dwidth, height); + img = item->referencedClip()->extractImage(frame, dwidth, height); } - if (!pix.isNull()) { + if (!pix.isNull() || !img.isNull()) { monitorItemEditing(false); + if (!img.isNull()) pix = QPixmap::fromImage(img); it->setData(0, Qt::DecorationRole, pix); monitorItemEditing(true); - QString clipId = item->getClipHash(); - if (!clipId.isEmpty()) { + QString hash = item->getClipHash(); + if (!hash.isEmpty() && !img.isNull()) { if (!isSubItem) - m_doc->cachePixmap(clipId, pix); + m_doc->cacheImage(hash, img); else - m_doc->cachePixmap(clipId + '#' + QString::number(frame), pix); + m_doc->cacheImage(hash + '#' + QString::number(frame), img); } } if (update) @@ -1789,7 +1853,6 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce } item->setProperties(properties, metadata); clip->setProducer(producer, replace); - clip->askForAudioThumbs(); // Proxy stuff QString size = properties.value("frame_size"); @@ -1827,7 +1890,8 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce if (queue == 0) { monitorItemEditing(true); if (item && m_thumbnailQueue.isEmpty()) { - m_listView->setCurrentItem(item); + if (!item->hasProxy() || m_render->activeClipId() == item->clipId()) + m_listView->setCurrentItem(item); bool updatedProfile = false; if (item->parent()) { if (item->parent()->type() == PROJECTFOLDERTYPE) @@ -1936,26 +2000,26 @@ bool ProjectList::generateImageProxy() const void ProjectList::slotReplyGetImage(const QString &clipId, const QImage &img) { - QPixmap pix = QPixmap::fromImage(img); - setThumbnail(clipId, pix); + ProjectItem *item = getItemById(clipId); + if (item && !img.isNull()) { + QPixmap pix = QPixmap::fromImage(img); + monitorItemEditing(false); + item->setData(0, Qt::DecorationRole, pix); + monitorItemEditing(true); + QString hash = item->getClipHash(); + if (!hash.isEmpty()) m_doc->cacheImage(hash, img); + } } void ProjectList::slotReplyGetImage(const QString &clipId, const QString &name, int width, int height) { - QPixmap pix = KIcon(name).pixmap(QSize(width, height)); - setThumbnail(clipId, pix); -} - -void ProjectList::setThumbnail(const QString &clipId, const QPixmap &pix) -{ + // For clips that have a generic icon (like audio clips...) ProjectItem *item = getItemById(clipId); + QPixmap pix = KIcon(name).pixmap(QSize(width, height)); if (item && !pix.isNull()) { monitorItemEditing(false); item->setData(0, Qt::DecorationRole, pix); monitorItemEditing(true); - //update(); - QString clipId = item->getClipHash(); - if (!clipId.isEmpty()) m_doc->cachePixmap(clipId, pix); } } @@ -2037,6 +2101,7 @@ void ProjectList::slotSelectClip(const QString &ix) m_deleteButton->defaultAction()->setEnabled(true); m_reloadAction->setEnabled(true); m_transcodeAction->setEnabled(true); + m_stabilizeAction->setEnabled(true); if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) { m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp())); m_openAction->setEnabled(true); @@ -2152,10 +2217,10 @@ void ProjectList::addClipCut(const QString &id, int in, int out, const QString d m_listView->scrollToItem(sub); m_listView->editItem(sub, 1); } - QPixmap p = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); - sub->setData(0, Qt::DecorationRole, p); - QString clipId = clip->getClipHash(); - if (!clipId.isEmpty()) m_doc->cachePixmap(clipId + '#' + QString::number(in), p); + QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2); + sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img)); + QString hash = clip->getClipHash(); + if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img); monitorItemEditing(true); } emit projectModified(); @@ -2284,18 +2349,18 @@ void ProjectList::slotCreateProxy(const QString id) if (!item || item->isProxyRunning() || item->referencedClip()->isPlaceHolder()) return; QString path = item->referencedClip()->getProperty("proxy"); if (path.isEmpty()) { - setProxyStatus(path, PROXYCRASHED); + setProxyStatus(item, PROXYCRASHED); return; } - setProxyStatus(path, PROXYWAITING); + setProxyStatus(item, PROXYWAITING); if (m_abortProxy.contains(path)) m_abortProxy.removeAll(path); if (m_processingProxy.contains(path)) { // Proxy is already being generated return; } - if (QFile::exists(path)) { + if (QFileInfo(path).size() > 0) { // Proxy already created - setProxyStatus(path, PROXYDONE); + setProxyStatus(item, PROXYDONE); slotGotProxy(path); return; } @@ -2307,95 +2372,219 @@ void ProjectList::slotCreateProxy(const QString id) info.type = item->clipType(); info.exif = QString(item->referencedClip()->producerProperty("_exif_orientation")).toInt(); m_proxyList.append(info); - m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy)); + if (!m_proxyThreads.futures().isEmpty()) { + // Remove inactive threads + QList > futures = m_proxyThreads.futures(); + m_proxyThreads.clearFutures(); + for (int i = 0; i < futures.count(); i++) + if (!futures.at(i).isFinished()) { + m_proxyThreads.addFuture(futures.at(i)); + } + } + if (m_proxyThreads.futures().isEmpty() || m_proxyThreads.futures().count() < KdenliveSettings::proxythreads()) m_proxyThreads.addFuture(QtConcurrent::run(this, &ProjectList::slotGenerateProxy)); } void ProjectList::slotAbortProxy(const QString id, const QString path) { QTreeWidgetItemIterator it(m_listView); ProjectItem *item = getItemById(id); - setProxyStatus(item, NOPROXY); - slotGotProxy(item); if (!path.isEmpty() && m_processingProxy.contains(path)) { m_abortProxy << path; - setProxyStatus(path, NOPROXY); + setProxyStatus(item, NOPROXY); + } + else { + setProxyStatus(item, NOPROXY); + slotGotProxy(item); } } void ProjectList::slotGenerateProxy() { - if (m_proxyList.isEmpty() || m_abortAllProxies) return; - emit projectModified(); - PROXYINFO info = m_proxyList.takeFirst(); - if (m_abortProxy.contains(info.dest)) { - m_abortProxy.removeAll(info.dest); - return; - } - - // Make sure proxy path is writable - QFile file(info.dest); - if (!file.open(QIODevice::WriteOnly)) { - setProxyStatus(info.dest, PROXYCRASHED); - m_processingProxy.removeAll(info.dest); - return; - } - file.close(); - QFile::remove(info.dest); - - setProxyStatus(info.dest, CREATINGPROXY); - - // Get the list of clips that will need to get progress info - QTreeWidgetItemIterator it(m_listView); - QList processingItems; - while (*it && !m_abortAllProxies) { - if ((*it)->type() == PROJECTCLIPTYPE) { - ProjectItem *item = static_cast (*it); - if (item->referencedClip()->getProperty("proxy") == info.dest) { - processingItems.append(item); + while (!m_proxyList.isEmpty() && !m_abortAllProxies) { + emit projectModified(); + PROXYINFO info = m_proxyList.takeFirst(); + if (m_abortProxy.contains(info.dest)) { + m_abortProxy.removeAll(info.dest); + continue; + } + // Get the list of clips that will need to get progress info + QTreeWidgetItemIterator it(m_listView); + QList processingItems; + while (*it && !m_abortAllProxies) { + if ((*it)->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (*it); + if (item->referencedClip()->getProperty("proxy") == info.dest) { + processingItems.append(item); + } } + ++it; } - ++it; - } - // Special case: playlist clips (.mlt or .kdenlive project files) - if (info.type == PLAYLIST) { - // change FFmpeg params to MLT format - QStringList parameters; - parameters << info.src; - parameters << "-consumer" << "avformat:" + info.dest; - QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts); + // Make sure proxy path is writable + QFile file(info.dest); + if (!file.open(QIODevice::WriteOnly)) { + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), PROXYCRASHED); + m_processingProxy.removeAll(info.dest); + continue; + } + file.close(); + QFile::remove(info.dest); + + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), CREATINGPROXY); + + // Special case: playlist clips (.mlt or .kdenlive project files) + if (info.type == PLAYLIST) { + // change FFmpeg params to MLT format + QStringList parameters; + parameters << info.src; + parameters << "-consumer" << "avformat:" + info.dest; + QStringList params = m_doc->getDocumentProperty("proxyparams").simplified().split('-', QString::SkipEmptyParts); - foreach(QString s, params) { - s = s.simplified(); - if (s.count(' ') == 0) { - s.append("=1"); + foreach(QString s, params) { + s = s.simplified(); + if (s.count(' ') == 0) { + s.append("=1"); + } + else s.replace(' ', '='); + parameters << s; } - else s.replace(' ', '='); - parameters << s; - } - parameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads())); - - //TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy - double display_ratio = KdenliveDoc::getDisplayRatio(info.src); - parameters << "aspect=" + QString::number(display_ratio); + parameters.append(QString("real_time=-%1").arg(KdenliveSettings::mltthreads())); + + //TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy + double display_ratio = KdenliveDoc::getDisplayRatio(info.src); + parameters << "aspect=" + QString::number(display_ratio); + + //kDebug()<<"TRANSCOD: "< i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); + else proxy = i.scaledToHeight(m_render->renderHeight()); + if (info.exif > 1) { + // Rotate image according to exif data + QImage processed; + QMatrix matrix; + + switch ( info.exif ) { + case 2: + matrix.scale( -1, 1 ); + break; + case 3: + matrix.rotate( 180 ); + break; + case 4: + matrix.scale( 1, -1 ); + break; + case 5: + matrix.rotate( 270 ); + matrix.scale( -1, 1 ); + break; + case 6: + matrix.rotate( 90 ); + break; + case 7: + matrix.rotate( 90 ); + matrix.scale( -1, 1 ); + break; + case 8: + matrix.rotate( 270 ); + break; + } + processed = proxy.transformed( matrix ); + processed.save(info.dest); + } + else proxy.save(info.dest); + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), PROXYDONE); + slotGotProxy(info.dest); + m_abortProxy.removeAll(info.dest); + m_processingProxy.removeAll(info.dest); + continue; + } - //kDebug()<<"TRANSCOD: "<getDocumentProperty("proxyparams").simplified(); + foreach(QString s, params.split(' ')) + parameters << s; + + // Make sure we don't block when proxy file already exists + parameters << "-y"; + parameters << info.dest; QProcess myProcess; myProcess.setProcessChannelMode(QProcess::MergedChannels); - myProcess.start(KdenliveSettings::rendererpath(), parameters); + myProcess.start("ffmpeg", parameters); myProcess.waitForStarted(); int result = -1; int duration = 0; + while (myProcess.state() != QProcess::NotRunning) { // building proxy file if (m_abortProxy.contains(info.dest) || m_abortAllProxies) { myProcess.close(); myProcess.waitForFinished(); - QFile::remove(info.dest); m_abortProxy.removeAll(info.dest); m_processingProxy.removeAll(info.dest); - setProxyStatus(info.dest, NOPROXY); + QFile::remove(info.dest); + if (!m_abortAllProxies) { + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), NOPROXY); + } + else continue; result = -2; } else { @@ -2405,122 +2594,29 @@ void ProjectList::slotGenerateProxy() myProcess.waitForFinished(500); } myProcess.waitForFinished(); + m_abortProxy.removeAll(info.dest); m_processingProxy.removeAll(info.dest); - if (result == -1) result = myProcess.exitStatus(); - if (result == 0) { + if (result == -1) { + result = myProcess.exitStatus(); + } + + // FFmpeg process terminated normally, but make sure proxy clip exists + if (result != -2 && QFileInfo(info.dest).size() == 0) { + result = QProcess::CrashExit; + } + + if (result == QProcess::NormalExit) { // proxy successfully created - setProxyStatus(info.dest, PROXYDONE); + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), PROXYDONE); slotGotProxy(info.dest); } - else if (result == 1) { + else if (result == QProcess::CrashExit) { // Proxy process crashed QFile::remove(info.dest); - setProxyStatus(info.dest, PROXYCRASHED); - } - return; - } - - if (info.type == IMAGE) { - // Image proxy - QImage i(info.src); - if (i.isNull()) { - // Cannot load image - setProxyStatus(info.dest, PROXYCRASHED); - return; + for (int i = 0; i < processingItems.count(); i++) + setProxyStatus(processingItems.at(i), PROXYCRASHED); } - QImage proxy; - // Images are scaled to profile size. - //TODO: Make it be configurable? - if (i.width() > i.height()) proxy = i.scaledToWidth(m_render->frameRenderWidth()); - else proxy = i.scaledToHeight(m_render->renderHeight()); - if (info.exif > 1) { - // Rotate image according to exif data - QImage processed; - QMatrix matrix; - - switch ( info.exif ) { - case 2: - matrix.scale( -1, 1 ); - break; - case 3: - matrix.rotate( 180 ); - break; - case 4: - matrix.scale( 1, -1 ); - break; - case 5: - matrix.rotate( 270 ); - matrix.scale( -1, 1 ); - break; - case 6: - matrix.rotate( 90 ); - break; - case 7: - matrix.rotate( 90 ); - matrix.scale( -1, 1 ); - break; - case 8: - matrix.rotate( 270 ); - break; - } - processed = proxy.transformed( matrix ); - processed.save(info.dest); - } - else proxy.save(info.dest); - setProxyStatus(info.dest, PROXYDONE); - slotGotProxy(info.dest); - m_abortProxy.removeAll(info.dest); - m_processingProxy.removeAll(info.dest); - return; - } - - QStringList parameters; - parameters << "-i" << info.src; - QString params = m_doc->getDocumentProperty("proxyparams").simplified(); - foreach(QString s, params.split(' ')) - parameters << s; - - // Make sure we don't block when proxy file already exists - parameters << "-y"; - parameters << info.dest; - QProcess myProcess; - myProcess.setProcessChannelMode(QProcess::MergedChannels); - myProcess.start("ffmpeg", parameters); - myProcess.waitForStarted(); - int result = -1; - int duration = 0; - - while (myProcess.state() != QProcess::NotRunning) { - // building proxy file - if (m_abortProxy.contains(info.dest) || m_abortAllProxies) { - myProcess.close(); - myProcess.waitForFinished(); - m_abortProxy.removeAll(info.dest); - m_processingProxy.removeAll(info.dest); - QFile::remove(info.dest); - if (!m_abortAllProxies) setProxyStatus(info.dest, NOPROXY); - result = -2; - - } - else { - QString log = QString(myProcess.readAll()); - processLogInfo(processingItems, &duration, log); - } - myProcess.waitForFinished(500); - } - myProcess.waitForFinished(); - m_abortProxy.removeAll(info.dest); - m_processingProxy.removeAll(info.dest); - if (result == -1) result = myProcess.exitStatus(); - if (result == 0) { - // proxy successfully created - setProxyStatus(info.dest, PROXYDONE); - slotGotProxy(info.dest); - } - else if (result == 1) { - // Proxy process crashed - QFile::remove(info.dest); - setProxyStatus(info.dest, PROXYCRASHED); } } @@ -2618,57 +2714,75 @@ void ProjectList::updateProxyConfig() else delete command; } -void ProjectList::slotProxyCurrentItem(bool doProxy) +void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy) { - QList list = m_listView->selectedItems(); + QList list; + if (itemToProxy == NULL) list = m_listView->selectedItems(); + else list << itemToProxy; + + // expand list (folders, subclips) to get real clips QTreeWidgetItem *listItem; - QUndoCommand *command = new QUndoCommand(); - if (doProxy) command->setText(i18np("Add proxy clip", "Add proxy clips", list.count())); - else command->setText(i18np("Remove proxy clip", "Remove proxy clips", list.count())); - - // Make sure the proxy folder exists - QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; - KStandardDirs::makeDir(proxydir); - - QMap newProps; - QMap oldProps; - if (!doProxy) newProps.insert("proxy", "-"); + QList clipList; for (int i = 0; i < list.count(); i++) { listItem = list.at(i); if (listItem->type() == PROJECTFOLDERTYPE) { for (int j = 0; j < listItem->childCount(); j++) { QTreeWidgetItem *sub = listItem->child(j); - if (!list.contains(sub)) list.append(sub); + if (sub->type() == PROJECTCLIPTYPE) { + ProjectItem *item = static_cast (sub); + if (!clipList.contains(item)) clipList.append(item); + } } } else if (listItem->type() == PROJECTSUBCLIPTYPE) { QTreeWidgetItem *sub = listItem->parent(); - if (!list.contains(sub)) list.append(sub); + ProjectItem *item = static_cast (sub); + if (!clipList.contains(item)) clipList.append(item); } else if (listItem->type() == PROJECTCLIPTYPE) { ProjectItem *item = static_cast (listItem); - CLIPTYPE t = item->clipType(); - if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { - if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy())) continue; - DocClipBase *clip = item->referencedClip(); - if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { - kDebug()<<"//// TRYING TO PROXY: "<clipId()<<", but it is busy"; - continue; - } + if (!clipList.contains(item)) clipList.append(item); + } + } + + QUndoCommand *command = new QUndoCommand(); + if (doProxy) command->setText(i18np("Add proxy clip", "Add proxy clips", clipList.count())); + else command->setText(i18np("Remove proxy clip", "Remove proxy clips", clipList.count())); + + // Make sure the proxy folder exists + QString proxydir = m_doc->projectFolder().path( KUrl::AddTrailingSlash) + "proxy/"; + KStandardDirs::makeDir(proxydir); - resetThumbsProducer(clip); - oldProps = clip->properties(); - if (doProxy) { - newProps.clear(); - QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); - // insert required duration for proxy - newProps.insert("proxy_out", clip->producerProperty("out")); - newProps.insert("proxy", path); - // We need to insert empty proxy so that undo will work - oldProps.insert("proxy", QString()); - } - new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command); + QMap newProps; + QMap oldProps; + if (!doProxy) newProps.insert("proxy", "-"); + for (int i = 0; i < clipList.count(); i++) { + ProjectItem *item = clipList.at(i); + CLIPTYPE t = item->clipType(); + if ((t == VIDEO || t == AV || t == UNKNOWN || t == IMAGE || t == PLAYLIST) && item->referencedClip()) { + if ((doProxy && item->hasProxy()) || (!doProxy && !item->hasProxy() && item->referencedClip()->getProducer() != NULL)) continue; + DocClipBase *clip = item->referencedClip(); + if (!clip || !clip->isClean() || m_render->isProcessing(item->clipId())) { + kDebug()<<"//// TRYING TO PROXY: "<clipId()<<", but it is busy"; + continue; } + + oldProps = clip->properties(); + if (doProxy) { + newProps.clear(); + QString path = proxydir + clip->getClipHash() + "." + (t == IMAGE ? "png" : m_doc->getDocumentProperty("proxyextension")); + // insert required duration for proxy + newProps.insert("proxy_out", clip->producerProperty("out")); + newProps.insert("proxy", path); + // We need to insert empty proxy so that undo will work + oldProps.insert("proxy", QString()); + } + else if (item->referencedClip()->getProducer() == NULL) { + // Force clip reload + kDebug()<<"// CLIP HAD NULL PROD------------"; + newProps.insert("resource", item->referencedClip()->getProperty("resource")); + } + new EditClipCommand(this, item->clipId(), oldProps, newProps, true, command); } } if (command->childCount() > 0) { @@ -2704,27 +2818,27 @@ void ProjectList::slotDeleteProxy(const QString proxyPath) QFile::remove(proxyPath); } -void ProjectList::setProxyStatus(const QString proxyPath, PROXYSTATUS status, int progress) -{ - if (proxyPath.isEmpty() || m_abortAllProxies) return; - QTreeWidgetItemIterator it(m_listView); - ProjectItem *item; - while (*it && !m_abortAllProxies) { - if ((*it)->type() == PROJECTCLIPTYPE) { - item = static_cast (*it); - if (item->referencedClip()->getProperty("proxy") == proxyPath) { - setProxyStatus(item, status, progress); - } - } - ++it; - } -} - void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress) { - if (item == NULL) return; + if (item == NULL || m_abortAllProxies) return; monitorItemEditing(false); item->setProxyStatus(status, progress); + if (status == PROXYCRASHED) { + DocClipBase *clip = item->referencedClip(); + if (!clip) { + kDebug()<<"// PROXY CRASHED"; + } + else if (clip->getProducer() == NULL && !clip->isPlaceHolder()) { + // disable proxy and fetch real clip + clip->setProperty("proxy", "-"); + QDomElement xml = clip->toXML(); + m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), true); + } + else { + // Disable proxy for this clip + clip->setProperty("proxy", "-"); + } + } monitorItemEditing(true); }