summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-1612-398/+166
|\| | | | | | | Change-Id: I4fea8b03bc8baaa97e95413f05d13f0f505705d3
| * Android: fix camera previewDenis Kormalev2013-12-115-43/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | At some(?) devices we can't rely on one shot preview callback because it receives data only after we start new previewing session. And this cause situation when imageCaptured signal is never emitted. This fix applies preview callback with already allocated buffers and collects all preview images in these buffers. When we capture image - we can simply fetch last preview image (if there was any) from c++ part. Task-number: QTBUG-34993 Change-Id: I608750c344ca3c089f4673df4907e0f47e57e2ba Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * WMF: remove dead code.Yoann Lopes2013-12-111-333/+0
| | | | | | | | | | Change-Id: Ib3b595263e64336cc5d0482edd890e7b4e534927 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * WMF: fix some crashes.Yoann Lopes2013-12-113-5/+10
| | | | | | | | | | | | Task-number: QTBUG-30827 Change-Id: Iafc53f7095ad9c086b3982afb2af045c54497dc9 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: automatically deploy playlist plugins.Yoann Lopes2013-12-101-1/+2
| | | | | | | | | | | | | | Include the playlistformats directory for automatic plugin deployment. Change-Id: Ie61a4b1c1637a493e1bdb7354b33060728ccabda Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android add support for qrc in mediaplayer.Christian Strømme2013-12-092-3/+14
| | | | | | | | | | | | | | | | | | | | [ChangeLog][QtMultimedia][Android] Enable mediaplayer to read files from the Qt Resource system. Task-number: QTBUG-31422 Change-Id: Iaaefb35566b623b78b9f8aa22daf6ac92fb35e67 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Use the backend to notify the QCamera state changes.Yoann Lopes2013-12-051-9/+1
| | | | | | | | | | | | | | | | | | | | We were emitting the stateChanged() signal no matter what was actually done by the backend. QCamera now emits this signal only if the backend actually changed the state. Task-number: QTBUG-35070 Change-Id: I9f32361cd815dbcc366ad30033692f9ae732ec46 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix camera viewfinder orientation.Yoann Lopes2013-12-054-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera sensor on Android devices might be in a different orientation than the device natural orientation. There is no API in Qt to know about the camera orientation, so correcting the viewfinder orientation is not possible without making guesses. This patch makes sure the viewfinder orientation always matches the device natural orientation. For example, if the camera is mounted in landscape, and the device natural orientation is portrait, the viewfinder will automatically be rotated 90 degrees counter-clockwise. Task-number: QTBUG-35086 Change-Id: Ia890872971d72657debe709f61edba27d09dec65 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-0510-50/+144
|\| | | | | | | Change-Id: I9c1abddf20e85cc0f29f2da26c398b7180e4f479
| * WMF: fixed various media player issues.Yoann Lopes2013-12-041-13/+18
| | | | | | | | | | | | | | | | | | - Switch to BufferedMedia only once playback actually started, not when requesting to start. - Report the position to have changed when seeking in stopped state. Change-Id: I930b3e6977cebe5935ed033d0a4d4e1eb899ad2c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Revert "WMF: fixed MediaPlayer buffering logic."Yoann Lopes2013-12-041-13/+3
| | | | | | | | | | | | | | | | | | | | | | This reverts commit d599f7319af86265083bae96f21d942aeff24737. This was not the correct logic... According to the documentation, the BufferedMedia status should be set only when in the PlayingState. Change-Id: I36053ebc09c0517fcd2a1a7f2b091fbe8f04f3d0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-036-12/+108
| |\ | | | | | | | | | Change-Id: I53a7a2a3e096f76d50f2bb3ae125f6022de5c3f5
| | * QNX/PPS: Fix end-of-track handlingv5.2.0Frank Osterfeld2013-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The state to check for is actually "stopped", not "STOPPED". Fixes end-of-track detection. Task-number: QTBUG-35189 Change-Id: Ifa2f0635b31ef8c584c1800ef870c0dbef2b1daf Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Add changes-5.2.0 file.Yoann Lopes2013-11-301-0/+86
| | | | | | | | | | | | | | | | | | Change-Id: Ieec89755a30996a5b0ed37ecaa6ee957344f8594 Reviewed-by: Sergio Ahumada <sahumada@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Fix version availability for VideoOutput's autoOrientation property.Yoann Lopes2013-11-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This new property is available since 5.2, not 5.1. Change-Id: Ie3b5cd3c5d909f6d4ba662a2eaf03f1e6bb8b21b Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| | * Android: print a warning when using SurfaceTexture on Android 2.3.Yoann Lopes2013-11-301-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceTexture is available since Android 3.0, print a warning when camera preview or video playback is used on an older Android version. Task-number: QTBUG-35075 Change-Id: Ie04c62df99048a25e8fd971e0708157d0d32c503 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Android: Add missing 'L' prefix and ';' postfix in areaToRect()Christian Strømme2013-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While it works just fine without the post-/prefix, they are suppose to be there... Change-Id: I99365d37c70c65ccf0713d6b2d8330030b265e8e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | OpenSL: Fix volume scaleChristian Strømme2013-12-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code was assuming that the interface was expecting power values, while it actually uses amplitude values. In addition the difference between the min/max values where used, resulting in quite high gain values. Task-number: QTBUG-34777 Change-Id: Ibd3f7774b67c44e37dfd79cbe6e2c35746f00a0a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | CoreAudio: fix supported input and output channel count.Yoann Lopes2013-12-021-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the maximum number of channels was reported as being supported. We now report all possible configurations up to the maximum number of channels to be supported. Task-number: QTBUG-34639 Change-Id: Ib4c599ea8b772ebeaaca95137d24bac49dbd80d3 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Ivan Romanov <drizt@land.ru> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-2913-25/+95
|\| | | | | | | | | | | | | | | | | | | | 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-265-2/+60
| |\ \ | | | | | | | | | | | | refs/staging/stable
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-265-2/+60
| | |\| | | | | | | | | | | | | Change-Id: Ia5060cb07311256caa0a8c7f03af292ce3a26213
| | | * Add mmrenderer configure checkv5.2.0-rc1Andreas Holzammer2013-11-254-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ib02770f3a7a799b77bfa4356ed903a6fbb473497 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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-20109-764/+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-254-55/+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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 09:08:23 +0000