rework QMovie

it was even possible to change the format while the movie was in running
state

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

src/gui/image/qmovie.cpp

@@ -42,19 +42,11 @@
 
     \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 0
 
-    Whenever a new frame is available in the movie, QMovie will emit
+    Whenever the frame changes, QMovie will emit frameChanged(). currentImage()
-    updated(). If the size of the frame changes, resized() is emitted. You can
+    can be used to get a copy of the current frame. When the movie is done,
-    call currentImage() or currentPixmap() to get a copy of the current
+    QMovie emits finished(). If any error occurs during playback (i.e, the image
-    frame. When the movie is done, QMovie emits finished(). If any error
+    file is corrupt), QMovie will emit error(). When QMovie state changes, QMovie
-    occurs during playback (i.e, the image file is corrupt), QMovie will emit
+    will emit stateChanged(). To stop the movie, call stop().
-    error().
-
-    You can control the speed of the movie playback by calling setSpeed(),
-    which takes the percentage of the original speed as an argument. Pause the
-    movie by calling setPaused(true). QMovie will then enter \l Paused state
-    and emit stateChanged(). If you call setPaused(false), QMovie will reenter
-    \l Running state and start the movie again. To stop the movie, call
-    stop().
 
     Certain animation formats allow you to set the background color. You can
     call setBackgroundColor() to set the color, or backgroundColor() to
@@ -83,44 +75,15 @@
     state, and the state it enters after stop() has been called or the movie
     is finished.
 
-    \value Paused The movie is paused, and QMovie stops emitting updated() or
-    resized(). This state is entered after calling pause() or
-    setPaused(true). The current frame number it kept, and the movie will
-    continue with the next frame when unpause() or setPaused(false) is called.
-
     \value Running The movie is running.
 */
 
-/*! \enum QMovie::CacheMode
-
-    This enum describes the different cache modes of QMovie.
-
-    \value CacheNone No frames are cached (the default).
-
-    \value CacheAll All frames are cached.
-*/
-
 /*! \fn void QMovie::started()
 
     This signal is emitted after QMovie::start() has been called, and QMovie
     has entered QMovie::Running state.
 */
 
-/*! \fn void QMovie::resized(const QSize &size)
-
-    This signal is emitted when the current frame has been resized to \a
-    size. This effect is sometimes used in animations as an alternative to
-    replacing the frame. You can call currentImage() or currentPixmap() to get a
-    copy of the updated frame.
-*/
-
-/*! \fn void QMovie::updated(const QRect &rect)
-
-    This signal is emitted when the rect \a rect in the current frame has been
-    updated. You can call currentImage() or currentPixmap() to get a copy of the
-    updated frame.
-*/
-
 /*! \fn void QMovie::frameChanged(int frameNumber)
     \since 4.1
 
@@ -158,395 +121,95 @@
 #include "qmovie.h"
 #include "qimage.h"
 #include "qimagereader.h"
-#include "qpixmap.h"
-#include "qrect.h"
-#include "qelapsedtimer.h"
 #include "qtimer.h"
-#include "qpair.h"
+#include "qcolor.h"
-#include "qmap.h"
 #include "qlist.h"
 #include "qbuffer.h"
-#include "qdir.h"
 #include "qobject_p.h"
+#include "qdebug.h"
 
 #define QMOVIE_INVALID_DELAY -1
 
 QT_BEGIN_NAMESPACE
 
-class QFrameInfo
-{
-public:
-    QPixmap pixmap;
-    int delay;
-    bool endMark;
-    inline QFrameInfo(bool endMark)
-        : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(endMark)
-    { }
-    
-    inline QFrameInfo()
-        : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false)
-    { }
-    
-    inline QFrameInfo(const QPixmap &pixmap, int delay)
-        : pixmap(pixmap), delay(delay), endMark(false)
-    { }
-    
-    inline bool isValid()
-    {
-        return endMark || !(pixmap.isNull() && (delay == QMOVIE_INVALID_DELAY));
-    }
-    
-    inline bool isEndMarker()
-    { return endMark; }
-    
-    static inline QFrameInfo endMarker()
-    { return QFrameInfo(true); }
-};
-
 class QMoviePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QMovie)
 
 public:
     QMoviePrivate(QMovie *qq);
-    bool isDone();
-    bool next();
-    int speedAdjustedDelay(int delay) const;
-    bool isValid() const;
-    bool jumpToFrame(int frameNumber);
-    int frameCount() const;
-    bool jumpToNextFrame();
-    QFrameInfo infoForFrame(int frameNumber);
-    void reset();
 
-    inline void enterState(QMovie::MovieState newState) {
+    void begin();
-        movieState = newState;
+    void done();
-        emit q_func()->stateChanged(newState);
+    void readerError(const QImageReader::ImageReaderError error);
-    }
-
-    // private slots
     void _q_loadNextFrame();
-    void _q_loadNextFrame(bool starting);
 
+    int loopCount;
     QImageReader *reader;
-    int speed;
     QMovie::MovieState movieState;
-    QRect frameRect;
+    QImage currentImage;
-    QPixmap currentPixmap;
-    int currentFrameNumber;
-    int nextFrameNumber;
-    int greatestFrameNumber;
-    int nextDelay;
-    int playCounter;
-    qint64 initialDevicePos;
-    QMovie::CacheMode cacheMode;
-    bool haveReadAll;
-    bool isFirstIteration;
-    QMap<int, QFrameInfo> frameMap;
-    QString absoluteFilePath;
-
     QTimer nextImageTimer;
 };
 
-/*! \internal
- */
 QMoviePrivate::QMoviePrivate(QMovie *qq)
-    : reader(0), speed(100), movieState(QMovie::NotRunning),
+    : loopCount(-1),
-      currentFrameNumber(-1), nextFrameNumber(0), greatestFrameNumber(-1),
+    reader(nullptr),
-      nextDelay(0), playCounter(-1),
+    movieState(QMovie::NotRunning)
-      cacheMode(QMovie::CacheNone), haveReadAll(false), isFirstIteration(true)
 {
     q_ptr = qq;
-    nextImageTimer.setSingleShot(true);
 }
 
-/*! \internal
+void QMoviePrivate::begin()
- */
-void QMoviePrivate::reset()
-{
-    nextImageTimer.stop();
-    if (reader->device())
-        initialDevicePos = reader->device()->pos();
-    currentFrameNumber = -1;
-    nextFrameNumber = 0;
-    greatestFrameNumber = -1;
-    nextDelay = 0;
-    playCounter = -1;
-    haveReadAll = false;
-    isFirstIteration = true;
-    frameMap.clear();
-}
-
-/*! \internal
- */
-bool QMoviePrivate::isDone()
-{
-    return (playCounter == 0);
-}
-
-/*!
-    \internal
-
-    Given the original \a delay, this function returns the
-    actual number of milliseconds to delay according to
-    the current speed. E.g. if the speed is 200%, the
-    result will be half of the original delay.
-*/
-int QMoviePrivate::speedAdjustedDelay(int delay) const
-{
-    return int( (qint64(delay) * qint64(100) ) / qint64(speed) );
-}
-
-/*!
-    \internal
-
-    Returns the QFrameInfo for the given \a frameNumber.
-
-    If the frame number is invalid, an invalid QFrameInfo is
-    returned.
-
-    If the end of the animation has been reached, a
-    special end marker QFrameInfo is returned.
-
-*/
-QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
-{
-    if (frameNumber < 0)
-        return QFrameInfo(); // Invalid
-
-    if (haveReadAll && (frameNumber > greatestFrameNumber)) {
-        if (frameNumber == greatestFrameNumber+1)
-            return QFrameInfo::endMarker();
-        return QFrameInfo(); // Invalid
-    }
-
-    if (cacheMode == QMovie::CacheNone) {
-        if (frameNumber != currentFrameNumber+1) {
-            // Non-sequential frame access
-            if (!reader->jumpToImage(frameNumber)) {
-                if (frameNumber == 0) {
-                    // Special case: Attempt to "rewind" so we can loop
-                    // ### This could be implemented as QImageReader::rewind()
-                    if (reader->device()->isSequential())
-                        return QFrameInfo(); // Invalid
-                    QString fileName = reader->fileName();
-                    QByteArray format = reader->format();
-                    QIODevice *device = reader->device();
-                    QColor bgColor = reader->backgroundColor();
-                    QSize scaledSize = reader->scaledSize();
-                    delete reader;
-                    if (fileName.isEmpty())
-                        reader = new QImageReader(device, format);
-                    else
-                        reader = new QImageReader(absoluteFilePath, format);
-                    (void)reader->canRead(); // Provoke a device->open() call
-                    reader->device()->seek(initialDevicePos);
-                    reader->setBackgroundColor(bgColor);
-                    reader->setScaledSize(scaledSize);
-                } else {
-                    return QFrameInfo(); // Invalid
-                }
-            }
-        }
-        if (reader->canRead()) {
-            // reader says we can read. Attempt to actually read image
-            QImage anImage = reader->read();
-            if (anImage.isNull()) {
-                // Reading image failed.
-                return QFrameInfo(); // Invalid
-            }
-            if (frameNumber > greatestFrameNumber)
-                greatestFrameNumber = frameNumber;
-            QPixmap aPixmap = QPixmap::fromImage(anImage);
-            int aDelay = reader->nextImageDelay();
-            return QFrameInfo(aPixmap, aDelay);
-        } else if (frameNumber != 0) {
-            // We've read all frames now. Return an end marker
-            haveReadAll = true;
-            return QFrameInfo::endMarker();
-        } else {
-            // No readable frames
-            haveReadAll = true;
-            return QFrameInfo();
-        }
-    }
-
-    // CacheMode == CacheAll
-    if (frameNumber > greatestFrameNumber) {
-        // Frame hasn't been read from file yet. Try to do it
-        for (int i = greatestFrameNumber + 1; i <= frameNumber; ++i) {
-            if (reader->canRead()) {
-                // reader says we can read. Attempt to actually read image
-                QImage anImage = reader->read();
-                if (anImage.isNull()) {
-                    // Reading image failed.
-                    return QFrameInfo(); // Invalid
-                }
-                greatestFrameNumber = i;
-                QPixmap aPixmap = QPixmap::fromImage(anImage);
-                int aDelay = reader->nextImageDelay();
-                QFrameInfo info(aPixmap, aDelay);
-                // Cache it!
-                frameMap.insert(i, info);
-                if (i == frameNumber) {
-                    return info;
-                }
-            } else {
-                // We've read all frames now. Return an end marker
-                haveReadAll = true;
-                return QFrameInfo::endMarker();
-            }
-        }
-    }
-    // Return info for requested (cached) frame
-    return frameMap.value(frameNumber);
-}
-
-/*!
-    \internal
-
-    Attempts to advance the animation to the next frame.
-    If successful, currentFrameNumber, currentPixmap and
-    nextDelay are updated accordingly, and true is returned.
-    Otherwise, false is returned.
-    When false is returned, isDone() can be called to
-    determine whether the animation ended gracefully or
-    an error occurred when reading the frame.
-*/
-bool QMoviePrivate::next()
-{
-    QElapsedTimer time;
-    time.start();
-    QFrameInfo info = infoForFrame(nextFrameNumber);
-    if (!info.isValid())
-        return false;
-    if (info.isEndMarker()) {
-        // We reached the end of the animation.
-        if (isFirstIteration) {
-            if (nextFrameNumber == 0) {
-                // No frames could be read at all (error).
-                return false;
-            }
-            // End of first iteration. Initialize play counter
-            playCounter = reader->loopCount();
-            isFirstIteration = false;
-        }
-        // Loop as appropriate
-        if (playCounter != 0) {
-            if (playCounter != -1) // Infinite?
-                playCounter--;     // Nope
-            nextFrameNumber = 0;
-            return next();
-        }
-        // Loop no more. Done
-        return false;
-    }
-    // Image and delay OK, update internal state
-    currentFrameNumber = nextFrameNumber++;
-    QSize scaledSize = reader->scaledSize();
-    if (scaledSize.isValid() && (scaledSize != info.pixmap.size()))
-        currentPixmap = info.pixmap.scaled(scaledSize);
-    else
-        currentPixmap = info.pixmap;
-    nextDelay = speedAdjustedDelay(info.delay);
-    // Adjust delay according to the time it took to read the frame
-    int processingTime = time.elapsed();
-    if (processingTime > nextDelay)
-        nextDelay = 0;
-    else
-        nextDelay = nextDelay - processingTime;
-    return true;
-}
-
-/*! \internal
- */
-void QMoviePrivate::_q_loadNextFrame()
-{
-    _q_loadNextFrame(false);
-}
-
-void QMoviePrivate::_q_loadNextFrame(bool starting)
 {
     Q_Q(QMovie);
-    if (next()) {
+    loopCount = reader->loopCount();
-        if (starting && movieState == QMovie::NotRunning) {
+    _q_loadNextFrame();
-            enterState(QMovie::Running);
+    nextImageTimer.start();
-            emit q->started();
+    movieState = QMovie::Running;
-        }
+    emit q->started();
+    emit q->stateChanged(QMovie::Running);
+}
 
-        if (frameRect.size() != currentPixmap.rect().size()) {
+void QMoviePrivate::done()
-            frameRect = currentPixmap.rect();
+{
-            emit q->resized(frameRect.size());
+    Q_Q(QMovie);
-        }
+    nextImageTimer.stop();
+    movieState = QMovie::NotRunning;
+    emit q->finished();
+    emit q->stateChanged(QMovie::NotRunning);
+}
 
-        emit q->updated(frameRect);
+void QMoviePrivate::readerError(const QImageReader::ImageReaderError error)
-        emit q->frameChanged(currentFrameNumber);
+{
+    Q_Q(QMovie);
+    done();
+    emit q->error(reader->error());
+}
 
-        if (movieState == QMovie::Running)
+void QMoviePrivate::_q_loadNextFrame()
-            nextImageTimer.start(nextDelay);
+{
-    } else {
+    Q_Q(QMovie);
-        // Could not read another frame
+    if (!reader->read(&currentImage)) {
-        if (!isDone()) {
+        currentImage = QImage();
-            emit q->error(reader->error());
+        readerError(reader->error());
-        }
+        return;
-
+    }
-        // Graceful finish
+    const int currentframe = reader->currentImageNumber();
-        if (movieState != QMovie::Paused) {
+    emit q->frameChanged(currentframe);
-            nextFrameNumber = 0;
+    nextImageTimer.setInterval(reader->nextImageDelay());
-            isFirstIteration = true;
+    if (currentframe >= reader->imageCount()) {
-            playCounter = -1;
+        loopCount++;
-            enterState(QMovie::NotRunning);
+        if (loopCount == 0 || loopCount < reader->loopCount()) {
-            emit q->finished();
+            // infinite loop or not done looping
+            if (!reader->jumpToImage(0)) {
+                readerError(reader->error());
+            }
+        } else {
+            done();
         }
     }
 }
 
-/*!
-    \internal
-*/
-bool QMoviePrivate::isValid() const
-{
-    return (greatestFrameNumber >= 0) // have we seen valid data
-        || reader->canRead(); // or does the reader see valid data
-}
-
-/*!
-    \internal
-*/
-bool QMoviePrivate::jumpToFrame(int frameNumber)
-{
-    if (frameNumber < 0)
-        return false;
-    if (currentFrameNumber == frameNumber)
-        return true;
-    nextFrameNumber = frameNumber;
-    if (movieState == QMovie::Running)
-        nextImageTimer.stop();
-    _q_loadNextFrame();
-    return (nextFrameNumber == currentFrameNumber+1);
-}
-
-/*!
-    \internal
-*/
-int QMoviePrivate::frameCount() const
-{
-    int result;
-    if ((result = reader->imageCount()) != 0)
-        return result;
-    if (haveReadAll)
-        return greatestFrameNumber+1;
-    return 0; // Don't know
-}
-
-/*!
-    \internal
-*/
-bool QMoviePrivate::jumpToNextFrame()
-{
-    return jumpToFrame(currentFrameNumber+1);
-}
-
 /*!
     Constructs a QMovie object, passing the \a parent object to QObject's
     constructor.
@@ -557,7 +220,7 @@ QMovie::QMovie(QObject *parent)
     : QObject(*new QMoviePrivate(this), parent)
 {
     Q_D(QMovie);
-    d->reader = new QImageReader;
+    d->reader = new QImageReader();
     connect(&d->nextImageTimer, SIGNAL(timeout()), this, SLOT(_q_loadNextFrame()));
 }
 
@@ -574,7 +237,6 @@ QMovie::QMovie(QIODevice *device, const QByteArray &format, QObject *parent)
 {
     Q_D(QMovie);
     d->reader = new QImageReader(device, format);
-    d->initialDevicePos = device->pos();
     connect(&d->nextImageTimer, SIGNAL(timeout()), this, SLOT(_q_loadNextFrame()));
 }
 
@@ -590,10 +252,7 @@ QMovie::QMovie(const QString &fileName, const QByteArray &format, QObject *paren
     : QObject(*new QMoviePrivate(this), parent)
 {
     Q_D(QMovie);
-    d->absoluteFilePath = QDir(fileName).absolutePath();
     d->reader = new QImageReader(fileName, format);
-    if (d->reader->device())
-        d->initialDevicePos = d->reader->device()->pos();
     connect(&d->nextImageTimer, SIGNAL(timeout()), this, SLOT(_q_loadNextFrame()));
 }
 
@@ -615,8 +274,8 @@ QMovie::~QMovie()
 void QMovie::setDevice(QIODevice *device)
 {
     Q_D(QMovie);
+    stop();
     d->reader->setDevice(device);
-    d->reset();
 }
 
 /*!
@@ -640,9 +299,8 @@ QIODevice *QMovie::device() const
 void QMovie::setFileName(const QString &fileName)
 {
     Q_D(QMovie);
-    d->absoluteFilePath = QDir(fileName).absolutePath();
+    stop();
     d->reader->setFileName(fileName);
-    d->reset();
 }
 
 /*!
@@ -671,6 +329,7 @@ QString QMovie::fileName() const
 void QMovie::setFormat(const QByteArray &format)
 {
     Q_D(QMovie);
+    stop();
     d->reader->setFormat(format);
 }
 
@@ -721,58 +380,13 @@ QMovie::MovieState QMovie::state() const
     return d->movieState;
 }
 
-/*!
-    Returns the rect of the last frame. If no frame has yet been updated, an
-    invalid QRect is returned.
-
-    \sa currentImage(), currentPixmap()
-*/
-QRect QMovie::frameRect() const
-{
-    Q_D(const QMovie);
-    return d->frameRect;
-}
-
-/*! \fn QImage QMovie::framePixmap() const
-
-    Use currentPixmap() instead.
-*/
-
-/*! \fn void QMovie::pause()
-
-    Use setPaused(true) instead.
-*/
-
-/*! \fn void QMovie::unpause()
-
-    Use setPaused(false) instead.
-*/
-
-/*!
-    Returns the current frame as a QPixmap.
-
-    \sa currentImage(), updated()
-*/
-QPixmap QMovie::currentPixmap() const
-{
-    Q_D(const QMovie);
-    return d->currentPixmap;
-}
-
-/*! \fn QImage QMovie::frameImage() const
-
-    Use currentImage() instead.
-*/
-
 /*!
     Returns the current frame as a QImage.
-
-    \sa currentPixmap(), updated()
 */
 QImage QMovie::currentImage() const
 {
     Q_D(const QMovie);
-    return d->currentPixmap.toImage();
+    return d->currentImage;
 }
 
 /*!
@@ -782,45 +396,9 @@ QImage QMovie::currentImage() const
 bool QMovie::isValid() const
 {
     Q_D(const QMovie);
-    return d->isValid();
+    return d->reader->canRead();
 }
 
-/*! \fn bool QMovie::running() const
-
-    Use state() instead.
-*/
-
-/*! \fn bool QMovie::isNull() const
-
-    Use isValid() instead.
-*/
-
-/*! \fn int QMovie::frameNumber() const
-
-    Use currentFrameNumber() instead.
-*/
-
-/*! \fn bool QMovie::paused() const
-
-    Use state() instead.
-*/
-
-/*! \fn bool QMovie::finished() const
-
-    Use state() instead.
-*/
-
-/*! \fn void QMovie::restart()
-
-    Use stop() and start() instead.
-*/
-
-/*!
-    \fn void QMovie::step()
-
-    Use jumpToNextFrame() instead.
-*/
-
 /*!
     Returns the number of frames in the movie.
 
@@ -830,7 +408,7 @@ bool QMovie::isValid() const
 int QMovie::frameCount() const
 {
     Q_D(const QMovie);
-    return d->frameCount();
+    return d->reader->imageCount();
 }
 
 /*!
@@ -840,7 +418,7 @@ int QMovie::frameCount() const
 int QMovie::nextFrameDelay() const
 {
     Q_D(const QMovie);
-    return d->nextDelay;
+    return d->reader->nextImageDelay();
 }
 
 /*!
@@ -850,7 +428,7 @@ int QMovie::nextFrameDelay() const
 int QMovie::currentFrameNumber() const
 {
     Q_D(const QMovie);
-    return d->currentFrameNumber;
+    return d->reader->currentImageNumber();
 }
 
 /*!
@@ -859,17 +437,7 @@ int QMovie::currentFrameNumber() const
 bool QMovie::jumpToNextFrame()
 {
     Q_D(QMovie);
-    return d->jumpToNextFrame();
+    return d->reader->jumpToNextImage();
-}
-
-/*!
-    Jumps to frame number \a frameNumber. Returns true on success; otherwise
-    returns false.
-*/
-bool QMovie::jumpToFrame(int frameNumber)
-{
-    Q_D(QMovie);
-    return d->jumpToFrame(frameNumber);
 }
 
 /*!
@@ -887,69 +455,21 @@ int QMovie::loopCount() const
     return d->reader->loopCount();
 }
 
-/*!
-    If \a paused is true, QMovie will enter \l Paused state and emit
-    stateChanged(Paused); otherwise it will enter \l Running state and emit
-    stateChanged(Running).
-
-    \sa state()
-*/
-void QMovie::setPaused(bool paused)
-{
-    Q_D(QMovie);
-    if (paused) {
-        if (d->movieState == NotRunning)
-            return;
-        d->enterState(Paused);
-        d->nextImageTimer.stop();
-    } else {
-        if (d->movieState == Running)
-            return;
-        d->enterState(Running);
-        d->nextImageTimer.start(nextFrameDelay());
-    }
-}
-
-/*!
-    \property QMovie::speed
-    \brief the movie's speed
-
-    The speed is measured in percentage of the original movie speed.
-    The default speed is 100%.
-    Example:
-
-    \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 1
-*/
-void QMovie::setSpeed(int percentSpeed)
-{
-    Q_D(QMovie);
-    d->speed = percentSpeed;
-}
-
-int QMovie::speed() const
-{
-    Q_D(const QMovie);
-    return d->speed;
-}
-
 /*!
     Starts the movie. QMovie will enter \l Running state, and start emitting
     updated() and resized() as the movie progresses.
 
-    If QMovie is in the \l Paused state, this function is equivalent
+    If QMovie is already in the \l Running state, this function does nothing.
-    to calling setPaused(false). If QMovie is already in the \l
-    Running state, this function does nothing.
 
-    \sa stop(), setPaused()
+    \sa stop()
 */
 void QMovie::start()
 {
     Q_D(QMovie);
-    if (d->movieState == NotRunning) {
+    if (d->movieState == QMovie::Running) {
-        d->_q_loadNextFrame(true);
+        return;
-    } else if (d->movieState == Paused) {
-        setPaused(false);
     }
+    d->begin();
 }
 
 /*!
@@ -960,16 +480,15 @@ void QMovie::start()
     If QMovie is already in the \l NotRunning state, this function
     does nothing.
 
-    \sa start(), setPaused()
+    \sa start()
 */
 void QMovie::stop()
 {
     Q_D(QMovie);
-    if (d->movieState == NotRunning)
+    if (d->movieState == QMovie::NotRunning) {
         return;
-    d->enterState(NotRunning);
+    }
-    d->nextImageTimer.stop();
+    d->done();
-    d->nextFrameNumber = 0;
 }
 
 /*!
@@ -1019,39 +538,6 @@ QList<QByteArray> QMovie::supportedFormats()
     return list;
 }
 
-/*!
-    \property QMovie::cacheMode
-    \brief the movie's cache mode
-
-    Caching frames can be useful when the underlying animation format handler
-    that QMovie relies on to decode the animation data does not support
-    jumping to particular frames in the animation, or even "rewinding" the
-    animation to the beginning (for looping). Furthermore, if the image data
-    comes from a sequential device, it is not possible for the underlying
-    animation handler to seek back to frames whose data has already been read
-    (making looping altogether impossible).
-
-    To aid in such situations, a QMovie object can be instructed to cache the
-    frames, at the added memory cost of keeping the frames in memory for the
-    lifetime of the object.
-
-    By default, this property is set to \l CacheNone.
-
-    \sa QMovie::CacheMode
-*/
-
-QMovie::CacheMode QMovie::cacheMode() const
-{
-    Q_D(const QMovie);
-    return d->cacheMode;
-}
-
-void QMovie::setCacheMode(CacheMode cacheMode)
-{
-    Q_D(QMovie);
-    d->cacheMode = cacheMode;
-}
-
 QT_END_NAMESPACE
 
 

src/gui/image/qmovie.h

@@ -43,23 +43,17 @@ class QRect;
 class QSize;
 
 class QMoviePrivate;
+
 class Q_GUI_EXPORT QMovie : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QMovie)
-    Q_ENUMS(MovieState CacheMode)
+    Q_ENUMS(MovieState)
-    Q_PROPERTY(int speed READ speed WRITE setSpeed)
-    Q_PROPERTY(CacheMode cacheMode READ cacheMode WRITE setCacheMode)
 public:
     enum MovieState {
         NotRunning,
-        Paused,
         Running
     };
-    enum CacheMode {
-        CacheNone,
-        CacheAll
-    };
 
     QMovie(QObject *parent = nullptr);
     explicit QMovie(QIODevice *device, const QByteArray &format = QByteArray(), QObject *parent = nullptr);
@@ -82,30 +76,20 @@ public:
 
     MovieState state() const;
 
-    QRect frameRect() const;
     QImage currentImage() const;
-    QPixmap currentPixmap() const;
 
     bool isValid() const;
 
-    bool jumpToFrame(int frameNumber);
     int loopCount() const;
     int frameCount() const;
     int nextFrameDelay() const;
     int currentFrameNumber() const;
 
-    int speed() const;
-
     QSize scaledSize() const;
     void setScaledSize(const QSize &size);
 
-    CacheMode cacheMode() const;
-    void setCacheMode(CacheMode mode);
-
 Q_SIGNALS:
     void started();
-    void resized(const QSize &size);
-    void updated(const QRect &rect);
     void stateChanged(QMovie::MovieState state);
     void error(QImageReader::ImageReaderError error);
     void finished();
@@ -114,19 +98,15 @@ Q_SIGNALS:
 public Q_SLOTS:
     void start();
     bool jumpToNextFrame();
-    void setPaused(bool paused);
     void stop();
-    void setSpeed(int percentSpeed);
 
 private:
     Q_DISABLE_COPY(QMovie)
     Q_PRIVATE_SLOT(d_func(), void _q_loadNextFrame())
-
 };
 
 QT_END_NAMESPACE
 
-
 #endif // QT_NO_MOVIE
 
 #endif // QMOVIE_H

src/gui/widgets/qlabel.cpp

@@ -491,8 +491,8 @@ QSize QLabelPrivate::sizeForWidth(int w) const
     if (pixmap && !pixmap->isNull())
         br = pixmap->rect();
 #ifndef QT_NO_MOVIE
-    else if (movie && !movie->currentPixmap().isNull())
+    else if (movie && !movie->currentImage().isNull())
-        br = movie->currentPixmap().rect();
+        br = movie->currentImage().rect();
 #endif
     else if (isTextLabel) {
         int align = QStyle::visualAlignment(textDirection(), QFlag(this->align));
@@ -920,10 +920,11 @@ void QLabel::paintEvent(QPaintEvent *ev)
 
 #ifndef QT_NO_MOVIE
     if (d->movie) {
+        QPixmap pixmap = QPixmap::fromImage(d->movie->currentImage());
         if (d->scaledcontents)
-            style->drawItemPixmap(&painter, cr, align, d->movie->currentPixmap().scaled(cr.size()));
+            style->drawItemPixmap(&painter, cr, align, pixmap.scaled(cr.size()));
         else
-            style->drawItemPixmap(&painter, cr, align, d->movie->currentPixmap());
+            style->drawItemPixmap(&painter, cr, align, pixmap);
     }
     else
 #endif
@@ -1107,16 +1108,17 @@ void QLabelPrivate::_q_movieUpdated(const QRect& rect)
     Q_Q(QLabel);
     if (movie && movie->isValid()) {
         QRect r;
+        QPixmap pixmap = QPixmap::fromImage(movie->currentImage());
         if (scaledcontents) {
             QRect cr = q->contentsRect();
-            QRect pixmapRect(cr.topLeft(), movie->currentPixmap().size());
+            QRect pixmapRect(cr.topLeft(), pixmap.size());
             if (pixmapRect.isEmpty())
                 return;
             r.setRect(cr.left(), cr.top(),
                       (rect.width() * cr.width()) / pixmapRect.width(),
                       (rect.height() * cr.height()) / pixmapRect.height());
         } else {
-            r = q->style()->itemPixmapRect(q->contentsRect(), align, movie->currentPixmap());
+            r = q->style()->itemPixmapRect(q->contentsRect(), align, pixmap);
             r.translate(rect.x(), rect.y());
             r.setWidth(qMin(r.width(), rect.width()));
             r.setHeight(qMin(r.height(), rect.height()));