summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* DirectShow: improve metadata support.Yoann Lopes2013-10-114-95/+345
| | | | | | | | | | Correctly return the list of available metadata. On Windows Vista and later, we now use shell properties to retrieve the metadata. This allows us to get much more metadata properties. Task-number: QTBUG-30776 Change-Id: If542756d08d832903984ef10d09c4caf410bdb1c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* QNX: enable AudioCapture plugin.Yoann Lopes2013-10-111-1/+1
| | | | | | | | | This allows to use the QAudioRecorder API on QNX (and Blackberry), using the low-latency audio plugin as backend. Change-Id: I9bed7c01948a40f931f2a6b29c0f5cbfc99635bd Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Enable camera on the PlaybookFabian Bumberger2013-10-108-17/+45
| | | | | | Change-Id: I61537899bee63150861df57f9140316eca6a6eed Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Refactored AudioCapture plugin.Yoann Lopes2013-10-0916-304/+347
| | | | | Change-Id: I025588d7d2afc8d8137a258d86f6dab5b00b234a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: fix media recording location.Yoann Lopes2013-10-092-18/+24
| | | | | | | | | When letting the plugin decide where to save the recorded media, doing several recordings would always use the same output file instead of creating a different one every time. Change-Id: If352257d6c91ada8565c1463820321f84c9bb92f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove unnecessary warning in QMediaPlaylistNavigator.Yoann Lopes2013-10-091-3/+1
| | | | | | Task-number: QTBUG-33862 Change-Id: Ie74e649ebb5819ccf6300492bdce2a0046b87f02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Fixed missing links to Qt Audio EngineJerome Pasion2013-10-083-6/+6
| | | | | | | The title changed from Positional Audio to Qt Audio Engine. Change-Id: Ie9901c7bc6c394c1c429a16a8a1b1c18b1a87f46 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Various fixes to Qt Audio Engine documentationJerome Pasion2013-10-0310-64/+55
| | | | | | | | | | | -fixed \since to "\since 5.0" (Qt version 5.0) -made a \qmlmodule page so the list of related classes are automatically listed -made changes in the Qt Multimedia documentation to link to the Qt Audio Engine documentation Change-Id: Ibdd3da02871648988a73172934e684840c4ce0ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Removing version number from the QDoc comments.Jerome Pasion2013-10-0214-295/+295
| | | | | | | | | | The version is not needed anymore and QDoc handles them as a different module, causing errors. Task-number: QTBUG-32172 Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated usage of \qmlmodule and \inqmlmodule.Jerome Pasion2013-10-0215-16/+16
| | | | | | | | | | -\qmlmodule denotes the import statement "QtMultimedia 5.0" -\inqmlmodule shouldn't have the version number and this commits removes it because it is confusing. Task-number: QTBUG-32172 Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Android: fixed image capture preview.Yoann Lopes2013-10-0110-17/+130
| | | | | | | | | | We used to generate the capture preview from the video output, grabbing the pixels of the last frame (in a FBO). This is not possible anymore, we instead query the camera for a preview frame, which is in the NV21 format and needs to be converted to RGB. Change-Id: I1c728b3a708a6f052a83aebf9f15f511eab7a02f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: refactor video renderer.Yoann Lopes2013-10-0120-298/+553
| | | | | | | | | | | | | Removed the overhead of having to create a shared OpenGL context in the GUI thread and pre-render the frame into a FBO. We now directly render the GL_TEXTURE_EXTERNAL_OES in the QtQuick render thread, using an Android-specific QSGVideoNode. We also use a callback from the render thread to create the texture from there and not have to create a separate shared OpenGL context. Change-Id: I6c8eb94b47d0a03329c912701b8af3fb5ebd1876 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix lupdate warning in playlistparser.Friedemann Kleint2013-09-271-1/+2
| | | | | | | playlistfileparser.cpp:278: Class 'PLSParser' lacks Q_OBJECT macro. Change-Id: I062bd90b7cd5de82683dc02c6a6400855982a163 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* VideoOutput: take the video format's scanLineDirection into account.Yoann Lopes2013-09-271-0/+6
| | | | | | Task-number: QTBUG-30442 Change-Id: Ic950d66cb35a937ccf3862089e0060819b6d6f34 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Android: Make sure the OpenSL plugin is included on Android.Christian Strømme2013-09-261-1/+2
| | | | | Change-Id: Ic46dd8afe50250bb30754ce12eda57138d05b81d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: fix plugin json metadata.Yoann Lopes2013-09-261-1/+2
| | | | | Change-Id: I0f2feca44843760df13a938d9190daf2d447d645 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* 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-2019-1558/+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-1921-2571/+3459
| | | | | | | | | | 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>
* 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-2710-32/+60
|\| | | | | | | 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>
| * 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>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-1310-16/+389
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1210-16/+389
| |\| | | | | | | | | | | | | | | | | | | 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-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 17:50:18 +0000