summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix BB10 buildFrank Osterfeld2013-11-101-1/+1
| | | | | | | | | | | | Change-Id: I0aa72c5ff8e86a8a4da6e9223f7168207174185d Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * QNX: Restructure pluginsFrank Osterfeld2013-11-0988-280/+283
| | | | | | | | | | | | | | | | | | | | | | | | Now that the MmRenderer implementation is ported to plain QNX, rename the directories and files accordingly: "blackberry" becomes "qnx", replace the Bb prefix with MmRenderer for classes concerned with mm-renderer. The legacy alsa support for plain qnx is now "qnx-audio". Change-Id: I6abd98ecdd713b2d5e554d42224dc30f13772f43 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Support plain QNX in mm-renderer mediaplayer implFrank Osterfeld2013-11-0918-154/+780
| | | | | | | | | | | | | | | | | | | | | | | | On plain QNX, the native events are plain screen_event_t's, instead of being wrapped in bps_event_t. The bps/mm-renderer interface isn't available on QNX, thus those parts are replaced by reading directly from mm-renderer's PPS objects. Change-Id: I38772ddad04432ff099455a730ce0034f07db70d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Android: use correct format when capturing a picture to a buffer.Yoann Lopes2013-11-062-10/+40
| | | | | | | | | | | | | | | | Don't decode the JPEG data to raw RGB using QImage. QCameraImageCapture reports anyway that JPEG is the only supported buffer format. Change-Id: Ib17760e4361b004775c002b686ef7529b3768aab Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix two race conditions in the media player.Yoann Lopes2013-11-062-3/+2
| | | | | | | | | | | | | | | | | | | | start() could be called before the media player was marked as prepared. When changing media, setMediaPath() could be called before the media player was reset. Task-number: QTBUG-34558 Change-Id: I886fd5f5008f76dcbc88c57d7b16a439b394d4a7 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * BB10: do not mix up pixel width and heightFrank Osterfeld2013-11-041-2/+2
| | | | | | | | | | | | | | | | | | This fixes the aspect ratio calculation for video windows. Change-Id: Ie4762b98ee805a41031e1ba88f5cd353426dfdf8 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * DirectShow: fix compilation with MSVC 2008.Yoann Lopes2013-10-311-35/+35
| | | | | | | | | | | | Task-number: QTBUG-34479 Change-Id: I48ab0760273e08678be5f057e2b39db8cbe10cff Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix camera preview showing black frames after restarting it.Yoann Lopes2013-10-293-3/+13
| | | | | | | | | | | | | | | | | | Clear the camera preview size when stopping the preview in order to force it to be reset when starting it again. Task-number: QTBUG-34346 Change-Id: I0edf8d996348745b9aa7cf0790c16b6cd813b33b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * WMF: emit positionChanged() signal when reaching the end of a media.Yoann Lopes2013-10-291-1/+3
| | | | | | | | | | | | | | | | This is necessary for QML MediaPlayer to report the correct position at the end of a media. Change-Id: Ifac2a721b850c726305d1a98e360da638b1fa87a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Blackberry: Improve camera focus handlingTobias Koenig2013-10-254-173/+214
| | | | | | | | | | | | | | | | | | | | Use different state variables for focus/exposure/whitebalance locks and update the exposure and whitebalance variables explicitly, since BB10 doesn't provide a status callback method as for focus. Change-Id: Ie6ba8f6a2a27f317c39994d21be8549c99daef6d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * OpenSL ES: enable the plugin only on Android.Yoann Lopes2013-10-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Removed the configure test to enable or not the plugin (which solves the problem of the plugin not being built on Windows because of a bug in QMake). Even though it should work on other OpenSL ES implementations than the Android one, it hasn't been tested. Compile and use the plugin only on Android for now. Task-number: QTBUG-34275 Change-Id: I02d47c8be3be8163a17c68b44b8c4b18a218a3fe Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * BlackBerry: fix BbVideoWindowControl window zorderRafael Roquetto2013-10-251-1/+5
| | | | | | | | | | | | Change-Id: I6c3b70d5d5a0afcb00ce2494ee071d6f3abd7626 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Blackberry: Fix camera viewfinderTobias Koenig2013-10-242-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enter the event loop between opening the camera and starting the viewfinder window grabber. The latter needs a windowGroup set, so in case the QCamera and QCameraViewfinder are constructed directly/indirectly inside the main window constructor, we have to wait for the top-level window of the application to be created, so that we can retrieve the windowGroup from it. Task-number: QTBUG-33739 Change-Id: Ib23781f0e4a2a07ba388e22debcb59b00509ed16 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Blackberry: Fix video recordingTobias Koenig2013-10-241-1/+5
| | | | | | | | | | | | | | | | | | | | The latest BB10 firmware (10.2) requires to set the rotation property of the video explicitly to the value of the video viewfinder. Change-Id: Iec9d43480820655b5d3ecdd136917d5458f0e55b Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-245-29/+98
|\| | | | | | | Change-Id: I15d0b9f03136840aff189ffb9de6e3899c204ca2
| * WMF: fix output samples from our video probe MFTransform.Yoann Lopes2013-10-161-4/+53
| | | | | | | | | | | | | | | | | | | | | | The EVR sink allocates its buffers and expect the node connected to it to use them. Our video probe MFTransform should therefore copy the input buffers into the EVR buffers rather than just passing on the input buffers. Task-number: QTBUG-30435 Change-Id: I978479ced341b96ce627c682f99662dec1dfdb3f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Add Linguist comment for translation of Drive-mode.Friedemann Kleint2013-10-151-0/+1
| | | | | | | | | | | | | | | | | | Translators not familiar with cameras might mistake it for something related to driving a car. Change-Id: If54a563a32af537d291b79253056b7b57e108f5b Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * WMF: allow to set a qrc file name as source of a QAudioDecoder.Yoann Lopes2013-10-141-1/+6
| | | | | | | | | | | | Task-number: QTBUG-33518 Change-Id: I01d8a1fa7b9a1c3ea2af9de6033dff2773cd6ace Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * WMF: allow to load media whose content doesn't match its file extension.Yoann Lopes2013-10-141-19/+22
| | | | | | | | | | | | | | | | | | This also allows to play streams without providing a MIME type. Task-number: QTBUG-33631 Task-number: QTBUG-33518 Change-Id: Ia106592cb5ed0a0f7ede6308dc8e2c12cf4e63b1 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * WMF: fixed compilation on Windows Vista.Yoann Lopes2013-10-111-5/+16
| | | | | | | | | | | | | | | | | | We were using one function which is available only on Windows 7 (and later). Replace it with Vista-compatible calls. Task-number: QTBUG-32864 Change-Id: I77492a407330c3689dfbf8dc1180894cf7ca5f8d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Removed camera error codeBernd Weimer2013-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Removed mapping of one camera error code to a string, because the code is not available yet in the BlackBerry NDK version 10.2. Change-Id: I91a8adc8d915e065daccb665ce7a57236b9d1545 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-1453-747/+1434
|\| | | | | | | | | | | | | Conflicts: src/plugins/blackberry/camera/bbcamerasession.cpp Change-Id: I7c86e10140ab86fd2a07e2f034dec38ae9112559
| * 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>
| * 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-0117-295/+542
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-10-011-1/+2
|\| | | | | | | refs/staging/dev
| * Android: fix plugin json metadata.Yoann Lopes2013-09-261-1/+2
| | | | | | | | | | Change-Id: I0f2feca44843760df13a938d9190daf2d447d645 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Added missing camera error stringsBernd Weimer2013-10-011-0/+10
|/ | | | | | | | On BlackBerry some camera error codes were not mapped to corresponding strings. Change-Id: I3c26f07eccc7204b89a387e83d342f6821773a1b Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-207-38/+29
| | | | | | | | | | | | 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-1915-1/+3787
| | | | | | | | | | 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>
* 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-1285-68/+7684
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-062-12/+12
|\ | | | | | | Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-278-29/+56
|\| | | | | | | Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
| * WMF and GStreamer: fixed incorrect frame startTime and endTime.Yoann Lopes2013-08-223-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:08:19 +0000