summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-2910-25/+37
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9
| * BlackBerry: Fix metadata key for "artist"Rafael Roquetto2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In order to retrieve the metadata information describing the Artist of a given album, Qt queries for AlbumArtist, and not Author. Author actually refers to the person who created the media file (i.e. the encoder in case of a mp3 song), and is also a string list (since more than one author is supported). Task-number: QTBUG-34985 Change-Id: I30b61f83db07ad2274eb79b28d92d772654220de Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Don't use integers to describe volume internally in QSoundEffect.Christian Strømme2013-11-285-22/+22
| | | | | | | | | | | | | | | | | | The public api takes floating point values and so does most of the back- ends. Conversion should be done in the back-ends that expect other value types to avoid unnecessary float -> int -> float conversions. Change-Id: I0ee1bfbe350f985294c20f897ffa3bd55288b4c9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-11-262-2/+2
| |\ | | | | | | | | | refs/staging/stable
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-262-2/+2
| | |\ | | | | | | | | | | | | Change-Id: Ia5060cb07311256caa0a8c7f03af292ce3a26213
| | | * Add mmrenderer configure checkv5.2.0-rc1Andreas Holzammer2013-11-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No all QNX versions/variations have a mmrenderer by default, so we need to check for it, otherwise it fails to compile. Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * iOS: Remove duplicate class name from qmldirAndy Nichols2013-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It was added twice, which breaks the build when using Multimedia on iOS Change-Id: I0b5f08bc57d5d558fb060b00d5bdeb4149499a0d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * | | Fix WMF Video not playing if no soundcard is availableMarius Wachtler2013-11-261-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Do not add the AudioEndpoint to the topology if no Audio output device is available. Fixes video not playing if you deactivate your soundcard or have no headphones/speakers plugged in. Change-Id: I9fc2486198a299b3e75af648f69475270968c6f7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * / Doc: Document asynchronous nature of QMediaPlayer::setMedia()Sze Howe Koh2013-11-231-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | The function name can be interpreted to mean that it loads the media. Users have made this mistake before: http://comments.gmane.org/gmane.comp.lib.qt.user/9189 https://bugreports.qt-project.org/browse/QTBUG-28514 Change-Id: I9e9b36405d67d40db42b77d8eeb8f9d528ee16e2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-20106-714/+1434
|\| | | | | | | Change-Id: I25197ccc930730be363f8f65624d7fa10c1d33e9
| * 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: Add permissions/features for Qt Multimedia moduleEskil Abrahamsen Blomfeldt2013-11-081-0/+5
| | | | | | | | | | | | | | | | | | | | To avoid potential exceptions when using Qt Multimedia, the applications needs to request camera and audio recording capabilities by default. Task-number: QTBUG-33953 Change-Id: I75061e24c65a24f7f45dcfdbb5edb1874c1eb4da Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Add classname entry to qmldir file.Morten Johan Sørvig2013-11-071-0/+1
| | | | | | | | | | Change-Id: Id2351ddd151ca917ba5d6f032a2bd7c2d62acd79 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.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>
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I3971987490ef7c2f8060383ffc2e141558f827c9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Add classnames for QML plugins.Andy Nichols2013-11-042-0/+2
| | | | | | | | | | | | | | Needed for static builds on iOS Change-Id: I2e16353a50661ac5b65a80fd37363b6e29c8b4a7 Reviewed-by: Yoann Lopes <yoann.lopes@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>
| * use private linkage where possibleOswald Buddenhagen2013-10-314-12/+12
| | | | | | | | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.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>
| * QSoundEffect: Set playing to true before starting the audio-device.Christian Strømme2013-10-301-2/+1
| | | | | | | | | | | | | | | | | | | | When the audio-device starts playing it should be able to read from the source immediately. The OpenSL plugin would fail because the source was blocking the audio-device from reading, as the state still was in its initial state (stopped). Change-Id: Ia26fa2eb442e239f5209947e6c9cd464b7d976a4 Reviewed-by: Yoann Lopes <yoann.lopes@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-247-36/+107
|\| | | | | | | Change-Id: I15d0b9f03136840aff189ffb9de6e3899c204ca2
| * Correctly clear the current media in Audio and MediaPlayer qml elements.v5.2.0-beta1Yoann Lopes2013-10-182-7/+9
| | | | | | | | | | | | | | | | | | | | When setting the source to an empty string in these elements, pass an empty QMediaContent to the backend rather than an empty URL. The former is the correct way to clear the current media. Task-number: QTBUG-34125 Change-Id: I3dd7b07abc0bd23a1253c8c0e075b174c17a4d3f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * 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-1485-1134/+1818
|\| | | | | | | | | | | | | 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>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 01:26:19 +0000