summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix "conversion from 'double' to 'float'" warnings on MSVC2010.v5.2.0-alpha1Mitch Curtis2013-09-242-24/+24
| | | | | Change-Id: I209d76fa2d87ad2eb540c750b8c4efb865441aae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-2022-1620/+35
| | | | | | | | | | | | Removed QGstreamerVideoOverlay and related classes. It was used as 'Window' control but performs worse than QGstreamerVideoWindow which does basically the same thing using GStreamer ready-made components instead. Removed X11 dependencies and related configuration tests. It was only needed for QGstreamerVideoOverlay. Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Android: Adapt the multimedia plugin to new QJNI APIChristian Strømme2013-09-2019-253/+229
| | | | | Change-Id: Id87f5518724eed6c9de6d5d3b8141860bd511643 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: fix compilation on x86.Yoann Lopes2013-09-191-2/+2
| | | | | | Task-number: QTBUG-33554 Change-Id: I4da7410d3b77ec6d72a73d3b6ceb7b76bb48d2b7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* CoreAudio: Create an audio plugin supporting iOS and OS XAndy Nichols2013-09-1922-2573/+3462
| | | | | | | | | | This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* OpenSL: Fix build warning about unused result variable.Christian Strømme2013-09-171-3/+2
| | | | | Change-Id: I11a4a3792feb90c46d4f3a77aafa82c18a9d9a45 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix QVideoSurfaceArbFpPainter mistakenly failing to start in some cases.Yoann Lopes2013-09-171-0/+2
| | | | | | | | | | If an OpenGL error occurred before starting the video painter, it would fail to do so. This patch simply makes sure the OpenGL error flag is cleared before checking for GL errors that would occur in QVideoSurfaceArbFpPainter's code. Change-Id: I2eacf6db03cb290adf00a9faf11145c7a6ade565 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove Q_PACKED from structs that don't need to be packedThiago Macieira2013-09-171-5/+5
| | | | | | | | | | | | | | Those classes don't contain padding, they don't need to be packed. The only reason to be packed was to deal with bad alignment of the WAV file. Since Q_PACKED wasn't present in all compilers, this might have been a latent bug. If that was the case, then force it to happen with more compilers. Change-Id: I8449b6bab5d62c1b7e08b9bc205b4b149ed55e28 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Stabilized QPainterVideoSurface auto-test.Yoann Lopes2013-09-171-0/+12
| | | | | Change-Id: Idfd6f8396dce223be1c73ad56c6f7f66ca9d5d25 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* OpenSL: Fix typosChristian Strømme2013-09-121-2/+2
| | | | | Change-Id: I1a293bbf8ad3d9016ff6a7ec816c33d3303e5959 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: added camera support.Yoann Lopes2013-09-1286-71/+7687
| | | | | | | | | This patch includes all camera features: viewport, settings, image capture, and video recording. It also adds support for QAudioRecorder. Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix the X11 build errorPier Luigi Fiorini2013-09-091-3/+3
| | | | | | | | | | | This makes qtmultimedia build again by moving down X11 includes. See http://lists.qt-project.org/pipermail/development/2013-September/012986.html Change-Id: If6cd5e80c27de7aaa8d2a65ded05500ed9d0e692 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-063-13/+13
|\ | | | | | | Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
| * Fix QAudioOutput::setVolume() limited 50% on 32-bit Windowsold/5.1Bill Somerville2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A signed 16 bit integer was being used to pack a normalised double into half of a DWORD. It needed to be unsigned 16-bit to get the full range of the Windows volume control. Task-number: QTBUG-33160 Change-Id: Ic17f572a188401ee686c6e6af3984d52328ccda6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * BlackBerry: Pass encoded URLs to mm rendererBernd Weimer2013-08-292-12/+12
| | | | | | | | | | | | | | | | MM renderer expects (remote) URLs to be percent encoded. Change-Id: Ib7429cbeb3b7aa6baba99419d8b101a712ab4881 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | PulseaudioInput: Remove unused membersTobias Hunger2013-09-021-2/+0
| | | | | | | | | | | | | | Clang warns about them. Change-Id: I8fb2e9bc30f35ec9540b09a34bf23bf9eb671b9c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QGstXvImageBuffer: fix warning about class/struct mismatchTobias Hunger2013-09-021-1/+2
| | | | | | | | | | Change-Id: I98df1ce92fab69ad1200066d310aa8bd016b5aca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QGstTools: Fix warning about unused m_intervalTimerTobias Hunger2013-09-021-0/+2
| | | | | | | | | | | | | | Clang does complain about this member not being used. Change-Id: I02919715be43486f4646ca75deea66fc8a6a2276 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-2713-45/+115
|\| | | | | | | Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
| * WMF and GStreamer: fixed incorrect frame startTime and endTime.Yoann Lopes2013-08-224-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | The QVideoFrame documentation explicitly says that the time is in microseconds, however the GStreamer backend was setting the time in milliseconds and the WMF backend in 100-nanosecond units. With WMF, the time was missing from the QVideoFrame when presenting it to the video surface. Task-number: QTBUG-31731 Change-Id: I0638d2abf8eed25b3a531db67c19a18703e5b630 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * Android: Use isValid() to check if the jobject is valid.Christian Strømme2013-08-211-2/+2
| | | | | | | | | | Change-Id: I5ec67b9b2abfae2e2c2a44f0bcc7c72cb54beb49 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Android: fixed media player buffering logic.Yoann Lopes2013-08-192-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | When the media is ready, the status should always transition to LoadedMedia and then immediately to BufferingMedia or BufferedMedia. Also, when the duration is queried before the media is ready but already buffering, it should always return 0 to avoid errors from the Android media player. Task-number: QTBUG-32635 Change-Id: Ibcb9c23b4f64c4f9a1a8e0ef81989ae78cfb19ef Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Fix file browser in qmlvideofx example.Friedemann Kleint2013-08-192-13/+10
| | | | | | | | | | | | | | | | | | | | | | Similar to de9092389f2e43370c2cfcd6759d08cc11da9a68 for qmlvideo. Use QUrl::fromLocalFile() to get Windows drive handling right. Emulate its behavior in QML code. Fix up() to terminate correctly. Task-number: QTBUG-32139 Change-Id: I36bafaa608ff054190dc76694f6254a74f3b513e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-161-0/+45
| |\ | | | | | | | | | Change-Id: Ibcde5cfcb97948f9e3f71a2d6b06397e1003aa3b
| | * Add changes-5.1.1 file.v5.1.1Yoann Lopes2013-08-161-0/+45
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32808 Change-Id: I998548df399ec6d2dd6b061b5ba2c1ca451276bc Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | WMF: fixed QMediaPlayer changing to EndOfMedia status too early.Yoann Lopes2013-08-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was changing to EndOfMedia status and explicitly stopping playback when receiving the MEEndOfPresentation event from the WMF session. However, this event means that all data has bean read from the source but not necessarily played yet. According to the documentation, playback is done when the MESessionEnded event is sent. It now reports the EndOfMedia status at that moment instead. stop() is not explicitly called anymore since MESessionEnded also implies the session has stopped. Task-number: QTBUG-30825 Change-Id: I6c6c09e736fe33f7cf17c75038ea7be1b5701a1c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * | WMF: use qFabs instead of fabsf.Yoann Lopes2013-08-161-2/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32360 Change-Id: Ibec3d044ac38f54abd895d56f1851011bf6b5272 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * | Enable QSoundEffect with loopCount of Infinite to playAndy Nichols2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the loopCount property of a QSoundEffect was set to QSoundEffect::Infinite then no sound would be played at all. This is because QSoundEffect::Infinite == -2 and playback was only continued on values above 0. Task-number: QTBUG-32882 Change-Id: I739919a3e538128fc16f26ede5eb6cc4f2eb29fb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | AVFoundation: Basic camera support for iOSAndy Nichols2013-08-272-6/+9
| | | | | | | | | | | | | | | | | | | | | Enables basic software rendering support for iOS. Change-Id: Icd29076ea627295819ede6d9680de576ba39b34e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | AVFoundation: Enable QVideoWidget on iOSAndy Nichols2013-08-272-22/+21
| | | | | | | | | | | | | | | Change-Id: I88041e7a2ea052fe449542eeaada31c09d93d163 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | AVFoundation: Use CoreAnimation to render video to QVideoWidgetAndy Nichols2013-08-277-262/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously a QGLWidget was used as a target for the AVFVideoFrameRenderer. This was uncessary as it is possible to render directly on top of the QWidget using the CoreAnimation Framework. Change-Id: I08923c85fd56c8874c1d8c187ae5145e220fab92 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | AVFoundation: Enable use of QMediaPlayer for audio on iOSAndy Nichols2013-08-276-37/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit disables the video components of the AVFoundation mediaplayer backend when building for iOS and enables the use of QMediaPlayer with audio assets. Change-Id: Iadd6f9c61ed1e656301326e90a22cbca6428b654 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | AVFoundation: Remove QVideoSurfaceCoreGraphicsPainterAndy Nichols2013-08-264-404/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was a leftover from Qt 4, as it is no longer possible to use the CoreGraphics paint engine. Instead we should just use the logic in QPainterVideoSurface render the QVideoFrame. Change-Id: I7e97fe7c30fd478dcd405d300e0c3f70050ca25f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-161-1/+0
| | | | | | | | | | | | | | | Change-Id: Ie72932d3a9ba1bfa2f282e8134b50b2d6b8ec469 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-1311-17/+390
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1211-17/+390
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
| | * | Implement resource policy plugin using libresourceqt.Robin Burchell2013-08-057-0/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains a new resource policy plugin, replacing the built-in code that was deleted when the plugin interface was removed in 138242fb2dc19438a0ead34b36af848800e27190 (which unfortunately did not provide a plugin). Change-Id: Iae7ed6edc330c69ca0c72d50bde6c7e12b8cca4e Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| | * | Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for a specific chunk, it was entering an infinite loop if not finding it in the next two chunks available. It now correctly tries to find the chunk until it reaches the end of the IO device. Change-Id: I29252318566fe3a47f267410c91dacaf302d9618 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| | * | Change libresourceqt's .pc file.Robin Burchell2013-08-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The one public port of this library to Qt 5 changed the .pc to libresourceqt5, to avoid clashing with the Qt 4 version. Change-Id: I6a248606e20c4e7a8f432612ca00aded846264d9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts with the platform page for Windows in qt5/doc Task-number: QTBUG-32580 Change-Id: Ibcf51c5dcd93ac388fa799644004c51aa88fe93d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Merge branch 'stable' into devSergio Ahumada2013-08-0536-25/+62
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
| * | Remove left-over debug output.Friedemann Kleint2013-07-311-1/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32139 Change-Id: I52843ca104e422fb02112949191dbcd4642905a5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | Fix file browser in qmlvideo example.Friedemann Kleint2013-07-302-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QUrl::fromLocalFile() to get Windows drive handling right. Emulate its behavior in QML code. Fix up() to terminate correctly. Task-number: QTBUG-32139 Change-Id: Iec6d9f96fbe2181c939e9dbbe6aa042eac630918 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | fix build without quickOswald Buddenhagen2013-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (gui && qml) is not a sufficient condition for the availability of quick (e.g., missing opengl support can disable it). Task-number: QTBUG-32682 Change-Id: I3b7fb005528cc99239f59d34c7f70abeebcfa75c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was crashing when the PulseAudio daemon was not running or was killed. When the connection to the daemon fails (or is terminated), it now tries to reconnect every 30 seconds. Sounds created before a connection loss will be recreated after reconnection. Task-number: QTBUG-32487 Change-Id: Ia63707aa5c70434b834b3079a9950a9b35057b26 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Use the new (-no)-wmf-backend configuration optionWouter Huysentruit2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't build the wmf backend when configure was executed with the -no-wmf-backend option. Change-Id: Ia047137c15c7aac302092e9f77b961c6e584bb86 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Moved declarative-camera example in the right directory.Yoann Lopes2013-07-2431-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This example was in the multimediawidgets directory but doesn't depend on or use the QtMultimediaWidgets module. Moved to 'examples/multimedia' instead. Change-Id: Ic2fcc6576e95664e0002531ee378a4366daa56c1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I1cfa9beb95b322c0d28b7240692358a02c442f77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-022-0/+2
| | | | | | | | | | | | | | \qtvariable is the QT variable in .pro files. Change-Id: Ib2e78579bbc67346b6c3431d03e01a4858439ac4 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-234-19/+45
|\| | | | | | | Change-Id: If52332b72560d21069e24cd31b13f08f33e1f406
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 02:06:48 +0000