platform/upstream/qtmultimedia.git
13 years agoGst backend: Fixed deadlock when pipeline is stopped during prerolling.
Dmytro Poplavskiy [Wed, 20 Jul 2011 00:45:06 +0000 (10:45 +1000)]
Gst backend: Fixed deadlock when pipeline is stopped during prerolling.

Waiting for start() to be invoked in the main thread may block
if gstreamer blocks the main thread until this call is finished.
This situation is rare and usually caused by setState(Null)
while pipeline is being prerolled.

The proper solution to this involves controlling gstreamer pipeline
from other thread than video surface.

Currently start() fails if wait() timed out.

Task-number: QTMOBILITY-1663
Reviewed-by: Michael Goddard
Change-Id: Ib95e589a814e53efb9b4c454ef9f233658ff8c6a
(cherry picked from commit ac9762e2dbc06d696c6c74825ee22ac1fc176d9c)
Reviewed-on: http://codereview.qt.nokia.com/2073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoAdd some debug output in QMediaPlayer gstreamer backend for convenience
Ling Hu [Tue, 28 Jun 2011 04:04:24 +0000 (14:04 +1000)]
Add some debug output in QMediaPlayer gstreamer backend for convenience

Change-Id: I5c4beec63ededc39bda7ae69dce721d118921b83
Reviewed-by: Michael Goddard
(cherry picked from commit 3119b89f549b2fc03a213c355323b1ef31aa20e9)
Reviewed-on: http://codereview.qt.nokia.com/2072
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoFix for QTMOBILITY-1772 VideoWidget example crash on windows
Ling Hu [Tue, 19 Jul 2011 00:50:41 +0000 (10:50 +1000)]
Fix for QTMOBILITY-1772 VideoWidget example crash on windows

The surface format stride calculation in directshow backend is wrong which results in memory access violation.

Change-Id: I80da5affc9a727513bad9c8d74a9f49d0c1a6c0d
Task-number:QTMOBILITY-1772
Reviewed-by:Michael Goddard
(cherry picked from commit 0b010e781634d3b33750fcead445fc7bd3a6f828)
Reviewed-on: http://codereview.qt.nokia.com/2070
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoAdd the configuration tests.
Michael Goddard [Tue, 19 Jul 2011 05:51:43 +0000 (15:51 +1000)]
Add the configuration tests.

Add the list of tests to sync.profile, and make sure each test only happens
on the platforms it's intended for.

Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4
Reviewed-on: http://codereview.qt.nokia.com/1910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoBlacklisted auto test for QSoundEffect
Jonas Rabbe [Thu, 21 Jul 2011 23:01:06 +0000 (09:01 +1000)]
Blacklisted auto test for QSoundEffect

Change-Id: Ia42fc8f10530f8d9b885d2de2c927b6ea6189b57
Reviewed-on: http://codereview.qt.nokia.com/1998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoAdd install rule for plugins
hawcroft [Thu, 21 Jul 2011 06:58:06 +0000 (16:58 +1000)]
Add install rule for plugins

Change-Id: Icd204cd7eb53af73fcaec3af41b4881592e0d044
Reviewed-on: http://codereview.qt.nokia.com/1919
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoTemporarily removed include statements to disabled headers
Jonas Rabbe [Thu, 21 Jul 2011 06:08:00 +0000 (16:08 +1000)]
Temporarily removed include statements to disabled headers

Change-Id: I6810cadd68cb9567cb116242b32b3ae766d4aca6
Reviewed-on: http://codereview.qt.nokia.com/1916
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoRemove the QtQuick1 stuff from Audio.
Michael Goddard [Thu, 21 Jul 2011 03:51:16 +0000 (13:51 +1000)]
Remove the QtQuick1 stuff from Audio.

Change-Id: I82f0c62bc524d6e8903528ed673e0c4880c4b60d
Reviewed-on: http://codereview.qt.nokia.com/1911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoFixed compile; removed useless use of qRound with integers
Rohan McGovern [Wed, 20 Jul 2011 23:36:12 +0000 (09:36 +1000)]
Fixed compile; removed useless use of qRound with integers

qRound of an integer type never made sense.
Since 2dcd3939a8bd5ff743e4c87f87b2d81b1a101467 in qtbase, it won't
compile any more.

Change-Id: Ia30334bc92236d0fef9b6ac99d65bae4fe79dc57
Reviewed-on: http://codereview.qt.nokia.com/1905
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoChanged assert to match uri syntax for Qt 5 declarative modules
Jonas Rabbe [Wed, 20 Jul 2011 05:48:47 +0000 (15:48 +1000)]
Changed assert to match uri syntax for Qt 5 declarative modules

Change-Id: I27e125694b1d1830db8039d1188c79cd8d6ccb29
Reviewed-on: http://codereview.qt.nokia.com/1861
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoRemove most of the "mobility" references.
Michael Goddard [Mon, 18 Jul 2011 07:21:00 +0000 (17:21 +1000)]
Remove most of the "mobility" references.

Docs still need some fixing, but there are some legitimate usages of
it there.

Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162
Reviewed-on: http://codereview.qt.nokia.com/1736
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoFixed a hang of the QAudioOutput auto test on Mac OS X
Jonas Rabbe [Tue, 19 Jul 2011 04:09:22 +0000 (14:09 +1000)]
Fixed a hang of the QAudioOutput auto test on Mac OS X

Task-number: QTMOBILITY-1779
Change-Id: If4141ed848dd0475b0008ec85daba55fa5f086b3
Reviewed-on: http://codereview.qt.nokia.com/1805
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoRemove a few more obsolete parts.
Michael Goddard [Tue, 19 Jul 2011 00:40:05 +0000 (10:40 +1000)]
Remove a few more obsolete parts.

Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoRemove some obsolete bits.
Michael Goddard [Mon, 18 Jul 2011 00:32:16 +0000 (10:32 +1000)]
Remove some obsolete bits.

They can be updated again later when things are more stable, if needed.

Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27
Reviewed-on: http://codereview.qt.nokia.com/1724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoPrepare for QtQuick2 based declarative elements.
Michael Goddard [Fri, 15 Jul 2011 05:49:49 +0000 (15:49 +1000)]
Prepare for QtQuick2 based declarative elements.

Disable the QDeclarativeItem based components until they are ported
to scenegraph, and bump the revision to 4.0 (Once things are final,
we can make it 5.0).

Change-Id: Ib9c064722b80c38e711fbadc66966597c14a2b1a
Reviewed-on: http://codereview.qt.nokia.com/1685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
13 years agoAdd missing autotest.
Michael Goddard [Mon, 11 Jul 2011 07:51:25 +0000 (17:51 +1000)]
Add missing autotest.

The QSoundEffect test was missing in the initial modularization.

Change-Id: I92ba5290b28a4af3a1d4bd8f8a036e14a75cf8d1
Reviewed-on: http://codereview.qt.nokia.com/1400
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoMove the QtMultimedia spectrum demo to QtMultimediaKit
Michael Goddard [Tue, 12 Jul 2011 07:09:15 +0000 (17:09 +1000)]
Move the QtMultimedia spectrum demo to QtMultimediaKit

Change-Id: I60d7897eb84dfbe2ce5af5adeb23b33270aa7d7c
Reviewed-on: http://codereview.qt.nokia.com/1483
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoFixed build break
J-P Nurmi [Wed, 13 Jul 2011 08:45:03 +0000 (10:45 +0200)]
Fixed build break

QDeclarativeItem and QDeclarativeView was moved from QtDeclarative
to QtQuick1, also added qtquick1 module to the .pro file for
the declarative camera example.

Change-Id: Iae0828871d94d5f424b5329664303e2c0b9539bf
Reviewed-on: http://codereview.qt.nokia.com/1559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoMoved demo(s) to examples.
Jonas Rabbe [Tue, 12 Jul 2011 03:22:06 +0000 (13:22 +1000)]
Moved demo(s) to examples.

Demos are no longer part of QT_BUILD_PARTS, so any demos must be moved
to examples to be build. So far that means the player demo.

Change-Id: I92641be38accb1c1b723009f1004c63f59ec8266
Reviewed-on: http://codereview.qt.nokia.com/1470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoUse correct varible name in targets for imports
Jonas Rabbe [Tue, 12 Jul 2011 00:29:49 +0000 (10:29 +1000)]
Use correct varible name in targets for imports

Change-Id: Id00af5516c49f9dbf6128919114b33120b00d173
Reviewed-on: http://codereview.qt.nokia.com/1469
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoUse the correct qmake variable for enabling private tests.
Michael Goddard [Mon, 11 Jul 2011 08:12:28 +0000 (18:12 +1000)]
Use the correct qmake variable for enabling private tests.

Change-Id: Iaa5b3be70f3eb459c6bca2364e5c1d20f8952bb8
Reviewed-on: http://codereview.qt.nokia.com/1403
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
13 years agoAdd gui to the Qt prereqs.
Michael Goddard [Mon, 11 Jul 2011 08:10:04 +0000 (18:10 +1000)]
Add gui to the Qt prereqs.

Until we don't need it anymore.

Change-Id: I8a87a8c238d79e4e6ccd30846d0c140abc7c0085
Reviewed-on: http://codereview.qt.nokia.com/1402
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
13 years agoUpdate licenseheader text in source files for qtmultimediakit Qt module
Jyri Tahtela [Thu, 7 Jul 2011 13:21:09 +0000 (16:21 +0300)]
Update licenseheader text in source files for qtmultimediakit Qt module

Replace old license header with correct one.

Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308
Reviewed-on: http://codereview.qt.nokia.com/1318
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
13 years agoUpdate sync.profile dependencies to new syntax
Alan Alpert [Thu, 7 Jul 2011 08:01:20 +0000 (18:01 +1000)]
Update sync.profile dependencies to new syntax

%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.

Change-Id: I785f30e24e0a793218e2e307bdde56067760c51c
Reviewed-on: http://codereview.qt.nokia.com/1281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFixed up examples and demos
Jonas Rabbe [Tue, 5 Jul 2011 04:18:51 +0000 (14:18 +1000)]
Fixed up examples and demos

Changed the .pro files and moved some things around to ensure that the
examples and demos for Qt Multimedia Kit compiles and can be checked by
the CI system.

Change-Id: I915dc38ca76a97f20949df715725659c603231e2
Reviewed-on: http://codereview.qt.nokia.com/1136
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoStay away from unnecessary code paths if the movie is 0 (NULL)
Jonas Rabbe [Thu, 30 Jun 2011 04:35:59 +0000 (14:35 +1000)]
Stay away from unnecessary code paths if the movie is 0 (NULL)

When closing a QT7PlayerSession, it sets the movie to 0. There is no
need to check if a NULL movie supports the core pixel formats, and
that check lead to a segmentation fault with QtSDK 1.1.1.

Task-number: QTMOBILITY-1746
Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit b5d9964aab96ef1a02ca1af411178f05c42c2bf8)

Change-Id: I7cdddbd8fc1b8d8d667747aec3567aeb857accd6
Reviewed-on: http://codereview.qt.nokia.com/984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoFix playback problem with RTSP streaming for QMediaPlayer(gstreamer)
Ling Hu [Tue, 28 Jun 2011 03:49:57 +0000 (13:49 +1000)]
Fix playback problem with RTSP streaming for QMediaPlayer(gstreamer)

Change-Id: Ie920cbb5a377e810aee3e106bb50deb46365ce3b
Reviewed-by:Michael Goddard
(cherry picked from commit 05841ae6a9e0ffac623f9b00565bf33a52a22ecd)
Reviewed-on: http://codereview.qt.nokia.com/983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoTwo minor static analysis issues.
Michael Goddard [Mon, 27 Jun 2011 02:00:33 +0000 (12:00 +1000)]
Two minor static analysis issues.

Reviewed-by: Jonas Rabbe
(cherry picked from commit f8d04d717d3d7d5d2f73cc3e8a4245130fcf600a)

Change-Id: I3b12fd3a42d16730df3fe1277ba6821b5c2ef960
Reviewed-on: http://codereview.qt.nokia.com/982
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoQMediaPlayer autotest tests for OpenMAX AL even OpenMAX AL is not present
Kalle Lehtonen [Thu, 9 Jun 2011 06:24:01 +0000 (16:24 +1000)]
QMediaPlayer autotest tests for OpenMAX AL even OpenMAX AL is not present

The test is missing #ifdef around OpenMAX AL section.

Change-Id: I0d395f8cfd72cbccf7de894dd43e64e0afbeb289
Task-number: QTMOBILITY-1657
(cherry picked from commit e6b684de322c55a75aa6d46bd6db785705775a15)
Reviewed-on: http://codereview.qt.nokia.com/977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoFix for QPainterVideoSurface autotest
Kalle Lehtonen [Thu, 9 Jun 2011 06:15:56 +0000 (16:15 +1000)]
Fix for QPainterVideoSurface autotest

Autotest missing related OpenGL defines compared to the library.

Task-number: QTMOBILITY-1662

Change-Id: I2e417865a633058bb67ee30c07be53bab049bea6
(cherry picked from commit 68ef2e67968f4887a2d83e37f89f827d5ce36788)
Reviewed-on: http://codereview.qt.nokia.com/976
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoHarmattan resource policy bug workaround for QCamera
Dmytro Poplavskiy [Fri, 10 Jun 2011 05:45:42 +0000 (15:45 +1000)]
Harmattan resource policy bug workaround for QCamera

Task-number: 264400
Reviewed-by: Michael Goddard
(cherry picked from commit 505db43a64aa765dfaabb8e0463eff3c26895bdb)

Change-Id: I9b73b0e3751debedcf2929a0aaa431b3bd08c20e
Reviewed-on: http://codereview.qt.nokia.com/975
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoGst player backend: increased network timeout.
Dmytro Poplavskiy [Fri, 10 Jun 2011 04:50:33 +0000 (14:50 +1000)]
Gst player backend: increased network timeout.

5 seconds timeout is to short, increased to 30 seconds.

Task-number: MOBILITY-3013
Reviewed-by: Michael Goddard
(cherry picked from commit cf230f948de63c7755c7759b3e14a02ad14cb185)

Change-Id: I41d62ac1ed15f2c09af6fd804723096996d16139
Reviewed-on: http://codereview.qt.nokia.com/974
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoDisabled alsa on maemo devices.
Dmytro Poplavskiy [Thu, 9 Jun 2011 02:52:13 +0000 (12:52 +1000)]
Disabled alsa on maemo devices.

Reviewed-by: Michael Goddard
(cherry picked from commit f13421482c5a4d0bf6e20d96517060c5ff2c6785)

Change-Id: I43bceede31026353108ca9eefc251520257cca4e
Reviewed-on: http://codereview.qt.nokia.com/973
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
13 years agoTemporarily disabled demos, examples, and some tests
Jonas Rabbe [Fri, 1 Jul 2011 07:06:20 +0000 (17:06 +1000)]
Temporarily disabled demos, examples, and some tests

Want to make QtMultimediaKit finally integrate. Disabled some
tests and ensured that tests depending on private interfaces
are only built if these interfaces are enabled.

Change-Id: I65f0ff5ea23d704cf3c2626fe4191d7d6460e46f
Reviewed-on: http://codereview.qt.nokia.com/992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
13 years agoRemove Symbian packaging information.
Michael Goddard [Wed, 29 Jun 2011 04:23:41 +0000 (14:23 +1000)]
Remove Symbian packaging information.

Needs to be redone/done differently, anyhow.

13 years agoInitial copy of QtMultimediaKit.
Michael Goddard [Wed, 29 Jun 2011 03:38:46 +0000 (13:38 +1000)]
Initial copy of QtMultimediaKit.

Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2