diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp | |
parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp index 9529cd47a..3a307cb27 100644 --- a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp +++ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp @@ -116,6 +116,7 @@ MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player) , m_isSeeking(false) , m_composited(false) , m_preload(MediaPlayer::Auto) + , m_bytesLoadedAtLastDidLoadingProgress(0) , m_suppressNextPlaybackChanged(false) { m_mediaPlayer->setVideoOutput(m_videoItem); @@ -361,13 +362,17 @@ float MediaPlayerPrivateQt::maxTimeSeekable() const return static_cast<float>(m_mediaPlayerControl->availablePlaybackRanges().latestTime()) / 1000.0f; } -unsigned MediaPlayerPrivateQt::bytesLoaded() const +bool MediaPlayerPrivateQt::didLoadingProgress() const { + unsigned bytesLoaded = 0; QLatin1String bytesLoadedKey("bytes-loaded"); if (m_mediaPlayer->availableExtendedMetaData().contains(bytesLoadedKey)) - return m_mediaPlayer->extendedMetaData(bytesLoadedKey).toInt(); - - return m_mediaPlayer->bufferStatus(); + bytesLoaded = m_mediaPlayer->extendedMetaData(bytesLoadedKey).toInt(); + else + bytesLoaded = m_mediaPlayer->bufferStatus(); + bool didLoadingProgress = bytesLoaded != m_bytesLoadedAtLastDidLoadingProgress; + m_bytesLoadedAtLastDidLoadingProgress = bytesLoaded; + return didLoadingProgress; } unsigned MediaPlayerPrivateQt::totalBytes() const |