aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2019-02-22 14:33:14 +0100
committerMitch Curtis <mitch.curtis@qt.io>2019-02-25 09:05:20 +0000
commit52d5978218da07b2b6b768cfc43631515b55302c (patch)
treefaae3d05d83df4ecb39bb8d926e0601bdf0a2d85 /tests/manual
parent9dbe6c6d9ed4d4605f863be8376e502518880aee (diff)
gifrecorder: Use ffmpeg instead of the deprecated avconv
The libav-tools that provides the avconv tool is deprecated since Ubuntu 18.04 release. The ffmpeg pkg is the alternative suggested. Change-Id: I5d3d3b9409448402f67a7481827f0f1925cbb89f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/gifs/gifrecorder.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp
index a1ad6957..ec63e155 100644
--- a/tests/manual/gifs/gifrecorder.cpp
+++ b/tests/manual/gifs/gifrecorder.cpp
@@ -47,7 +47,7 @@
\note The following programs must be installed if \c setHighQuality(true)
is called:
- \li \e avconv (sudo apt-get install libav-tools)
+ \li \e ffmpeg (sudo apt-get install ffmpeg)
\li \e convert (sudo apt-get install imagemagick)
\li \e gifsicle (sudo apt-get install gifsicle)
@@ -252,19 +252,19 @@ void GifRecorder::waitForFinish()
QSignalSpy spy(mWindow, SIGNAL(frameSwapped()));
QVERIFY(spy.wait());
- QProcess avconvProcess;
+ QProcess ffmpegProcess;
QProcess convertProcess;
- avconvProcess.setStandardOutputProcess(&convertProcess);
+ ffmpegProcess.setStandardOutputProcess(&convertProcess);
- const QString avconvProcessName = QStringLiteral("avconv");
- const QString avconvArgs = QString::fromLatin1("-i %1 -r 20 -f image2pipe -vcodec ppm -").arg(mByzanzOutputFileName);
- startProcess(avconvProcess, avconvProcessName, avconvArgs);
+ const QString ffmpegProcessName = QStringLiteral("ffmpeg");
+ const QString ffmpegArgs = QString::fromLatin1("-i %1 -r 20 -f image2pipe -vcodec ppm -").arg(mByzanzOutputFileName);
+ startProcess(ffmpegProcess, ffmpegProcessName, ffmpegArgs);
const QString convertProcessName = QStringLiteral("convert");
const QString convertArgs = QString::fromLatin1("-delay 5 -loop 0 - %1").arg(mGifFileName);
startProcess(convertProcess, convertProcessName, convertArgs);
- waitForProcessToFinish(avconvProcess, avconvProcessName, waitDuration);
+ waitForProcessToFinish(ffmpegProcess, ffmpegProcessName, waitDuration);
waitForProcessToFinish(convertProcess, convertProcessName, waitDuration);
const QString gifsicleProcessName = QStringLiteral("gifsicle");