summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* GStreamer: restart camerabin pipeline when changing camera mode.wip/gstreamer-1.0baserock/qt5.4-wip-gstreamer-1.0Yoann Lopes2014-11-181-5/+2
| | | | | | | | | | | | | | | | With Gstreamer 0.10, the camera was always restarded, either by us (for older Gstreamer versions) or by the camerabin. With GStreamer 1.0, camerabin doesn't restart the pipeline anymore when changing the camera mode. Caps are not properly re-negotiated after changing the mode, leading to errors when trying to capture alternately images and videos. Work around this by always restarting the pipeline when changing the camera mode. Change-Id: I6a5663a17ca2fc006414cbaa0ffca95286f6dba1 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* GStreamer 1.0: fix QGstUtils::videoFilterCaps().Yoann Lopes2014-11-131-1/+3
| | | | | | | Caps were not correctly created from string. Change-Id: I941f9be45ded036a07fcdb909aa9f7a2dd736682 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Merge remote-tracking branch 'origin/dev' into wip/gstreamer-1.0Yoann Lopes2014-11-07181-6106/+3862
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/gsttools/qvideosurfacegstsink.cpp src/plugins/gstreamer/camerabin/camerabinsession.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp Change-Id: Ib533c187c010f97f96e44eb765281afd55763a8f
| * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-2711-44/+38
| |\ | | | | | | | | | Change-Id: I82a85963aa1cc6e0a2cf7a49c039c117948cbeab
| | * Doc: Updated the \brief statementsVenu2014-10-2411-44/+38
| | | | | | | | | | | | | | | | | | | | | Most of them were unnecessarily long. Change-Id: I8942254c2211adb268e399056435e6acc940616f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-206-80/+68
| |\ \ | | |/ | | | | | | Change-Id: Ie44084828edf50050c695ac4dcc1cb532651499c
| | * Android: Use the new findClass() method.Christian Strømme2014-10-174-73/+60
| | | | | | | | | | | | | | | | | | | | | Avoid local caching. Change-Id: I1e30896da664c5a45c38c09412c16cb8ff70c5c7 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| | * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-142-7/+8
| | |\ | | | | | | | | | | | | Change-Id: I716fd3acb69e424047691069cd4a781f656d0487
| | | * QNX: Fix resetting video surface5.3Bernd Weimer2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If video surface object is set to 0, it must not be accessed to set a property on it. Task-number: QTBUG-40746 Change-Id: I1de0e5495918d3ea06706412fab15bf1af012f36 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | | * WMF: Use media source only when it is initialized.David Schulz2014-09-301-5/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I0efcf6139d0b81194cf25383025f080f8656728c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * WMF: Fix null ptr derefernce in MFPlayerSession.David Schulz2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking the sender of the mediaSourceReady signal to prevent accessing the incorrect source resolver. When the source resolver has finished the asynchronous operation and the source resolver gets recreated in the player at the same time in a different thread the signal mediaSourceReady still gets emitted from the old source resolver. The player assumes that the signal was emitted from the current source resolver and accesses the unresolved media source in the handleMediaSourceReady slot. Task-number: QTBUG-39980 Change-Id: Ic52f6918995aac250048d91f89c520cfea111bd0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | * AVFoundation: fix build with iOS 8.0 SDK.Yoann Lopes2014-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d9b97ad88631ba12a289f7575ca53386e592bd1 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-09166-5984/+3755
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I8b9177d90afac8b834d333efc6c22b6b35dceaf8
| | * | GStreamer: fix QMediaRecorder::duration() when recording with a camerav5.4.0-beta1Yoann Lopes2014-10-031-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get the recording duration, we were using the camerabin's position, which represents the time since it was started, not the time it's been recording to a file. We now retrieve the camerabin's filesink position. Change-Id: I68eeb25d1718666288655d22deea23e25de73b90 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | AVFoundation: fix media player video rendering in QML.Yoann Lopes2014-10-012-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AVPlayerLayer was set on the QVideoRendererControl before its geometry was updated, causing the renderer control to display frames with an invalid size. Change-Id: I90e18dce69d4b48a3d7932d44a7eab4fd443f1fb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | Updated snapshots for qmlvideo example documentationTomi Korpipää2014-09-295-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36287 Change-Id: I9da63560ba92a572d6d3943cfdade0b609469ace Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Sergio Ahumada2014-09-2621-159/+211
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.3' into 5.4Sergio Ahumada2014-09-2621-159/+211
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
| | | | * Remove unused includesChristian Strømme2014-09-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbce6e9135649d5dce0522320197dbbd0a92b3b9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | | * WMF: fix initializing of media player's volume.Nodir Temirkhodjaev2014-09-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the docs, MESessionTopologyStatus with status == MF_TOPOSTATUS_READY should be the correct place for the GetService call. Change-Id: I7fdbedbe43b2191b35b95c7fd9c86940f58daff7 Reviewed-by: Wouter Huysentruit <wouter_huysentruit@hotmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | | * WMF: fix memory leaks.Nodir Temirkhodjaev2014-09-112-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release requested interfaces. Task-number: QTBUG-32481 Change-Id: I846981f6a7a7ea77588b9322fc41e05e583bdb15 Reviewed-by: Wouter Huysentruit <wouter_huysentruit@hotmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jeff Tranter <jtranter@ics.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| | | | * Make PLS parser more permissive.Yoann Lopes2014-09-103-100/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PLS format is not clearly specified, some rules are just assumed and files don't always respect them. We now only look for 'File' entries, since that's the only thing we actually use. We ignore the Version, NumberOfEntries, Title, Length and any other unrecognized tags. Task-number: QTBUG-40515 Change-Id: I9c176b7b68fd1441abbd50364f88994ad5d6236f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | | * WMF: fix start time of QAudioProbe's buffers.Yoann Lopes2014-09-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-40954 Change-Id: Icd1d144dcff3a3191432722da44a263ca286dbb6 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | | * Fix URL handling in PLS parser.Yoann Lopes2014-09-093-27/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure relative paths are resolved to a full path. Task-number: QTBUG-40515 Change-Id: Ideb83fc3a3c4a74c84917a22e3c30162d7b6158a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | | * QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing.Andres Gomez2014-09-095-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an error is found parsing a playlist, stop parsing. This will also prevent the emission of the "loaded" signal when the parser finishes. Task-number: QTBUG-40513 Change-Id: Ia814864d0d546806219993f0b727761d5d4e7903 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | | | * Fix integer overflow in several audio plugins.Yoann Lopes2014-09-0910-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-40804 Change-Id: If006cb7db319bb6fda4ce7eb4f907e897b5d9efa Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | | | * QNX: Fix end of media notificationBernd Weimer2014-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When auto-play is on, EndOfMedia would not be emitted. This is due to a workaround for mmrenderer, that wrongly ignored stop events. Once media is played stop events will always have to be processed. Change-Id: I1cfd665bb06638ee3c86807aecc51e78f9baa938 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | | | * Bump versionFrederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I123f7fd8e2f88b36a69d3d5713f3b6390db610bc
| | * | | GStreamer: fix artist-related metadata keys.Yoann Lopes2014-09-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMediaMetaData::AlbumArtist now maps to GST_TAG_ALBUM_ARTIST and QMediaMetaData::ContributingArtist to GST_TAG_ARTIST. Change-Id: Ifa2cb90ee8ae09beaee572ad113c05776e699432 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | | GStreamer: fix QMediaPlayer metadata signals.Yoann Lopes2014-09-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - metaDataAvailableChanged was never emitted - metaDataChanged was not emitted when clearing the current media Change-Id: Ide05056450171a87aeb018be7e0bdea136341946 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | | Add metadata test for qmediaplayerbackend auto-test.Yoann Lopes2014-09-262-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I419496293b11b6a941af08e9709595458b7ca423 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | | Android: fix some problems with the media player.Yoann Lopes2014-09-264-103/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Correctly emit positionChanged signal. One of the problems with this was that QMediaPlayer automatically sends periodic position updates while playing a media. There's no need to have the same logic in the backend. - Seeking after reaching the end of the media now correctly works Auto tests included. Change-Id: I6d5ecbae6e05f94a8aac1a0834cf57427adf219b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | | Improve audiorecorder example.Yoann Lopes2014-09-262-24/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show actual recording location - Update control buttons depending on the recorder state instead of the status - Create audio levels using the actual audio format from the audio buffers. The format from the QMediaRecorder might not always contain the value actually used. Task-number: QTBUG-36154 Change-Id: I418b4472b0d984f47efb1a1813da6ef440ba9a40 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | | Use QCameraInfo in camera example.Yoann Lopes2014-09-262-16/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | To replace QCamera::availableDevices(), which is deprecated since 5.3. Change-Id: I0b1bd6286ec78d6d26ce309d224369989d4a5063 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | QMLVideo Example visual updateTomi Korpipää2014-09-2628-322/+290
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36287 Change-Id: I797a995c2ccd6f6fec40fbf50f93e297ae15a9b1 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * | Remove QuickTime backend.Yoann Lopes2014-09-2530-4941/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backend was kept only for Mac OS X 10.6 support. AVFoundation is used in 10.7 and later. Following the 10.6 deprecation plan, the code is now being removed for Qt 5.4. Change-Id: I513d00adda35f6012dda548b8d824d158efffb16 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * | Android: fix QMediaPlayer's state and mediaStatus signals.Yoann Lopes2014-09-242-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit signals only after both properties are written to avoid having incoherent values in signal handlers. Task-number: QTBUG-40314 Change-Id: I6c8445e61cccf1a9803647329c4fa1f0e452f56d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | WMF: fix crash on media player destruction.Yoann Lopes2014-09-241-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A race condition could cause a frame to be presented even after the QAbstractVideoSurface was deleted. We now check that the surface is valid before presenting a frame. Task-number: QTBUG-41158 Change-Id: If593469a8267583e499e781336af38d3fbf318fd Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | WMF: fix video rendering with ANGLE.Yoann Lopes2014-09-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The format of the offscreen surface used for video rendering should be compatible with the EGL config. Change-Id: Ic016245ce80c2483771e620c3eed345262d03c44 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * | Make the multimedia examples less verboseAlex Blasche2014-09-2212-68/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Important warnings such as missing services are still printed though. Task-number: QTBUG-31080 Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * | Remove QtSystemInfo dependency from Multimedia examplesAlex Blasche2014-09-195-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtSystemInfo is not officially supported in Qt5 and its QML API is currently broken. Inhibition of the screensaver is not essential for the example anyway. Task-number: QTBUG-31080 Change-Id: Ia2e7d8de3e2044e11e1681907e61a7207489ad1b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Revert "QMediaNetworkPlaylistProvider: Upon error parsing, stop parsing."Yoann Lopes2014-09-175-127/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0ed18d846c0b425b0c50a2fefd7cc0fc148832c2. The same patch was submitted in both 5.3 and 5.4 branches. It should have been pushed only to 5.3. Change-Id: I9e2974886190dfb2e5def5bc325c58f6e7783f55 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | Ensure pre-roll frames are displayed when gstreamer backend is paused.Andrew den Exter2014-09-124-150/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform a seek before transitioning from the stopped state to paused or playing to force the pipeline to resupply the video sink with any pre-roll buffer it may have previously ignored during loading. And don't assume showPrerollFrames to be true if the current state is not stopped as the policy handling may have prevented an effectual state change. Change-Id: I288a70bc4da32f3534eab4b14702ca8f8fdb4222 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | OpenSL ES: Be less rigid about tearing down the output device.Christian Strømme2014-09-122-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We where very strict about tearing down the audio device. While this is a good strategy to avoid unnecessary resource usage, it also causes excessive re-allocations, e.g., when transiting from start to stop and back again. This can increase latency, especially in case where a short clip is re-played at a high frequency. This change also decrease the chance of the player ending up in some unknown state where it drops audio clips without any warning. Task-number: QTBUG-40864 Change-Id: I1afad4af0622983f0f0c221d91cf794585d8cad2 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Fixed avfmediaplayersession.mm for OSX 10.10 Yosemite.Jens Cornelis2014-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit cast caused build to fail. Explicit cast builds fine. Task-number: QTBUG-41136 Change-Id: I0147c26a0f8b8198d6ed9944311547b81a50bccb Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Implement encoder settings in camerabin backend.Andrew den Exter2014-09-116-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not comprehensive since different encoders have different names and representations for many settings, but it should cover bit rate for most encoders, and quality and encodingMode for a number of common encoders. Change-Id: I0ba4e70c2f234e0deaaa02bdecc0f5198122c1e9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Add necessary includes that were indirectThiago Macieira2014-09-105-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qstringlist.h no longer includes qdatastream.h Change-Id: Iabc231741ab0d8c8edbb4f77a4c6fe45c6a98896 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Fix V4L usage.Yoann Lopes2014-09-093-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff527de0 was submitted to 5.3 while cddbe873 was submitted to 5.4. The former's behavior was not preserved when 5.3 got merged into 5.4. Change-Id: I7435ea30634001ae6e87c316eb8a8ab6f5e988e3 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * | Fix build with QT_OPENGL_DYNAMICAllan Sandfeld Jensen2014-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4375a808170f3e4888101fea7a833399061a8935 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * | ANGLE is never available on WinCELaszlo Agocs2014-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I853774af533d7f4b37b4789344e531d2688f91f5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
View Lorry Controller Status