Commit Graph

21 Commits

Author SHA1 Message Date
Michael Goddard
247dcc770b Move resource policy usage to a config test.
MeeGo uses this too.

Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2
Reviewed-on: http://codereview.qt-project.org/5447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-26 02:16:25 +02:00
Dmytro Poplavskiy
aef6b5a38a Camerabin backend: fixed compilation without X11
Disable video widget and overlay controls on systems without X11

Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00
Reviewed-on: http://codereview.qt-project.org/4850
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
2011-09-17 07:32:37 +02:00
Gunnar Sletta
eedcc340f1 Compile with refactor
Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856
Reviewed-on: http://codereview.qt-project.org/4940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-17 03:24:15 +02:00
Lasse Holmstedt
4840be0239 Build fix after refactor
Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
2011-09-13 13:28:28 +02:00
Michael Goddard
7507c80524 Fix some compiler warnings.
Mostly about deprecated ASCII casts.

Change-Id: I70428913799c15f20a1a5f80be57848e1072e058
Reviewed-on: http://codereview.qt.nokia.com/4158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-09-05 04:53:14 +02:00
Michael Goddard
3bf236cc23 Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
2011-08-30 15:34:30 +10:00
Michael Goddard
0344fd84c2 Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.
Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6
Reviewed-on: http://codereview.qt.nokia.com/2665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-08-25 04:47:33 +02:00
Dmytro Poplavskiy
da9b436cd1 Ported gstreamer camera backend from camerabin to camerabin2.
Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e
Reviewed-on: http://codereview.qt.nokia.com/2994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-24 07:07:45 +02:00
Dmytro Poplavskiy
e70ebfd2ed Gstreamer media backend cleanup.
Moved controls specific bus/sync messages handling from
player/camera/capture session to corresponding controls.

Reviewed-by: Michael Goddard
Change-Id: Ieb67976ed335b0ef1cde87dc60e8ad8da3409526
Reviewed-on: http://codereview.qt.nokia.com/2535
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-08-05 07:50:59 +02:00
Dmytro Poplavskiy
e45902822c 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>
2011-07-25 09:35:44 +02:00
Ling Hu
e47fa8b5a5 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>
2011-07-25 09:35:39 +02:00
Michael Goddard
1b1012f299 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>
2011-07-25 03:13:03 +02:00
hawcroft
18007fe244 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>
2011-07-21 10:14:58 +02:00
Rohan McGovern
01dac3cf55 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>
2011-07-21 02:20:28 +02:00
Michael Goddard
fdac892bbc 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>
2011-07-19 08:40:59 +02:00
Michael Goddard
1403a1c7be 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>
2011-07-18 05:56:15 +02:00
Jyri Tahtela
a925bb4a9e 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>
2011-07-08 07:59:00 +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
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
Michael Goddard
2a34e88c1e Initial copy of QtMultimediaKit.
Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2
2011-06-29 13:38:46 +10:00