Commit Graph

12 Commits

Author SHA1 Message Date
Jonas Rabbe
503f885785 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>
2011-07-06 05:17:52 +02:00
Jonas Rabbe
d13d75949f 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
2011-07-05 06:50:08 +02:00
Ling Hu
ca25844e52 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>
2011-07-05 06:50:04 +02:00
Michael Goddard
d502dec456 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
2011-07-05 06:49:59 +02:00
Kalle Lehtonen
1fa94883ed 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
2011-07-05 06:49:47 +02:00
Kalle Lehtonen
e33b74bd70 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
2011-07-05 06:49:42 +02:00
Dmytro Poplavskiy
a3ec7105dc 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
2011-07-05 06:49:35 +02:00
Dmytro Poplavskiy
e94afd6cf2 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
2011-07-05 06:49:30 +02:00
Dmytro Poplavskiy
843f47fc59 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
2011-07-05 06:49:20 +02:00
Jonas Rabbe
5820946df2 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>
2011-07-05 01:28:46 +02:00
Michael Goddard
242d0e49b8 Remove Symbian packaging information.
Needs to be redone/done differently, anyhow.
2011-06-29 14:23:55 +10:00
Michael Goddard
2a34e88c1e Initial copy of QtMultimediaKit.
Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2
2011-06-29 13:38:46 +10:00