summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add the hasAudio/hasVideo properties from MediaPlayer to Video.Michael Goddard2012-02-172-0/+16
| | | | | | Change-Id: I167184c3622c4fcb0843b17f2ab803b0bbf104fa Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend for audio decoder service.Lev Zelenskiy2012-02-175-74/+247
| | | | | | | Includes basic integration test. Change-Id: I4c6d1dbefa1f27e107b3556a3d4da58811eeb122 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QAudioDecoderControl::sourceChanged signal.Lev Zelenskiy2012-02-173-0/+10
| | | | | | | | | | The signal is mentioned in QAudioDecoder but is missing from QAudioDecoderControl. Change-Id: I0cd13c53541585098edd02093858501ffb5af1fb Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a partial gstreamer based audio decoder service.Michael Goddard2012-02-1712-11/+916
| | | | | | | Doesn't work yet. Change-Id: Iebd085d68346cb73af8df59c84e8e52a17de2a52 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Use a PA function to compare specs instead of memcmp.Michael Goddard2012-02-171-1/+1
| | | | | | | | Otherwise valgrind complains a lot. Probably holes in the spec structure. Change-Id: I9580a73255820f49c0ac947eed1595a758f19ccd Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add Video_4.qml to the packaging.Michael Goddard2012-02-171-1/+1
| | | | | | Change-Id: I0a6036a979ab00a2885c56450d1db9497b1cff0c Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QMediaRecorder: GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-163-0/+113
| | | | | | | | QGstreamerCaptureSession: Using GStreamer buffer probe to access media data. Change-Id: I2ee38e864fbd69fcba9efe90d4dcf138528e00c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* GStreamer backend changes for media probing API.Lev Zelenskiy2012-02-1612-14/+695
| | | | | | | | QGstreamerPlayerSession: Using GStreamer buffer probes to access media data. Change-Id: Ibc056283fdedaebba90456cc4e86ab63eae5f5f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix some compiler warnings.Michael Goddard2012-02-146-21/+14
| | | | | | | | | As it turns out, we had an overloaded virtual from an earlier era, with the extra parameter never used. So cleaning that up was a bonus to remove the compiler warning. Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Tweak some more documentation.Michael Goddard2012-02-147-143/+106
| | | | | | | | | | | A lot of the previous Qt Mobility API methods were still present, so they are gone now. Also removed some of the C++ documentation since it's not public API anyway. Made a group for camera QML APIs and used that for the list in the camera overview documentation. Change-Id: I0864bd2230a42596e951b68d0df1211766c90dfc Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Documentation updates for declarative camera elements.Michael Goddard2012-02-137-38/+358
| | | | | | | A number of things were missing. Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed gst bus helper when qt build without glib supportDmytro Poplavskiy2012-02-101-92/+39
| | | | | | | | The bus helper should not be singleton. Also combined glib and non glib cases. Change-Id: Ie18a94bfdb5413a92a5c4ff4283527360737d52d Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to media probing API.Lev Zelenskiy2012-02-108-2/+56
| | | | | | | Added flush signals. Change-Id: I9c124317e843c9b9011e69c44649ae9a4e974161 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added location specific metadata keys.Dmytro Poplavskiy2012-02-092-0/+76
| | | | | | | | Tags names and meaning matches the exif specification, except of latitude and longitude following Qt Location format. Change-Id: I2acc0194f129ccc737b0fd00ca4ebfb6b62ebdca Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add some recent things to the overview docs.Michael Goddard2012-02-099-11/+31
| | | | | | | Also clean up a few other doc related bits and pieces. Change-Id: I56714e1811e38a7225131c1d141430b49f5f509c Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Updated documentation for the QAudioRecorder classJonas Rabbe2012-02-091-3/+16
| | | | | Change-Id: I93ab03e9a386578f0b43ba0e966b1570163ff056 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the audio decoder variant of QMediaPlayer.Michael Goddard2012-02-087-3/+971
| | | | | | | | Rather than the probe based way of doing it. Initially private. Change-Id: I30005f8da22f6451cb9de8eb3f0e193838d48c93 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed possible dependency problem in the qmake structureJonas Rabbe2012-02-081-1/+7
| | | | | | | | | If gstreamer is present, then the gstreamer plugin (and hence the plugins sub directory) should depend on the gst tools library. Change-Id: I6012df02d14731107fc0656089aa27ae61f0ef71 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added loading of video node factories from pluginsJonas Rabbe2012-02-0812-11/+180
| | | | | | | | | | | | | | | This change will allow us to add new video node factories that can be loaded dynamically at runtime. The previous video node factories, I420 and RGB have been kept as static parts of the Qt Multimedia imports, but can be moved to plugins at a later date. For plugins to be able to find and use QSGVideoNode, the class has to be exported. Change-Id: Idbead9a8ad33619cebe90fcec92eb29cf52ae9bd Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* API changes to QML element MediaPlayer aka AudioAngus Cummings2012-02-0813-203/+1971
| | | | | | | | | | | | | | | | | | Changed Video.qml for new API Removed lowercase enum copies, replaced with calling parent (VideoOutput, MediaPlayer) enums Removed properties playing, paused Removed signals started, resumed Added readonly property playbackState Added signal playing Added autoPlay property Fixed unit tests for new API Added backwards compatibility for QtMultimedia 4 Change-Id: I27c91cd46d91402b8c4c42bb7d4961ad67909aeb Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add exports for probe classes.Michael Goddard2012-02-074-4/+4
| | | | | | | Oops. Change-Id: I2273ac6789d2eb1042aa1d4b6ec64dac1904ce55 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative camera image processing with C++ API changesDmytro Poplavskiy2012-02-072-41/+42
| | | | | | | | | Changed ranges and meaning of image adjustments parameters. Change-Id: I1710bfabc4f216c83df7983a871bffb474cfbcc2 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated declarative camera recorder with C++ API changes.Dmytro Poplavskiy2012-02-072-12/+46
| | | | | | | | | | | Added key,value parameters to metadataChanged() signal; Added a separate actualLocation property to desribe the path of recorded file. It may be different from outputLocation when default location is used. Change-Id: I5a4b77833b6458a19ed7e1dcf7e53fc7400cdf21 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Expose capture request id in the declarative camera.Dmytro Poplavskiy2012-02-072-28/+34
| | | | | | | | It's useful to associate imageCaptured/Saved signals data with capture requests. Change-Id: I3e98c4a194403bd338a1b5313d8736b4baf79961 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add some media probing API.Michael Goddard2012-02-0711-6/+906
| | | | | Change-Id: Ib83918f99b699ac3fbc7ede82a392d00d4c18005 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a QAudioBuffer class.Michael Goddard2012-02-064-1/+692
| | | | | | | | Prereq for probing or decoding. The abstract API probably needs to change. Change-Id: Ie0bf796c1f581f34bbc0a8af2dffc387c513a330 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Moved QMediaServiceProvider to private header.Dmytro Poplavskiy2012-02-0618-201/+207
| | | | | | | It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changes to QMediaPlayer GStreamer backend to allow setPosition before pauseLev Zelenskiy2012-02-063-6/+74
| | | | | | | | | | Do not display prerolled frames in stopped state. Instead store prerolled frame and display it only after switching to pause or playback state. Added new unit test with a sample video file to check this functionality. Change-Id: I3fd159a199b65ca10fdf9843af5675c5ae9dad05 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: fixed prerolled frames renderingLev Zelenskiy2012-02-061-6/+9
| | | | | | | | Don't use queued render request if it's called from the object own thread. Change-Id: I61ac11f5cf68edf82d0681c95123e804869d0647 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Documentation tweaks.Michael Goddard2012-02-0611-9/+72
| | | | | | | | | Mostly move widgets classes into the QtMultimediaWidgets module, but also mark a few mostly internal playlist classes as \internal. A few other tweaks. Change-Id: If0e376410bf2187cafb24f583108c6beb7b910a9 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* QMediaPlayer::setPosition: do not check isSeekable and do not bound by durationLev Zelenskiy2012-02-061-2/+2
| | | | | | | | | | | To allow setPosition to be called in stopped state we no longer check if the player is in seekable state and allow position to be greater than duration. Unit test has been updated accordingly. Change-Id: I29447ffe797a7cc3dcc80d20b2527e9eda493ab6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix some warnings.Michael Goddard2012-02-062-2/+4
| | | | | Change-Id: I2ea7f6f016d34490a41e4c9449cbc92bd040de49 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-0631-6/+6184
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Changed plugin loader to try unloading plugin if unusedJonas Rabbe2012-02-061-1/+1
| | | | | | | | Deleting the root component can delete plugins already used elsewhere in the application or library. Change-Id: Ibd0afb61cf0e118eb13f9782252c1fec554ea901 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed QFlags from declarative camera properties.Dmytro Poplavskiy2012-02-064-18/+16
| | | | | | | | | It doesn't work, while even without QFlags camera.captureMode = Camera.CaptureVideo + Camera.CaptureStillImage works correctly. Change-Id: I00727ad37cbf33e0c6d557a9da08160d6ea4bdc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added metaDataChanged(key,value) signal to metadata controls.Dmytro Poplavskiy2012-02-0611-25/+87
| | | | | | | | | | | | | | It may be more efficient and convenient for application to use this signal instead of metaDataChanged(). metaDataChanged() signal is emitted for compatibility, backends should emit both signals. Signal added QMetadataReader/WritterControl, QMediaObject and QMediaRecorder. Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove QMediaImageViewer (SC break).Michael Goddard2012-02-037-1358/+1
| | | | | | | This class has turned out to be not very useful at this point in time. Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Changed QCameraFocus::focusMode type to QFlags based FocusModesDmytro Poplavskiy2012-02-025-20/+20
| | | | | | | It was intended to be QFlags based from the start. Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QCameraImageProcessingControl API fixesDmytro Poplavskiy2012-02-024-170/+140
| | | | | | | | | | | | | | | | Moved white balance preset from the separate methods to QCameraImageProcessingControl::ProcessingParameter; Separated absolute contrast/saturation/sharpening/denoising settings with adjustments to backend decided values, with QCameraImageProcessing using adjustments versions. Changed type of parameters from int to qreal with [0..1] range for absolute values and [-1..1] for adjustments. Change-Id: I85c8781c046be6dd45bcf626c25908e1ce5f6bcb Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added QMediaRecorder::actualLocation propertyDmytro Poplavskiy2012-02-015-1/+56
| | | | | | | To report the actual location file was written. Change-Id: Ibb56a720a258a1e5cedceaf0f9bcea73fb93bc96 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added more encoding settings to declarative camera recorder.Dmytro Poplavskiy2012-02-012-1/+96
| | | | | | Change-Id: If2ec0297a2db5fedaf27c009fb8d55ccf4254c21 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Split QMediaRecorder::setEncodingSettings to separate setters.Dmytro Poplavskiy2012-02-0114-63/+163
| | | | | | | | | | It's easier to change only the necessary part of encoding settings. The settings are applied during the next event loop or before recording starts. Change-Id: Ia2b5c93826a302212aa7f79a0c75e4cbaaf1dd7a Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added antennaConnected property to QRadioTuner and radio qml elementJonas Rabbe2012-01-306-0/+52
| | | | | | Change-Id: I5af8487277e0444629c710c6a0a4e890a8d35c6f Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30492-498/+498
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Moved zoom related properties out of QCameraFocusControlDmytro Poplavskiy2012-01-276-110/+383
| | | | | Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a viewfinder resolution control for camera.Michael Goddard2012-01-273-0/+187
| | | | | | | For attempting to set the resolution. Change-Id: I9f3b189b90fee95bf6430e9a74a6599ebcc38697 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix some surface assignment errors.Michael Goddard2012-01-271-2/+9
| | | | | | | | On destruction and changing sources, make sure we don't clobber the surface property if it's been changed. Change-Id: I3080b98a547911543a391c8bc040792d260782fd Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a rendered and content rectangle properties to VideoOutput QML.Michael Goddard2012-01-272-22/+331
| | | | | | | | | | | | | So you can align controls with an edge of the rendered area. There's also some convenience functions for mapping source to and from destination coordinates. Also tweaked the updateGeometry function to bail out if no input parameters have changed, rather than doing some more boring maths. Added a unit test for a lot of the class, too. Change-Id: I943bb45e4e56356247d5d6deb5d446222edcb7ca Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Add a volume (gain) property to QAudioInput.Michael Goddard2012-01-255-0/+138
| | | | | | | | Only implemented for PulseAudio so far, but the API does explain that it's optional. Change-Id: I4543a1c81d810fe92bb08f1ed13f3a3534a371e4 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QCameraExposure API refactoringDmytro Poplavskiy2012-01-255-180/+184
| | | | | | | | | | | | | QCameraExposureControl: Separated requested from actual exposure values. Removed ParameterFlags, it's confusing and seldom used. Moved ExposureMode and MeteringMode to parameters. QCameraExposure: Added requestedAperture/ShutterSpeed/Iso getters Change-Id: I408586d85e6c9de0c8a711c32b3c90ea46052270 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>