platform/upstream/qtmultimedia.git
11 years agoChange the way camera format is selected.
Lev Zelenskiy [Tue, 31 Jul 2012 07:20:09 +0000 (17:20 +1000)]
Change the way camera format is selected.

Build list of supported formats before starting directshow graph.
Select first available format supported by both device and surface.
Force DirectShow to do color space conversion instead of using QImage.

Change-Id: I8f946cc7c2693eea0135981e899003b453bd8784
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoAdd 32 bit support (int/float) support to audioinput example.
Michael Goddard [Mon, 9 Jul 2012 06:51:50 +0000 (16:51 +1000)]
Add 32 bit support (int/float) support to audioinput example.

Change-Id: Ib7160f60af36cdccfe91a620f5555189792c13c4
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoFix some failing QAudioInput integration tests on OSX.
Michael Goddard [Mon, 9 Jul 2012 06:51:16 +0000 (16:51 +1000)]
Fix some failing QAudioInput integration tests on OSX.

This also meant implementing software volume support, and since
this is the last backend to do so, make that interface pure
virtual again.

In some cases the test needed tweaks.

Change-Id: Ie429863f187b43802cdd4f16d841929e0cb0e729
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoUse moniker display name for device string.
Lev Zelenskiy [Fri, 27 Jul 2012 01:35:17 +0000 (11:35 +1000)]
Use moniker display name for device string.

Moniker names are unique, while device friendly names are not.

Change-Id: Ic3e842e49d04c502cf5ad1fc40f89db657f0401a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
11 years agoAdded check to qsound and qsoundeffect unit tests for audio support
Kurt Korbatits [Tue, 31 Jul 2012 00:26:28 +0000 (10:26 +1000)]
Added check to qsound and qsoundeffect unit tests for audio support

- skip tests if QSoundEffect::supportedMimeTypes() returns empty list

Change-Id: I0f8d6f854c46b74f8518c4d969bd31ea167d20b2
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
11 years agoThe qt quick imports are build only if qtdeclarative is present
Corentin Jabot [Sat, 28 Jul 2012 12:31:11 +0000 (14:31 +0200)]
The qt quick imports are build only if qtdeclarative is present

If the declarative module is not present, the qtquick/qml plugins
in the imports directory will not be build

Change-Id: I2393b8302f75cbb94d3a85bd70f575817a0a3c34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
11 years agoAdd a missing include for Q_MULTIMEDIA_EXPORT
Thiago Macieira [Wed, 1 Aug 2012 14:06:18 +0000 (16:06 +0200)]
Add a missing include for Q_MULTIMEDIA_EXPORT

The macro is gone from qglobal.h.

Change-Id: I41c66f61f47ec9e824c3637c7748796df2309d66
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoUse QStandardPaths instead of QDesktopServices
Thiago Macieira [Wed, 1 Aug 2012 14:08:24 +0000 (16:08 +0200)]
Use QStandardPaths instead of QDesktopServices

The use of QDesktopServices for getting paths is deprecated in favour
of QStandardPaths.

Change-Id: I93c4a15dd65962d668c90e78f3f33f357e2450bb
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoQRegion::subtract is deprecated
Thiago Macieira [Wed, 1 Aug 2012 14:17:37 +0000 (16:17 +0200)]
QRegion::subtract is deprecated

This code was suspicious. It looks like it was broken, caught by the
gotcha that the old API was.

Change-Id: Ief9543de3b9fdf18f6b620c9462a75594a4a3903
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
11 years agoSet the Qt API level to compatibility mode in all tests.
Thiago Macieira [Wed, 1 Aug 2012 14:35:23 +0000 (16:35 +0200)]
Set the Qt API level to compatibility mode in all tests.

Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoQAbstractItemMode::reset() is deprecated, don't use it
Thiago Macieira [Wed, 1 Aug 2012 14:33:03 +0000 (16:33 +0200)]
QAbstractItemMode::reset() is deprecated, don't use it

Instead, use beginResetModel() before the model is reset, and add
endResetModel() after it.

Change-Id: Ibac3f2207ed999ed9d703266509b3ad91203f28d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoBlackberry: Assert that we are in detached state
Thomas McGuire [Mon, 30 Jul 2012 13:27:18 +0000 (15:27 +0200)]
Blackberry: Assert that we are in detached state

Change-Id: I744d542374c72318b548407cd3da084449822e92
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoBlackberry: Fix spurious position udpates in playlists
Thomas McGuire [Fri, 27 Jul 2012 11:19:11 +0000 (13:19 +0200)]
Blackberry: Fix spurious position udpates in playlists

Change-Id: I2652cab793034e55a4eb7e52bb534c22983d9517
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoBlackberry: Fix playlists not advancing to the next track.
Thomas McGuire [Fri, 27 Jul 2012 09:02:29 +0000 (11:02 +0200)]
Blackberry: Fix playlists not advancing to the next track.

The playlist watches for state changes to the EndOfMedia state, which
wasn't used in the plugin yet.

Change-Id: Ib2a014177df2273cd46baaef1392a73e54daf06c
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoBlackberry: Fix playback from certain URLs
Thomas McGuire [Thu, 26 Jul 2012 14:06:17 +0000 (16:06 +0200)]
Blackberry: Fix playback from certain URLs

Previously, playback from URLs of the form "file:path/to/file" did not
work.

Change-Id: Iecd293d09f7c448438dbf259710c0aab218c2591
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoFixed: use selected audio input device.
Lev Zelenskiy [Mon, 30 Jul 2012 02:08:00 +0000 (12:08 +1000)]
Fixed: use selected audio input device.

Change-Id: I6bde75bff93160169f9c28ad658db40b03c266f4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAudio probes for AudioCapture plugin.
Lev Zelenskiy [Mon, 30 Jul 2012 03:06:47 +0000 (13:06 +1000)]
Audio probes for AudioCapture plugin.

Change-Id: Iea37d455ee53c9d055af4f9ca62d8a9ea241d31f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoFix a few header style violations.
Michael Goddard [Fri, 27 Jul 2012 04:41:52 +0000 (14:41 +1000)]
Fix a few header style violations.

Missing Q_MODULE or using moc keywords.

Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoBlackberry: Fix case of setting multiple media files
Thomas McGuire [Thu, 26 Jul 2012 14:02:57 +0000 (16:02 +0200)]
Blackberry: Fix case of setting multiple media files

Abort the singleshot timer when the media is changed, as otherwise
continueLoadMedia() was called multiple times.
Also, don't use a singleshot timer when setting a null media.

Change-Id: I19d4838c9c70e7fcaa790c223cb19ac3e0246e6b
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoBlackberry: Fix metadata reader for more recent OS versions
Thomas McGuire [Fri, 27 Jul 2012 09:37:31 +0000 (11:37 +0200)]
Blackberry: Fix metadata reader for more recent OS versions

Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoDoc: Changed \qmlclass to \qmltype and added \instantiates
Jerome Pasion [Fri, 27 Jul 2012 12:51:00 +0000 (14:51 +0200)]
Doc: Changed \qmlclass to \qmltype and added \instantiates

-New qdoc command \qmltype replaces \qmlclass
-\instantiates <C++ class> for determining if the QML type has a C++
implementation

Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoReplace QSoundEffect backend using qmedia with qaudiooutput implementation
Kurt Korbatits [Wed, 18 Jul 2012 05:39:20 +0000 (15:39 +1000)]
Replace QSoundEffect backend using qmedia with qaudiooutput implementation

- Use backend built on QAudioOutput
- Fixed unit test so backend will pass

Change-Id: I2f2a7d8bf382127c5a5c333d6e36c79169754b4e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoFixed QDoc errors related to snippets and quotefromfile commands
Venugopal Shivashankar [Wed, 25 Jul 2012 13:17:28 +0000 (15:17 +0200)]
Fixed QDoc errors related to snippets and quotefromfile commands

Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoAdded data driven integration tests for qaudioinput.
Mylione Anadarajah [Tue, 17 Jul 2012 09:15:13 +0000 (19:15 +1000)]
Added data driven integration tests for qaudioinput.

Change-Id: I42256833173e9ca94931ff35210802457d407e39
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoVolume control for QAudioInput windows backend.
Lev Zelenskiy [Wed, 25 Jul 2012 03:23:57 +0000 (13:23 +1000)]
Volume control for QAudioInput windows backend.

Change-Id: I1245a38c68254fc48373a856dc44e8ad8142636e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoAdded check to alsa backend for QAudioOutput
Kurt Korbatits [Wed, 25 Jul 2012 02:28:23 +0000 (12:28 +1000)]
Added check to alsa backend for QAudioOutput

- Was asserting when stop() called when in IdleState

Change-Id: Ib8a5bd149c0b9c700c709520cf8ffdd237e08694
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoFix compile failure in qmediaplayer unit test
Kurt Korbatits [Wed, 25 Jul 2012 21:46:46 +0000 (07:46 +1000)]
Fix compile failure in qmediaplayer unit test

Change-Id: Ic8342f536b16c55c79e4ff792634d5d1a03e3a9a
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoMoved doc under src to fall in-line with the new modular structure
Venugopal Shivashankar [Thu, 19 Jul 2012 13:44:36 +0000 (15:44 +0200)]
Moved doc under src to fall in-line with the new modular structure

Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoMoved the C++ module page from qtdoc
Venugopal Shivashankar [Fri, 20 Jul 2012 09:47:11 +0000 (11:47 +0200)]
Moved the C++ module page from qtdoc

Change-Id: Ib4b3dbe48053532abc31d294f328d21e01047bb5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoQtMultiMedia/Tests: Fix MSVC2012 warning about overload.
Friedemann Kleint [Tue, 24 Jul 2012 12:53:25 +0000 (14:53 +0200)]
QtMultiMedia/Tests: Fix MSVC2012 warning about overload.

warning C4373: 'MockVideoSurface::supportedPixelFormats': virtual function
overrides 'QAbstractVideoSurface::supportedPixelFormats', previous versions
of the compiler did not override when parameters only differed by
const/volatile qualifiers.

Change-Id: I87701ce0a2db3d4a0ec0a98980ad231f352a2ab2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix compilation issue with MinGW (disables the usage of strsafe.h).
Lukas Geyer [Tue, 24 Jul 2012 11:12:45 +0000 (13:12 +0200)]
Fix compilation issue with MinGW (disables the usage of strsafe.h).

Recent versions of MinGW include strsafe.h in dshow.h.
strsafe.h undefines all non-safe string functions, including
vsprintf and others, to prevent their usage. This causes
QString and others to fail. Defining NO_DSHOW_STRSAFE before
including dshow.h prevents this behaviour.

Change-Id: I012fecbabc5c11900486c1dfdc970a00613ef6f7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoQtMultimedia: Remove usages of qWaitForWindowShown(QWidget *).
Friedemann Kleint [Tue, 24 Jul 2012 13:08:50 +0000 (15:08 +0200)]
QtMultimedia: Remove usages of qWaitForWindowShown(QWidget *).

Change-Id: I7a2869c381da133b72b1721838a458cdbf058b0d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoMark QtMultimediaQuickTools library as internal.
Stephen Kelly [Mon, 23 Jul 2012 07:34:14 +0000 (09:34 +0200)]
Mark QtMultimediaQuickTools library as internal.

It does not install useful public headers (and those that it does
install are installed to QtMultimediaQuick_p).

This causes the avoidance of creation of CMake files.

Change-Id: I7360f9c8e4b203ce0573c1cbfcc87d326e8f0d2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd the CMake directory created during unit testing to .gitignore.
Stephen Kelly [Mon, 23 Jul 2012 07:58:26 +0000 (09:58 +0200)]
Add the CMake directory created during unit testing to .gitignore.

Change-Id: I98a8c1a1231c558b75fd02419237546face4dfcf
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoBlackberry: Compile with lastest event filter API changes
Thomas McGuire [Mon, 23 Jul 2012 09:17:42 +0000 (11:17 +0200)]
Blackberry: Compile with lastest event filter API changes

Change-Id: I4eb7ddf050cd8ef34df4547482f53f7372584221
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: David Faure <faure@kde.org>
12 years agoReplaced endpoint control with audio input and output controls
Dmytro Poplavskiy [Mon, 16 Jul 2012 01:28:02 +0000 (11:28 +1000)]
Replaced endpoint control with audio input and output controls

Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed docs for QAudioInput::bufferSize and setBufferSize
Ali Akhtarzada [Mon, 23 Jul 2012 11:16:56 +0000 (13:16 +0200)]
Fixed docs for QAudioInput::bufferSize and setBufferSize

Change milliseconds to bytes

Task-number: QTBUG-26600

Change-Id: I861ae9c35ddc52d58ed95a2148f72d6476f35522
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed the QDoc errors related to \qmlproperty usage
Venugopal Shivashankar [Thu, 19 Jul 2012 13:41:31 +0000 (15:41 +0200)]
Fixed the QDoc errors related to \qmlproperty usage

Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoRemoved QEXPECT_FAIL for non reproducible showFullScreen bug on Mac
Dmytro Poplavskiy [Tue, 24 Jul 2012 02:50:40 +0000 (12:50 +1000)]
Removed QEXPECT_FAIL for non reproducible showFullScreen bug on Mac

Task-number: QTBUG-25310

Change-Id: If5786340386de5f6664ccfa45439858d209a45ba
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTest that the package configs for QtMultimedia work.
Stephen Kelly [Thu, 19 Jul 2012 14:15:13 +0000 (16:15 +0200)]
Test that the package configs for QtMultimedia work.

Change-Id: I17bbc52d6ab98cef4da6c56bfaa306a154a5aba2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdded volume property to QMediaRecorder
Dmytro Poplavskiy [Mon, 21 May 2012 02:09:50 +0000 (12:09 +1000)]
Added volume property to QMediaRecorder

Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoPorted QML camera example to QtQuick 2.0 and QtMultimedia 5.0
Dmytro Poplavskiy [Mon, 16 Jul 2012 06:40:57 +0000 (16:40 +1000)]
Ported QML camera example to QtQuick 2.0 and QtMultimedia 5.0

Removed controls not currently supported on Qt5 platforms
and added basic video capture mode

Change-Id: I1f188d31af770cfb6ebb65ab5ee4a5467abcfbeb
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoGst player backend: removed fifo based stream playback fallback
Dmytro Poplavskiy [Thu, 19 Jul 2012 05:40:42 +0000 (15:40 +1000)]
Gst player backend: removed fifo based stream playback fallback

It was used on systems without appsrc element support,
but since the appsrc is part of base elements for a long,
thre is a very little value in fifo based fallback.

Change-Id: I162233cbb55821443c892f00ebd29c0498ae7152
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoRemoved the playbackStateChanged signal from Video element
Dmytro Poplavskiy [Thu, 19 Jul 2012 04:12:05 +0000 (14:12 +1000)]
Removed the playbackStateChanged signal from Video element

It conflicts with Video.playbackState property notifications

Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoPlayer example histogram: Process frames on a separate thread
Lev Zelenskiy [Thu, 19 Jul 2012 04:55:52 +0000 (14:55 +1000)]
Player example histogram: Process frames on a separate thread

Change-Id: I6989f9ea9cb6e45c54ed75079a5b5748e15ee0d8
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoVideoprobe implementation for wmf backend.
Lev Zelenskiy [Thu, 19 Jul 2012 04:38:45 +0000 (14:38 +1000)]
Videoprobe implementation for wmf backend.

Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoAdded base and soundeffect test
Kurt Korbatits [Tue, 17 Jul 2012 03:32:54 +0000 (13:32 +1000)]
Added base and soundeffect test

Change-Id: I50527c75e5e25d897ddf192bfdc34de62dd56127
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoAdded an audio recording system test
dakovaci [Tue, 3 Jul 2012 06:31:31 +0000 (16:31 +1000)]
Added an audio recording system test

Added a systemtest for audio recording

Change-Id: Ie4af8145702f29b04c1e62184a9667b54123b8c6
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoFix QQuickCanvas renames.
Toby Tomkins [Wed, 18 Jul 2012 03:01:34 +0000 (13:01 +1000)]
Fix QQuickCanvas renames.

This is required because of name changes to QtDeclarative in the commit
feb996e3ab44e68082c97102556ea396f5df3f44.

Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAdded data driven integration tests for qaudiooutput.
Mylione Anadarajah [Mon, 16 Jul 2012 06:13:48 +0000 (16:13 +1000)]
Added data driven integration tests for qaudiooutput.

Change-Id: Ifde39817405557b073fbe60d612d01f48b9ec3ed
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoAdded volume control for QAudioOutput & QAudioInput (alsa)
Kurt Korbatits [Thu, 5 Jul 2012 23:56:38 +0000 (09:56 +1000)]
Added volume control for QAudioOutput & QAudioInput (alsa)

QTBUG-25454

- Added update to docs on volume control.
- Added internal volume adjustment for alsa implementation.
- Enabled float sample option in QAudioDeviceInfo (alsa).

Change-Id: I6b89fc8beb457d71be9ad71b538c86a008570f07
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoFix some QAudioInput errors on OSX.
Michael Goddard [Mon, 9 Jul 2012 06:49:03 +0000 (16:49 +1000)]
Fix some QAudioInput errors on OSX.

Default buffer size wasn't always calculated correctly, and the timer
used in push mode was sometimes incorrect.

Change-Id: Ic31b9d16e16e4c25a5ebfc302590829e179a96bf
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoApply insignificant flag to platform that is actually unstable.
Toby Tomkins [Thu, 12 Jul 2012 02:44:01 +0000 (12:44 +1000)]
Apply insignificant flag to platform that is actually unstable.

Change-Id: Ib0acc0413f3dcc5194dc5d93b071b3bb22b9eef9
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix for broken QML multimedia import on windows
Mithra Pattison [Wed, 11 Jul 2012 03:37:27 +0000 (13:37 +1000)]
Fix for broken QML multimedia import on windows

Changed qtmultimediaquicktools into a module so that it gets installed
to the bin directory. This allows the declarative_multimedia library
to locate it during the 'import multimedia' process.

Task-number: QTBUG-25984

Change-Id: I559469170bc713fb31633917bcbc210f862660cf
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoUpdate example QML to follow API change
Mithra Pattison [Fri, 13 Jul 2012 03:30:27 +0000 (13:30 +1000)]
Update example QML to follow API change

QML for ListView API in qmlvideo and qmlvideofx was modified.
Usage of this API in FileBrowser file required changes to
follow the new API.

Change-Id: I3da25ed5bc696a72cdefc6c72d2ab95c319b758c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoCamerabin camera service: configure default video settings
Dmytro Poplavskiy [Fri, 13 Jul 2012 01:12:06 +0000 (11:12 +1000)]
Camerabin camera service: configure default video settings

encodebin doesn't like the encoding profile with ANY
container caps, if container and codecs are not specified
try to find a commonly used supported combination

Change-Id: Icbde042bd17d9682112fb8bbb8f0d506f6ddebe1
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoUpdated the camerabin2 based camera with QtMultimedia changes
Dmytro Poplavskiy [Mon, 16 Jul 2012 00:55:20 +0000 (10:55 +1000)]
Updated the camerabin2 based camera with QtMultimedia changes

Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace

Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix include path error in shadow build of audiorecorder example
Mithra Pattison [Wed, 11 Jul 2012 01:18:47 +0000 (11:18 +1000)]
Fix include path error in shadow build of audiorecorder example

Change-Id: Iafe726c4b84b728d084b3085bb13e5055e96bb8b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoUpdated qaudioinput and qaudiooutput tests.
Kurt Korbatits [Sun, 15 Jul 2012 22:17:58 +0000 (08:17 +1000)]
Updated qaudioinput and qaudiooutput tests.

- qaudioinput changed to checking notify signal emitted
  instead of range checking as on loaded system this is not valid.
- Added qskip's for resume() bug.

Change-Id: I8d2a52427d4263ce8b5edeaaf395c4577b7394ab
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoFixed error in qaudioinput alsa backend for invalid format.
Kurt Korbatits [Sun, 15 Jul 2012 22:43:57 +0000 (08:43 +1000)]
Fixed error in qaudioinput alsa backend for invalid format.

QTBUG-26523
- Was QAudioOutput. Changed to QAudioInput.

Change-Id: I04f7d38af5cb67c420adef188b81b237b6e06b97
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoFix a crash problem in AudioEngine due to class name change.
Ling Hu [Fri, 13 Jul 2012 03:25:57 +0000 (13:25 +1000)]
Fix a crash problem in AudioEngine due to class name change.

Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed qaudioinput and qaudiooutput tests running on loaded system
Kurt Korbatits [Thu, 12 Jul 2012 02:32:48 +0000 (12:32 +1000)]
Fixed qaudioinput and qaudiooutput tests running on loaded system

- Changed tests to handle running on loaded or very slow systems
- notify signal checks that signals are emitted but not number of
  as these are time related and number of emitted signals could
  vary greatly on slow or loaded systems.
- Added skip for CI system pushSuspendResume with pulseaudio backend.

Change-Id: I0abf242934507454cc992fe8daec46d6acaa2836
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoReplace insignificant flag for mac with QEXPECT_FAIL. Keep for win32.
Toby Tomkins [Thu, 12 Jul 2012 03:53:58 +0000 (13:53 +1000)]
Replace insignificant flag for mac with QEXPECT_FAIL. Keep for win32.

Change-Id: Ied8519294e34d74ef854baa5be5cba2972a7f33c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoSpecify the platform on which test is insignificant.
Toby Tomkins [Thu, 12 Jul 2012 03:59:55 +0000 (13:59 +1000)]
Specify the platform on which test is insignificant.

Change-Id: I24230693f6a53ac975bfc92d82f39ce065334036
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoSkip crashing tests and replace insignificant tests with QEXPECT_FAIL.
Toby Tomkins [Wed, 11 Jul 2012 06:06:37 +0000 (16:06 +1000)]
Skip crashing tests and replace insignificant tests with QEXPECT_FAIL.

Task-number: QTBUG-25310
Task-number: QTBUG-26481

Change-Id: Ib6cbbe4f23a7ad7ea72db0f686aa5b2c96eeff76
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUpdate the export macros in qtmultimedia.git
Thiago Macieira [Fri, 22 Jun 2012 09:08:07 +0000 (11:08 +0200)]
Update the export macros in qtmultimedia.git

Use the new, simpler QT_STATIC macro.

Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agouse centralized qml plugin project handling
Oswald Buddenhagen [Mon, 9 Jul 2012 17:01:15 +0000 (19:01 +0200)]
use centralized qml plugin project handling

Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:39:25 +0000 (21:39 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: I9f4b70bf2dc19dc75e6490a7c5430b11add0b0f5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAudioprobe implementation for wmf backend.
Lev Zelenskiy [Wed, 11 Jul 2012 05:06:40 +0000 (15:06 +1000)]
Audioprobe implementation for wmf backend.

Change-Id: I63af91af870cb92c838c1ab5d4752815aa60a03f
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoClarify API/docs by introducing the audio "frame", and add helpers.
Michael Goddard [Tue, 10 Jul 2012 04:26:58 +0000 (14:26 +1000)]
Clarify API/docs by introducing the audio "frame", and add helpers.

The frame is the interleaved set of one sample for each channel.  Add
some docs and some methods that make working with samples a bit more
convenient.

Adjusted QAudioBuffer to use these helper functions and terminology.

Change-Id: I96db48e659561972d6de2aa19893d29f9a828cd3
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAdding script which will run automated testcases.
Mylione Anadarajah [Tue, 10 Jul 2012 00:41:34 +0000 (10:41 +1000)]
Adding script which will run automated testcases.

Change-Id: I586b6a52c3c3fea508ca0d4d1d8f7eb9c3b3716f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoAdded wmf implementation for QAudioDecoderControl
Ling Hu [Thu, 5 Jul 2012 04:47:42 +0000 (14:47 +1000)]
Added wmf implementation for QAudioDecoderControl

Change-Id: Ib6d5c93577bd55995a9ae51e757156149890f15d
Reviewed-by: Jun Zhu <jun.5.zhu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed qaudioinput unit test with pulseaudio backend
Kurt Korbatits [Tue, 10 Jul 2012 21:54:31 +0000 (07:54 +1000)]
Fixed qaudioinput unit test with pulseaudio backend

- notify signal wasn't being emitted enough.
- range checking on processedUSecs extended.

Change-Id: Icfa1f3b364a7e0f9d3f37abd8dc5ed0c1e22f923
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoAdded some directories for coming systemtests
dakovaci [Tue, 3 Jul 2012 04:44:08 +0000 (14:44 +1000)]
Added some directories for coming systemtests

Some directories missing needed for coming tier 1 systemtests

Change-Id: Ie22e91e5011960687daed29cf6442271c97d3352
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoUpdate ALSA device enumeration to return all devices
Mithra Pattison [Thu, 28 Jun 2012 05:40:16 +0000 (15:40 +1000)]
Update ALSA device enumeration to return all devices

Previously, if a device was marked as "Default Audio Device" then
only this device would be returned during device enumeration. Now
it returns all devices, with the default device placed first.

Task-number: QTBUG-22103
Change-Id: I1705415bf6b58ff046c4d2812107b46b76500001
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoDelete obsolete class methods and update related code
Mithra Pattison [Tue, 10 Jul 2012 03:26:48 +0000 (13:26 +1000)]
Delete obsolete class methods and update related code

Delete obsolete methods from QAudioFormat and QAudioDeviceInfo
and update code that relied on the obsolete methods.

Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix typo in config test name.
Michael Goddard [Tue, 10 Jul 2012 02:19:55 +0000 (12:19 +1000)]
Fix typo in config test name.

Change-Id: Ic89cb21f9098591c97f780bd50248686f4da3919
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
12 years agoUpdated QAudioOutput and QAudioInput system tests
Kurt Korbatits [Sun, 8 Jul 2012 23:13:29 +0000 (09:13 +1000)]
Updated QAudioOutput and QAudioInput system tests

- Updated tests with volume checking.
- Updated reset function in QAudioInput test.
  (Checking bytesReady() in pull mode is not valid)
  (Checking state after writing one byte doesn't guarantee going to active state)
- Improved stability in CI system

Change-Id: I8018bfbc163971bcb3d5f7b7a1ece6306e75ed07
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoBlackberry: Fix erratic video resize behaviour
Thomas McGuire [Mon, 9 Jul 2012 07:25:34 +0000 (09:25 +0200)]
Blackberry: Fix erratic video resize behaviour

Change-Id: I699e7f81abb73e75eca2ddda22c7e5f2e852fcd5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTurned back on some disabled unit tests as insignificant tests
Kurt Korbatits [Sun, 8 Jul 2012 23:05:26 +0000 (09:05 +1000)]
Turned back on some disabled unit tests as insignificant tests

- qaudiodecoderbackend, qaudiodeviceinfo, qaudiooutput, qaudioinput,
  qmediaplayerbackend, qsound, qsoundeffect enabled as insignificant tests.
- skip iteration over all formats if QT_TEST_CI environement set (CI system)

Change-Id: I6692dcb817445870784193c0f78c0d5f7a201063
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoGst capture: use QDesktopServices for default storage location
Dmytro Poplavskiy [Thu, 5 Jul 2012 03:30:47 +0000 (13:30 +1000)]
Gst capture: use QDesktopServices for default storage location

Change-Id: Icff46f2dc88572beab2eb835e24424f15ff05616
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoGst audio input: use autoaudiosrc as default device
Dmytro Poplavskiy [Thu, 5 Jul 2012 03:28:23 +0000 (13:28 +1000)]
Gst audio input: use autoaudiosrc as default device

Currently pulsesrc element is selected if it's installed,
even if pulseaudio is not used.

Change-Id: I7e23e647767116955e24e3681155f9cb5f6d8574
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix a potential leak in wmf
Ling Hu [Wed, 4 Jul 2012 04:47:32 +0000 (14:47 +1000)]
Fix a potential leak in wmf

Change-Id: I4fc039aeaf00a02122d5e11867c73223cc2ebbc1
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoGst capture: report the actual media location to application
Dmytro Poplavskiy [Mon, 2 Jul 2012 07:48:24 +0000 (17:48 +1000)]
Gst capture: report the actual media location to application

Change-Id: I2ebc7b9607fe499e2465428118bff3fe98e58672
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix internal compiler error of MSVC2012.
Friedemann Kleint [Mon, 2 Jul 2012 10:24:12 +0000 (12:24 +0200)]
Fix internal compiler error of MSVC2012.

Default to QLatin1String.

Change-Id: I20b74f77ee0828a1c2b1337a3ab2e0012c8df06e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoMoved some files to different dir's
dakovaci [Tue, 3 Jul 2012 06:28:16 +0000 (16:28 +1000)]
Moved some files to different dir's

Just some rearanging to be done.

Change-Id: Ib76403c3cf41cb1d1502ed2f94bdc066321e637d
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
12 years agoEdited radio systemtests to support tier 1 platforms
dakovaci [Tue, 3 Jul 2012 04:36:56 +0000 (14:36 +1000)]
Edited radio systemtests to support tier 1 platforms

Some tests were not compatable to tier 1 platforms

Change-Id: Ibf3221f638b5a52159e6f3004f1a6da7ef83785e
Reviewed-by: Daron Andrew Edie <daron.edie@nokia.com>
12 years agoRemoved some system tests not applicatple to tier 1 platforms
dakovaci [Thu, 28 Jun 2012 06:38:44 +0000 (16:38 +1000)]
Removed some system tests not applicatple to tier 1 platforms

Change-Id: I24ab04409593f4b046aec55a1e467e3bb4b08464
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
12 years agoFix installation of spectrum example
Mithra Pattison [Fri, 29 Jun 2012 03:47:15 +0000 (13:47 +1000)]
Fix installation of spectrum example

Fixed setup of spectrum project, to correctly install the spectrum
executable.

Task-number: QTBUG-13018
Change-Id: Ifcc55d02cf0e50f9c1015fa89b5f2d851b2a44c4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed QML video playback on Mac
Dmytro Poplavskiy [Wed, 20 Jun 2012 07:57:45 +0000 (17:57 +1000)]
Fixed QML video playback on Mac

Use the same CIImage based video frames as with
QGraphicsVideoItem, but since CIImages can't be
rendered directly in Scene Graph,
the frame is rendered to FBO first.

Task-number: QT-5423
Change-Id: I16f7e6351578bae21f8642a8028538c441e1f544
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoGst Capture: image capture fixes
Dmytro Poplavskiy [Fri, 29 Jun 2012 04:21:58 +0000 (14:21 +1000)]
Gst Capture: image capture fixes

Report camera is ready to capture only in image capture modes;
Emit capture failed if camera not configured for capture

Change-Id: Ia2b92e2f8c760db948185a29c3e5ceae81dd3af4
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoGst capture service: capture mode fixes
Dmytro Poplavskiy [Fri, 29 Jun 2012 03:35:41 +0000 (13:35 +1000)]
Gst capture service: capture mode fixes

Fixed reporting the current capture mode
Set the correct default capture mode
Allow viewfinder only and Video+Image capture modes

Change-Id: Ib12504304bca22fe664631ff5ffbc0a392ba34a8
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
12 years agoGst capture: don't wait for pipeline to stop
Dmytro Poplavskiy [Fri, 29 Jun 2012 02:18:54 +0000 (12:18 +1000)]
Gst capture: don't wait for pipeline to stop

State changes to lower state are synchronous in gstreamer

Change-Id: Ib87eabfeee9ec100f24efbaa989ec909ac7f9a1b
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoAllow gst video capture startup without viewfinder attached.
Dmytro Poplavskiy [Fri, 29 Jun 2012 02:13:58 +0000 (12:13 +1000)]
Allow gst video capture startup without viewfinder attached.

Change-Id: I5f0b7dc12f4ee8e988d6107047d963949bcdb5bf
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoFixed a testing bug on windows platform.
bigbearzhu [Wed, 27 Jun 2012 05:18:31 +0000 (15:18 +1000)]
Fixed a testing bug on windows platform.

Change-Id: Iaf11864e6929345b105cdd185b4bb01b24961406
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoRefactoring wmf plugin
Ling Hu [Thu, 28 Jun 2012 05:27:13 +0000 (15:27 +1000)]
Refactoring wmf plugin

make mf startup/shutdwon inside plugin instead of player component
make sourceresolver a common component for a wmf related tasks.

Change-Id: I49cdc4fa512a62398a68cd2be2f522f567d11c7c
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed a WMF seek bug.
Ling Hu [Thu, 28 Jun 2012 06:55:52 +0000 (16:55 +1000)]
Fixed a WMF seek bug.

Change-Id: I1f077a045dad94127e747dd3f8c8566559aef5a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoRename availabilityError to availability.
Michael Goddard [Mon, 25 Jun 2012 00:53:26 +0000 (10:53 +1000)]
Rename availabilityError to availability.

It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoRename a few controls.
Michael Goddard [Wed, 20 Jun 2012 06:04:57 +0000 (16:04 +1000)]
Rename a few controls.

The encoder controls could be confused with actual encoding, so make
clear they are just settings.  Also, the end point selector controls
were not named very well.

Change-Id: I27f8bf9c865c5f295abad97c01ef98752af42613
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoLocate qdoc on Windows correctly.
Friedemann Kleint [Thu, 28 Jun 2012 10:10:07 +0000 (12:10 +0200)]
Locate qdoc on Windows correctly.

Change-Id: I1a7ac5293f76b62e467208b59948d58032c2a2cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>