slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,813 Commits 1 Branch 0 Tags
c7397523e77578cf8f09ba3258791f68c34e2e5f
Commit Graph

1813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jonas Rabbe
4271cbcaf1 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>
 2011-07-20 07:55:04 +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
Jonas Rabbe
07438ca4f0 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>
 2011-07-19 06:15:59 +02:00
Michael Goddard
eccb43d73c 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>
 2011-07-19 03:06:23 +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
Michael Goddard
7085775a11 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>
 2011-07-15 08:58:44 +02:00
Michael Goddard
09d89118d9 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>
 2011-07-14 09:00:07 +02:00
Michael Goddard
e4f42348f1 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>
 2011-07-14 06:43:07 +02:00
J-P Nurmi
1d82a1e1b4 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>
 2011-07-14 04:21:10 +02:00
Casper van Donderen
ca4607979a Merge demos and examples. 
Change-Id: I65ba412ef5207a71bf8763983b28672d1743f4b8
Reviewed-on: http://codereview.qt.nokia.com/1398
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-07-12 15:03:55 +02:00
Jonas Rabbe
98729e41f8 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>
 2011-07-12 07:55:02 +02:00
Jonas Rabbe
e55d67301d 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>
 2011-07-12 03:35:27 +02:00
Michael Goddard
81f37fcbf2 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>
 2011-07-11 12:29:11 +02:00
Michael Goddard
e4a5280672 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>
 2011-07-11 10:21:17 +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
Alan Alpert
150f95a0d7 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>
 2011-07-08 02:41:32 +02:00
Alan Alpert
d5e75a3a49 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: I785f30e24e0a793218e2e307bdde56067760c51b
Reviewed-on: http://codereview.qt.nokia.com/1280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-07-08 02:15:06 +02:00
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
Qt Continuous Integration System
9d24cb54d9 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Fix usage of QT_SOURCE_TREE
 2011-06-08 04:50:54 +10:00
Marius Storm-Olsen
8df17ac432 Fix usage of QT_SOURCE_TREE 
Functionality has been moved into qt_example.prf
 2011-06-07 13:47:05 -05:00
Qt Continuous Integration System
37ca448cfd Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Use feature profile loading instead of direct inclusion.
 2011-06-07 20:44:00 +10:00
axis
eeb5be780b Use feature profile loading instead of direct inclusion. 2011-06-07 05:41:47 -05:00
Qt Continuous Integration System
d400cf2b80 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  tests: mark tst_qaudioinput as unstable
 2011-05-27 12:01:03 +10:00
Rohan McGovern
f9eaceb557 tests: mark tst_qaudioinput as unstable 
Task: QTBUG-19537
Reviewed-by: Jason McDonald
Change-Id: Id8d80d1d34066afaaf6531c802529885971b6c35
 2011-05-27 11:59:15 +10:00
Qt Continuous Integration System
a05aa216fc Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Update licenseheader text in source files for qtmultimedia Qt module
 2011-05-24 22:05:24 +10:00
Jyri Tahtela
b628e850be Update licenseheader text in source files for qtmultimedia Qt module 
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
 2011-05-24 15:03:12 +03:00
Qt Continuous Integration System
40c5ec7297 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Squashed commit of changes from the 4.8-temp branch.
  Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
 2011-05-23 22:51:34 +10:00
David Boddie
add475cbc1 Squashed commit of changes from the 4.8-temp branch. 2011-05-20 19:48:33 +02:00
David Boddie
c5c9450497 Squashed commit of the changes from the mobile-examples repository 
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
 2011-05-19 20:48:28 +02:00
Qt Continuous Integration System
eb15d0e412 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Don't build and install examples and demos unless requested
 2011-05-14 16:57:26 +10:00
Eckhart Koppen
0db79fb534 Don't build and install examples and demos unless requested 
Take -nomake setting into account when building
 2011-05-14 09:53:47 +03:00
Qt Continuous Integration System
0671bdf04b Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Update module version number to 5.0.0
 2011-05-13 22:59:37 +10:00
Eckhart Koppen
418b33b944 Update module version number to 5.0.0 
Updated .pri file variables
 2011-05-13 13:33:43 +03:00
Qt Continuous Integration System
45bf616061 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  tests: build autotests by default for qtmultimedia
 2011-05-12 12:36:50 +10:00
Rohan McGovern
a612c40d2e tests: build autotests by default for qtmultimedia 
Configure Qt with `-nomake tests' if you don't want the tests.

Reviewed-by: Jason McDonald
Change-Id: I1c17d4a9c1a5c97362dc604f5a3686af4f59c729
 2011-05-12 12:33:00 +10:00
Qt Continuous Integration System
306424c55f Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Add QTMULTIMEDIA_VERSION macro for qtmultimedia
 2011-05-11 20:59:54 +10:00
Liang Qi
95b597c7e1 Add QTMULTIMEDIA_VERSION macro for qtmultimedia 
Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
 2011-05-11 12:46:58 +02:00
Qt Continuous Integration System
aca1b2be8e Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
  Added .tag file with Git revision.
  Use private headers
  Add module.prf, and install MODULE_PRI for each module
 2011-05-05 14:33:58 +10:00