Commit Graph

633 Commits

Author SHA1 Message Date
Venugopal Shivashankar
f930e088fc Moved doc under src to fall in-line with the new modular structure
Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-25 15:00:59 +02:00
Venugopal Shivashankar
ef144b647f Moved the C++ module page from qtdoc
Change-Id: Ib4b3dbe48053532abc31d294f328d21e01047bb5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-25 10:07:45 +02:00
Friedemann Kleint
59e78d78c9 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>
2012-07-25 03:27:17 +02:00
Lukas Geyer
db4576fa02 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>
2012-07-25 03:27:14 +02:00
Friedemann Kleint
f495216fad QtMultimedia: Remove usages of qWaitForWindowShown(QWidget *).
Change-Id: I7a2869c381da133b72b1721838a458cdbf058b0d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-07-24 16:53:14 +02:00
Stephen Kelly
1eb6bdb4ba 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>
2012-07-24 13:31:27 +02:00
Stephen Kelly
3110de97b6 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>
2012-07-24 12:14:14 +02:00
Thomas McGuire
ace2c75167 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>
2012-07-24 10:12:35 +02:00
Dmytro Poplavskiy
ae728a4b1e Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-24 09:49:47 +02:00
Ali Akhtarzada
29a2d09a43 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>
2012-07-24 07:58:22 +02:00
Venugopal Shivashankar
79107a3899 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>
2012-07-24 07:58:20 +02:00
Dmytro Poplavskiy
67093abf53 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>
2012-07-24 04:59:04 +02:00
Stephen Kelly
e558ed1680 Test that the package configs for QtMultimedia work.
Change-Id: I17bbc52d6ab98cef4da6c56bfaa306a154a5aba2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-20 07:28:09 +02:00
Dmytro Poplavskiy
36ff2fe85e Added volume property to QMediaRecorder
Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:53 +02:00
Dmytro Poplavskiy
0d0e89b1e8 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>
2012-07-19 09:08:52 +02:00
Dmytro Poplavskiy
f844d6d9da 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>
2012-07-19 09:08:50 +02:00
Dmytro Poplavskiy
6854f07257 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>
2012-07-19 09:08:48 +02:00
Lev Zelenskiy
b915c5e0e7 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>
2012-07-19 09:08:47 +02:00
Lev Zelenskiy
b7f4b2decb Videoprobe implementation for wmf backend.
Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:45 +02:00
Kurt Korbatits
d7ed7ef6b3 Added base and soundeffect test
Change-Id: I50527c75e5e25d897ddf192bfdc34de62dd56127
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
2012-07-19 07:44:06 +02:00
dakovaci
34ec182e6d Added an audio recording system test
Added a systemtest for audio recording

Change-Id: Ie4af8145702f29b04c1e62184a9667b54123b8c6
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
2012-07-19 06:25:15 +02:00
Toby Tomkins
b95f608612 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>
2012-07-18 05:11:00 +02:00
Mylione Anadarajah
0e550eaae9 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>
2012-07-17 09:05:58 +02:00
Kurt Korbatits
1ac9318645 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>
2012-07-17 07:03:48 +02:00
Michael Goddard
8c12864361 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>
2012-07-16 08:41:27 +02:00
Toby Tomkins
f4e83a3a27 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>
2012-07-16 08:41:07 +02:00
Mithra Pattison
858baa7d90 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>
2012-07-16 08:40:43 +02:00
Mithra Pattison
9a3538fc50 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>
2012-07-16 07:18:21 +02:00
Dmytro Poplavskiy
864ab3a39a 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>
2012-07-16 07:18:15 +02:00
Dmytro Poplavskiy
b6a8c713bc 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>
2012-07-16 07:18:12 +02:00
Mithra Pattison
fdc197d614 Fix include path error in shadow build of audiorecorder example
Change-Id: Iafe726c4b84b728d084b3085bb13e5055e96bb8b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-16 07:18:02 +02:00
Kurt Korbatits
9ed0d5e177 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>
2012-07-16 05:33:04 +02:00
Kurt Korbatits
5daa9c340c 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>
2012-07-16 05:33:03 +02:00
Ling Hu
0e846f36cb Fix a crash problem in AudioEngine due to class name change.
Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-13 06:46:39 +02:00
Kurt Korbatits
59bfb014c8 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>
2012-07-13 04:06:54 +02:00
Toby Tomkins
5f06930b16 Replace insignificant flag for mac with QEXPECT_FAIL. Keep for win32.
Change-Id: Ied8519294e34d74ef854baa5be5cba2972a7f33c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-13 01:06:17 +02:00
Toby Tomkins
8509e390ae Specify the platform on which test is insignificant.
Change-Id: I24230693f6a53ac975bfc92d82f39ce065334036
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-07-12 07:10:25 +02:00
Toby Tomkins
abb2f543cd 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>
2012-07-12 05:01:24 +02:00
Thiago Macieira
940f14c3b6 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>
2012-07-11 23:48:29 +02:00
Oswald Buddenhagen
d18eadc8ab 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>
2012-07-11 23:48:23 +02:00
Oswald Buddenhagen
4bf74dece7 use centralized handling of QT_BUILD_PARTS
Change-Id: I9f4b70bf2dc19dc75e6490a7c5430b11add0b0f5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 23:48:03 +02:00
Lev Zelenskiy
afe12ea4de Audioprobe implementation for wmf backend.
Change-Id: I63af91af870cb92c838c1ab5d4752815aa60a03f
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-07-11 08:01:45 +02:00
Michael Goddard
4d13a15bae 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>
2012-07-11 08:01:45 +02:00
Mylione Anadarajah
68079a5e22 Adding script which will run automated testcases.
Change-Id: I586b6a52c3c3fea508ca0d4d1d8f7eb9c3b3716f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-11 06:58:29 +02:00
Ling Hu
48c945bac3 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>
2012-07-11 06:56:18 +02:00
Kurt Korbatits
51d7737c19 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>
2012-07-11 06:31:30 +02:00
dakovaci
9025bec242 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>
2012-07-10 11:50:04 +02:00
Mithra Pattison
8879945567 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>
2012-07-10 09:18:21 +02:00
Mithra Pattison
53fdcca366 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>
2012-07-10 08:26:04 +02:00
Michael Goddard
952bd004be Fix typo in config test name.
Change-Id: Ic89cb21f9098591c97f780bd50248686f4da3919
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
2012-07-10 04:25:44 +02:00