summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | Change-Id: Id5c4f69f35bd55f79797f36d766cfe0a6d665766 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add support for m3u8 playlist formatsAndy Shaw2013-03-241-5/+5
| | | | | | | | m3u8 is just a unicode version of m3u so we can already handle these without any extra coding other than adding it as a format Change-Id: Icec0f1844bd2b0a0ea3c39b98f7b06cc402a3309 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix calculation bug in QWaveDecoder.Christian Strømme2013-03-223-3/+7
| | | | | | | | | When comparing the size of the WaveHeader and the chunk size, we need to include the ID and Size fields, or any extra data won't be discarded and the parsing will fail. Change-Id: I730833f33f57b26cd750985354136191f7e7ce04 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Stabilizes QAudioInput auto-test.Yoann Lopes2013-03-221-2/+2
| | | | | Change-Id: I85c7a38559e023f89271c0836730f6cec8f429cb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge branch 'dev' into stableSergio Ahumada2013-03-19293-1439/+12298
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1417-216/+368
| |\ | | | | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-134-704/+0
| | | | | | | | | | | | | | | Change-Id: I2c83f05c18753f5c692ec0c6f7701faec9f04416 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | iOS: Fix build issuesAndy Nichols2013-03-114-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | This also prevents anything meaningful from working, but it is a good starting point. Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | BlackBerry/QNX: Implement audio recording with QAudioInputTobias Koenig2013-03-114-2/+593
| | | | | | | | | | | | | | | Change-Id: I62cad152a7b7fd92905744439de838306dc7a558 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | Android multimedia plug-in.Christian Strømme2013-03-0630-0/+3443
| | | | | | | | | | | | | | | | | | | | | Adds MediaPlayer support for Android. Change-Id: I4c7b1e19927b2e50b227f3a3b3f7ca2e99397618 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * | BlackBerry: Mirror viewfinder for front cameraTobias Koenig2013-02-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the camera viewfinder shows the front camera we mirror the image now to avoid that on rotation of the device the image tilts to the wrong side. The captured image however is not mirrored. Change-Id: I6127b8ee6552553efe56ebec81991f0bd7597f47 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-264-0/+1660
| |\ \ | | | | | | | | | | | | refs/staging/dev
| | * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-254-0/+1660
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I2cb815afa62d442419b0ee08088fb5d85907c2f1
| * | | | Doc: Adding Qt Multimedia Widgets documentation.Jerome Pasion2013-02-267-5/+165
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -added landing page and module page -linked to Qt Multimedia and Qt Widgets -excluded multimediawidgets dir from the Qt Multimedia documentation Task-number: QTBUG-29339 Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
| * | | BlackBerry/QNX: Add a new backend for Blackberry handling audioKevin Ottens2013-02-2512-0/+1170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now it only implements the audio output part. The plugin can be used on all QNX systems (including BB10) that provide a libasound version < 1.0.10. Change-Id: Ifcfd871558d5d2bfb9e8a5f5ef0cfe009c0a111d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | Blackberry: Implement QVideoRendererControl for QMediaPlayer backendTobias Koenig2013-02-2210-17/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the application is not supposed to play back DRM secured media, we grab the pixel data from the native mmrenderer window now and make them available to the QAbstractVideoSurface of the QVideoRendererControl. This allows the usage of all transformations on video output inside QtQuick. Change-Id: I73d05404b1ac9c5f74a234d9393b981a6fbcb317 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | Blackberry: Grab viewfinder frames from native windowTobias Koenig2013-02-216-142/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the conversion from NV12 to RGB on the CPU does not scale for larger photo/video resolutions, this patch uses a different approach. It uses the low-level screen API to grab screenshots of the native viewfinder window and provides them as QImage to the QAbstractVideoSurface. Even for large resolutions this is quite performant. Change-Id: I59a7cbe6850b3b07575ea10026f3180cfd22e935 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | add error handling in image capturing in cameraJing Bai2013-02-193-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28589 Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-191042-1430/+65915
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * | | | Blackberry: Add support for reading meta data in QMediaPlayerTobias Koenig2013-02-199-1/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an implementation of QMetaDataReaderControl for the QMediaPlayer. Change-Id: I58c04e40ae3f07013450997410d0a379273c7bde Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Blackberry: Extend platform-specific documentationTobias Koenig2013-02-191-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflect camera support in Blackberry-specific documentation page. Change-Id: I5267a32b99aa88cd73f33fe045d67579442f9932 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Blackberry: Fix resolution selection for video recordingTobias Koenig2013-02-193-49/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the selection of the video viewfinder resolution depending on the features provided by the camera. If the viewfinder is responsible for encoding the video frames, the resolution of the viewfinder and the video output must match. Otherwise only the ratio must match and we can use a lower resolution for the viewfinder to improve the performance of the NV12->RGB frame conversion. Change-Id: I66ace84841a69be84f83bf9c5240cd23d96fbb76 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresentAndy Nichols2013-02-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests seem to be passing consistently now, so this is an attempt to reenable them on Linux, as right now passing them on some Linux machines in CI is causing failures. Task-number: QTBUG-26320 Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1 Reviewed-by: Tobias Koenig Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | | | Fix MinGW-warnings about mismatched types.Friedemann Kleint2013-02-143-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6170e3aa49f5b60ba68c1ef5bb2c6c7ec6688060 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | DSVideoWidgetControl: Fix constructor order.Friedemann Kleint2013-02-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I804427867a0f400750ef1df423c89fb4948bb0a3 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | Fix warnings about unused variables.Friedemann Kleint2013-02-147-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I147ff8624faa98396d6c48801c41a731fd02ac10 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | Fix MinGW64-warnings about unknown pragmas.Friedemann Kleint2013-02-142-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bd2178f5986846aede371193e98b55e4bde6414 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | DSVideoWidgetSurface: Pass on parent to base class.Friedemann Kleint2013-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4f2819a0767234e5fffeafe1ab038cbf13bdd2a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | Reduce MinGW64-warnings about mixerID.Friedemann Kleint2013-02-142-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: cast to pointer from integer of ifferent size. Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | Fix signature of the waveInProc/waveOutProc callbacks.Friedemann Kleint2013-02-144-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameters are DWORD_PTR instead of DWORD, which did not matter on 32bit but caused MinGW64-compiler warnings and potential crashes on 64bit. Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | | | Blackberry: Fix orientation of taken photosTobias Koenig2013-02-121-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the taken photos are always upright. As long as the QCamera API does not provide information about the native orientation of the camera, we have to do the rotation inside the BBCamera plugin. Change-Id: Iebb04a5417274c2baee5e944dadf10fc706484d9 Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * | | | Blackberry: Restart camera viewfinder after standbyTobias Koenig2013-02-112-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listen to the CAMERA_STATUS_POWERUP signal, which is sent after standby, and trigger a restart of the viewfinder in this case. Change-Id: I426f23657844bb270ddfd0e4bfb35880040aa583 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Blackberry: Ensure that camera viewfinder texture is uprightTobias Koenig2013-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the texture is upright when the device is upright. When rotating the device, it's the applications responsibility to rotate the texture of the viewfinder (e.g. through the QDeclarativeVideoOutput::orientation property). Change-Id: I6e453ce9bdde5197104533f844b1079b3c3db908 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Blackberry: Add camera support for BB10 platformTobias Koenig2013-02-0647-1/+5718
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplement all camera related controls as they are supported by the BB10 camera API. Change-Id: Ie7d2258be22c1c1821489bd7074b80cff4242afa Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Blackberry: Fix warning about unsigned integer comparisonThomas McGuire2013-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00592dd078e85497589156e156e7a665f935d325 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | | | Blackberry: Refactor plugin directory structureTobias Koenig2013-01-3116-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the mediaplayer related code in its own subdirectory. This is a preparation for adding camera support in the future. Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-28156-623/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | | Bump Qt version to 5.1.0Frederik Gladhorn2013-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68f5c34fe14860c40537a23f28e741f0ac1eef1e Reviewed-by: David Faure (KDE) <faure@kde.org>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-04528-1372/+1229
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f
| * | | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I9f3c9977b162b82611e48cd304cfcc316fed95ad Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | | Test the cmake multimediawidgets module only if widgets is available.Stephen Kelly2013-03-141-2/+11
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I381e1b0883fb4fdc68627848ee39a26ce22e2ba5 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ia4e3edead13e2526a77133e7067e649784fd1358
| * | | | | define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I96527ba40ce7bcea851f05e9e9ab8d4492ef62e7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | Merge branch 'stable' into releaseJohanna Aijala2013-02-211039-1271/+65407
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I21911e86a651caa599110317a5e677cd61db4e86
* | | | | | GStreamer: fixed build when using GST_PHOTOGRAPHY.Yoann Lopes2013-02-2812-185/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraBinExposure was reimplementing the Qt4 version of QCameraExposureControl instead of the refactored version of Qt5. Zoom features were still handled in CameraBinFocus but these have been moved to their own control in Qt5. Task-number: QTBUG-29300 Change-Id: I0c71cac6011137bc5457f0d362da44c72039004a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | | | | Doc: Clarify and polish docs for QAudio[Input|Output]::start()Sze Howe Koh2013-02-272-29/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudio[Input|Output] retains ownership of the QIODevices that are returned. Change-Id: Ieb2f319eef906822debc13b4399d7e7336024552 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | | | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: If8f3b8e9e75db3b0b78864626314ebebb96c548f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-234-0/+1660
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I39ae1b6beee8d626855a747fdf8d794e6574313b Reviewed-by: Jason McDonald <macadder1@gmail.com>
* | | | WMF: removed unnecessary dynamic_cast.Yoann Lopes2013-02-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29722 Change-Id: Ia0e5c8fb90b231a8d9764524709d5848397c2afb Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Doc: Fix faulty snippet in Video Overview pageTopi Reinio2013-02-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change modifies setVideoSurface() in the snippet code to be a bit more robust. Task-number: QTBUG-29383 Change-Id: I2c691f19fe8f0912c1287597045da3a5579d2108 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 07:07:37 +0000