Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity

Fix webm import because of not skipped webm convert step

Browse Source
This commit is contained in:
Elias Steurer 2021-09-01 20:20:30 +02:00
parent a6effa2106
commit 4765ef64c7
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ScreenPlay/src/create.cpp
View File

@ -52,6 +52,7 @@ void Create::reset()
setProgress(0.);
setWorkingDir({});
}
/*!
\brief Starts the process.
*/
@ -60,19 +61,20 @@ void Create::createWallpaperStart(QString videoPath, Create::VideoCodec codec, c
reset();
videoPath = ScreenPlayUtil::toLocal(videoPath);
const QDir dir(m_globalVariables->localStoragePath().toLocalFile());
const QDir installedDir = ScreenPlayUtil::toLocal(m_globalVariables->localStoragePath().toString());
// Create a temp dir so we can later alter it to the workshop id
const auto folderName = QString("_tmp_" + QTime::currentTime().toString()).replace(":", "");
const QDateTime date = QDateTime::currentDateTime();
const auto folderName = date.toString("ddMMyyyyhhmmss");
setWorkingDir(installedDir.path() + "/" + folderName);
if (!dir.mkdir(folderName)) {
if (!installedDir.mkdir(folderName)) {
qInfo() << "Unable to create folder with name: " << folderName << " at: " << installedDir;
emit createWallpaperStateChanged(ImportVideoState::ImportVideoState::CreateTmpFolderError);
emit abortCreateWallpaper();
return;
}
setWorkingDir(dir.path() + "/" + folderName);
QString target_codec;
switch (codec) {
case Create::VideoCodec::VP8:
@ -116,12 +118,15 @@ void Create::createWallpaperStart(QString videoPath, Create::VideoCodec codec, c
return;
}
qInfo() << "createWallpaperVideoPreview()";
if (!import.createWallpaperVideoPreview() || m_interrupt) {
emit createWallpaperStateChanged(ImportVideoState::ImportVideoState::Failed);
emit import.abortAndCleanup();
// Skip preview convert for webm
if (!import.m_isWebm) {
qInfo() << "createWallpaperVideoPreview()";
if (!import.createWallpaperVideoPreview() || m_interrupt) {
emit createWallpaperStateChanged(ImportVideoState::ImportVideoState::Failed);
emit import.abortAndCleanup();
return;
return;
}
}
qInfo() << "createWallpaperGifPreview()";