platform/upstream/qtmultimedia.git
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>
12 years agoRead actual period size after initializing a stream.
Lev Zelenskiy [Thu, 28 Jun 2012 05:04:09 +0000 (15:04 +1000)]
Read actual period size after initializing a stream.

QTBUG-23833

Change-Id: I2bd352cf34d12e1be22f640c47fc2388dc3a7f8a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix header path for audio engine on Mac.
Michael Goddard [Wed, 27 Jun 2012 07:07:44 +0000 (17:07 +1000)]
Fix header path for audio engine on Mac.

There's a different prefix here.

Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAllow frequences up to 96000 in QAudioInput win32 backend.
Lev Zelenskiy [Wed, 27 Jun 2012 06:06:45 +0000 (16:06 +1000)]
Allow frequences up to 96000 in QAudioInput win32 backend.

QTBUG-26102

Change-Id: I1c594f7df4aea2292045e1e96f58926d97bcfd82
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed timeout on waiting for positionChanged event.
bigbearzhu [Tue, 26 Jun 2012 06:06:39 +0000 (16:06 +1000)]
Fixed timeout on waiting for positionChanged event.

Change-Id: I894af066073f601e5838dbd47eb92da516c04544
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFixed plugin dir error on Windows.
bigbearzhu [Tue, 26 Jun 2012 05:26:28 +0000 (15:26 +1000)]
Fixed plugin dir error on Windows.

Change-Id: I470877d988fb70915607b65c4f17eee1adb8049d
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoClean buffers before closing the input device.
Lev Zelenskiy [Tue, 26 Jun 2012 02:45:58 +0000 (12:45 +1000)]
Clean buffers before closing the input device.

Input device handle is invalid after waveInClose()
QTBUG-24119

Change-Id: I8276e56766684efd26b78dc019ff871ebac28408
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agosyncX() doesn't do anything anymore. Remove it.
Thiago Macieira [Tue, 26 Jun 2012 15:33:27 +0000 (17:33 +0200)]
syncX() doesn't do anything anymore. Remove it.

Change-Id: Id15af428e1d04606564bad093847b3dc5a731e85
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAdd blackberry backend
Thomas McGuire [Tue, 3 Apr 2012 13:26:56 +0000 (15:26 +0200)]
Add blackberry backend

Change-Id: I88be743f0cad94d4beabdae917758be7e4293bfd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAdded support for big endian data to QAudioOutput win32 backend.
Lev Zelenskiy [Tue, 26 Jun 2012 04:03:54 +0000 (14:03 +1000)]
Added support for big endian data to QAudioOutput win32 backend.

Convert data from big endian to little endian.
QTBUG-19881

Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoRemove insignificant flag from tests that are passing.
Toby Tomkins [Mon, 25 Jun 2012 07:13:24 +0000 (17:13 +1000)]
Remove insignificant flag from tests that are passing.

Change-Id: I246d7cfa79cbbbee3cfc4a354b38c155aa887aa2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd expected fail flags for consistently failing autotests.
Toby Tomkins [Tue, 26 Jun 2012 05:22:16 +0000 (15:22 +1000)]
Add expected fail flags for consistently failing autotests.

Task-number: QTBUG-26320

Change-Id: I58624a8c39c0c247d9073097616a7a78e7e307da
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix crash in audioinput and audiooutput examples.
Lev Zelenskiy [Tue, 26 Jun 2012 02:07:20 +0000 (12:07 +1000)]
Fix crash in audioinput and audiooutput examples.

Do not call tr while initializing static objects.

Change-Id: Ia75ddd53ae22b0e4179f174da7d933156744e261
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoFixed a testing bug.
bigbearzhu [Tue, 26 Jun 2012 00:48:26 +0000 (10:48 +1000)]
Fixed a testing bug.

Change-Id: Iff7fb6d4de2f38fde37019ea7e8b034707f8bbe1
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agobuild system cleanups
Oswald Buddenhagen [Tue, 22 May 2012 17:17:51 +0000 (19:17 +0200)]
build system cleanups

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL
  - pointless and commented out include and depend paths
  - qmake -project boilerplate

Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agofix bogus conditional
Oswald Buddenhagen [Thu, 5 Apr 2012 14:04:20 +0000 (16:04 +0200)]
fix bogus conditional

this code meant (alsa && linux) || openbsd || freebsd, which is
presumably not what was meant.
but the os test seems rather pointless in the first place, so just
remove it.

Change-Id: I2591c9307ab9d6e821625b24797259ed60e9a082
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoswitch to new-style configure tests
Oswald Buddenhagen [Thu, 5 Apr 2012 12:29:09 +0000 (14:29 +0200)]
switch to new-style configure tests

Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoauto-generate module pris
Oswald Buddenhagen [Thu, 12 Apr 2012 09:07:13 +0000 (11:07 +0200)]
auto-generate module pris

Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoAdd default initialisation to various multimedia classes
Mithra Pattison [Wed, 30 May 2012 05:31:39 +0000 (15:31 +1000)]
Add default initialisation to various multimedia classes

Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
12 years agoFixed some crash with WMF backend
Ling Hu [Thu, 21 Jun 2012 06:18:05 +0000 (16:18 +1000)]
Fixed some crash with WMF backend

Change-Id: I721ba049e2ecafff53ee70d5b930fb52c15fbe09
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix namespace compilation.
Toby Tomkins [Thu, 21 Jun 2012 03:37:23 +0000 (13:37 +1000)]
Fix namespace compilation.

Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd a few things to the .gitignore file.
Michael Goddard [Mon, 25 Jun 2012 01:16:27 +0000 (11:16 +1000)]
Add a few things to the .gitignore file.

A few Mac specific things, plus .o files.

Change-Id: I7273977666a07cdf39cf0916bc5c2dbede30af05
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoAdd the QtBase/lib directory as a library path, not just frameworks.
Michael Goddard [Mon, 25 Jun 2012 04:24:16 +0000 (14:24 +1000)]
Add the QtBase/lib directory as a library path, not just frameworks.

This meant that any non-framework libraries there weren't found (like
the multimedia helper libraries).

Change-Id: Iacd99f82763d39fc47c779c9498dfd5e1cc0e743
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoFix QAudioOutput volume on OSX.
Michael Goddard [Wed, 20 Jun 2012 05:53:39 +0000 (15:53 +1000)]
Fix QAudioOutput volume on OSX.

Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoFix target executable name in audiooutput example
Mithra Pattison [Wed, 20 Jun 2012 05:00:48 +0000 (15:00 +1000)]
Fix target executable name in audiooutput example

Change-Id: I4481879366f136370f4bd549bb2ef2f8764cf821
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoRemove the USE_COCOA #ifdef, it's always defined now.
Michael Goddard [Wed, 20 Jun 2012 05:03:47 +0000 (15:03 +1000)]
Remove the USE_COCOA #ifdef, it's always defined now.

Change-Id: If3528cdfda647fa3cfba3c310bc9816b8b1e0344
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
12 years agoEnabled wmf plugin on Windows again
Ling Hu [Wed, 20 Jun 2012 02:01:24 +0000 (12:01 +1000)]
Enabled wmf plugin on Windows again

Change-Id: Ia1fe3ef6ec8f70888c7beb390678935ad9995a90
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agofix volume handling on Windows
Maurice Kalinowski [Tue, 19 Jun 2012 10:32:32 +0000 (12:32 +0200)]
fix volume handling on Windows

volume handling for QAudioOutput is broken currently as it fallbacks to
the default implementation.
Need to cache the volume, as hWaveOut is invalid while the output is not
in active state.

Task-number: QTBUG-25454
Change-Id: I2adb28a5e6719a5d3c360553abd70af46b646080
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoQIODevice* is used, but QIODevice was never declared
Thiago Macieira [Tue, 19 Jun 2012 10:24:37 +0000 (12:24 +0200)]
QIODevice* is used, but QIODevice was never declared

After I made qpair.h no longer include qdatastream.h, which included
qiodevice.h.

Change-Id: Icae2b466e022d3394ce5cafceeb4ea6601f6d33f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix a number of other qdoc issues.
Michael Goddard [Wed, 13 Jun 2012 03:52:05 +0000 (13:52 +1000)]
Fix a number of other qdoc issues.

* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs

Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
12 years agoTweak the controls documentation.
Michael Goddard [Thu, 14 Jun 2012 05:03:30 +0000 (15:03 +1000)]
Tweak the controls documentation.

Also move the qaudioendpointselector control into controls.

Change-Id: Ia21f98a683eb38a9c11c42f6e7901d7d841aae90
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
12 years agoReplace a writable position() property with a seek() method.
Michael Goddard [Tue, 12 Jun 2012 07:18:03 +0000 (17:18 +1000)]
Replace a writable position() property with a seek() method.

Seeking is sometimes asynchronous, and more importantly nearly every
one using a slider for seeking ends up with a binding loop.

Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
12 years agoUpdating brief layout of QML types
Angus Cummings [Thu, 14 Jun 2012 01:49:54 +0000 (11:49 +1000)]
Updating brief layout of QML types

Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
12 years agoMore doc things
Angus Cummings [Thu, 14 Jun 2012 01:03:33 +0000 (11:03 +1000)]
More doc things

Changing case in some titles
Other misc wording changes

Change-Id: Ie56a390de0c5ee8f80876555d3d9139819fc5a73
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoUpdate folderlistmodel import to version 2
Alan Alpert [Thu, 14 Jun 2012 01:29:04 +0000 (11:29 +1000)]
Update folderlistmodel import to version 2

To help distinguish the QtQuick 1 and QtQuick 2 versions of
folderlistmodel, the QtQuick 2 version is now version 2 of
folderlistmodel.

Depends on e824fa97e4a9fbaa0c850274b448568953692240 in qtdeclarative

Change-Id: Ic30c255ecb4c7b12dcf624b4b1d51cbc82b779df
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoFix build on Windows with new qdatetime.h that doesn't redefine min/max
Simon Hausmann [Wed, 13 Jun 2012 10:13:36 +0000 (12:13 +0200)]
Fix build on Windows with new qdatetime.h that doesn't redefine min/max

Windows system header files redefine min/max, unless NOMINMAX is defined.
In some cases we can simply include qt_windows.h, which does the trick,
in other cases including qt_windows.h produces different compilation
errors and it's simpler to just do the NOMINMAX trick.

Change-Id: I3cf81bab7c239363adfa274f158bdf999d1d3ecd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>