summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-22 08:39:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-22 08:39:26 (GMT)
commit463ad12efcc43bd9b48ab9f502ec6810a47d3d85 (patch)
treecadc92436888fa4ffebbcbb74bfe20aeb0690bb5
parent5238e6a592c43f19a7151d20e36908f1f1a44df8 (diff)
parent9d0d0800062f0d0cf49ed0d28bdbd5bc5e07a1d2 (diff)
downloadQt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.zip
Qt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.tar.gz
Qt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Phonon(qt7); Don't try and display video frames when audio only.
-rw-r--r--src/3rdparty/phonon/qt7/mediaobject.mm16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/3rdparty/phonon/qt7/mediaobject.mm b/src/3rdparty/phonon/qt7/mediaobject.mm
index 677640c..ca206bc 100644
--- a/src/3rdparty/phonon/qt7/mediaobject.mm
+++ b/src/3rdparty/phonon/qt7/mediaobject.mm
@@ -405,20 +405,22 @@ void MediaObject::restartAudioVideoTimers()
if (m_audioTimer)
killTimer(m_audioTimer);
+ if (hasVideo()) {
#if QT_ALLOW_QUICKTIME
// We prefer to use a display link as timer if available, since
// it is more steady, and results in better and smoother frame drawing:
- startDisplayLink();
- if (!m_displayLink){
+ startDisplayLink();
+ if (!m_displayLink){
+ float fps = m_videoPlayer->staticFps();
+ long videoUpdateFrequency = fps ? long(1000.0f / fps) : 0.001;
+ m_videoTimer = startTimer(videoUpdateFrequency);
+ }
+#else
float fps = m_videoPlayer->staticFps();
long videoUpdateFrequency = fps ? long(1000.0f / fps) : 0.001;
m_videoTimer = startTimer(videoUpdateFrequency);
- }
-#else
- float fps = m_videoPlayer->staticFps();
- long videoUpdateFrequency = fps ? long(1000.0f / fps) : 0.001;
- m_videoTimer = startTimer(videoUpdateFrequency);
#endif
+ }
long audioUpdateFrequency = m_audioPlayer->regularTaskFrequency();
m_audioTimer = startTimer(audioUpdateFrequency);