summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix for build break on QNXEl Mehdi Fekari2013-04-122-2/+12
| | | | | | | | | | | | | | | | Disable the camera part as it's using APIs not supported for the PlayBook Change-Id: I4e06a74e8a9e5a00e19e443b8aa304cf2bce2216 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-129-10/+14
|\| | | | | | | Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
| * Fix warnings found by GCC 4.8 in qtmultimediaThiago Macieira2013-04-112-4/+5
| | | | | | | | | | | | | | | | qgstreamermessage.cpp:48:12: warning: ‘wuchi’ defined but not used [-Wunused-variable] qvideosurfacegstsink.cpp:383:1: warning: narrowing conversion of ‘4278190080u’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing] Change-Id: I678e9eb39f3963e20109bb15c9c0c0d118b5a3b2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Doc: Fix minor typosSze Howe Koh2013-04-104-5/+5
| | | | | | | | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix warnings in qtmultimediaThiago Macieira2013-04-033-1/+4
| | | | | | | | | | | | | | | | | | /camerabinresourcepolicy.cpp:100:42: error: unused variable 'oldSet' [-Werror=unused-variable] camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized] qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable] Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Stephen Kelly2013-04-111-0/+4
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-031-0/+4
| |\| | | | | | | | | | Change-Id: I9478c1d06b4b4c3bedf1947c709028c6435caf5c
| | * Install the jar fileBogDan Vatra2013-04-021-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ife46aba11920c5109d974f9e388e49320bf1a95a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | Delay deletion of the QNetworkAccessManager.Stephen Kelly2013-04-111-1/+1
|/ / | | | | | | | | | | | | | | | | | | Fixes unit test which crashes on exit. Task-number: QTBUG-30630 Change-Id: I1e13cdc21c4297e492bf74d9a546a91510894288 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-272-8/+10
|\| | | | | | | Change-Id: I6b92013d9fb14b11141d1a15c183776b2b3309fa
| * 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-221-3/+5
| | | | | | | | | | | | | | | | | | 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>
* | Add autoOrientation property to QDeclarativeVideoOutputTobias Koenig2013-03-197-2/+219
|/ | | | | | | | | | | | The autoOrientation property is a flag to switch on/off automatic rotation of the video output, depending on the current screen orientation, to always show the output upright. This is useful when the VideoOutput is used as viewfinder for a Camera. Change-Id: I72753888592dc59c9adaa3343bfec8b168343229 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1414-214/+364
|\ | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * 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>
* | 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>
* | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-19664-966/+5250
|\| | | | | | | | | | | | | | | | | | | 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
| * 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>
| * Fixed a connection to a slot that doesn't existsTasuku Suzuki2013-02-131-1/+1
| | | | | | | | | | Change-Id: I7f94bab4e230996ace46d1c04d9d5a66ad9443d5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * BlackBerry: Fixed playback of streamed audioBernd Weimer2013-02-123-5/+17
| | | | | | | | | | | | | | | | | | | | | | Before audio is played we always seek to position 0. Unfortunately, due to a recent change in mmrenderer, playback stopped working for "non-seekable" media. There is a check now, whether the media is seekable or not. Change-Id: Ieafd8d1364f7ce0194f4fa17d3efe894aa1b289b Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Fix lupdate-Warning in qcamera.cpp.Friedemann Kleint2013-02-061-1/+1
| | | | | | | | | | | | | | qcamera.cpp:183: Cannot invoke tr() like this Change-Id: Ia8f29c02bbc4b91c6542d9ed44136094e1e8a2e1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * fix doc page urlsOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | they are versioned nowadays Change-Id: I5c2ca367b8e63523811c03595cf8a7e326e8a662 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-2/+2
| | | | | | | | | | Change-Id: I20bd702b481d82903f5f4a42e74a8fb8ad4e71dc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add a simple accessor to the video provider snippetLaszlo Papp2013-02-061-1/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-29383 Change-Id: I744fb997dae6ad1f9b8075791ad463c8fe23a96d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-295-2/+12
| |\ | | | | | | | | | Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
| | * Doc: Add QML Types to table of contents in AssistantJerome Pasion2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: I892f386cbd22bfbf7a04be5aecc800896e1090ec Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Add virtual destructors to two classes with other virtualsThiago Macieira2013-01-254-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classes with virtuals are used polymorphically (why have virtuals otherwise?), so they need virtual destructors to be deleted properly. Unless they are never deleted using objects of those two classes -- but why have the interface in the first place if that's the case? This is binary incompatible change. It was agreed upon in the mailing list. Change-Id: I697e4bd53251452a0e6b0c09edd08c4835f90cbd Discussed-on: http://lists.qt-project.org/pipermail/development/2012-December/008908.html Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: Fixed "QML Types" listing C++ classes.Jerome Pasion2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "class" from the "selectors" qdocconf variable Task-number: QTBUG-29242 Change-Id: I1d6c264a6a4277dff27bffcd39d9841363241f7d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-1725-66/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 51334d299520118bbbc077696ca589f972a2f2ea)
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Ie2d0aeff6d8b63ae9d18896320557d28cc9adb68 Reviewed-by: hjk <qthjk@ovi.com>
| * | Doc: Fix module name formatSze Howe Koh2013-01-297-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | QAudioInput/Output documentation: Fix slot naming in snippetsTopi Reinio2013-01-251-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a code snippet use a slot (stateChanged) with a name identical to a signal in QAudioInput / QAudioOutput classes causes problems (incorrect links) in class documentation that refer to the snippet code. This change renames the slots according to standard Qt convention. Same change is applied to example applications as well. Task-number: QTBUG-26688 Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | WMF: enabled HW-accelerated video decoding for the QML video item.Yoann Lopes2013-01-2312-66/+3769
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It also applies to QGraphicsVideoItem when used on a GL viewport. We now have a new video sink that is based on Microsoft's EVR sink, we just replace the default Presenter with our own. Frames are rendered into D3D surfaces using DXVA, then copied into a shared D3D/EGL surface and finally bound to a GL texture to be used by the video surface. The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt must be compiled with ANGLE for this new video sink to be compiled and used. Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | WMF: fixed unresolved topologies when using the custom MediaSink.Yoann Lopes2013-01-232-3/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using our custom MediaSink with RGB formats, Media Foundation fails sometimes to resolve the topology. Inserting ourselves a ColorConverter transform in the topology resolves the problem. The ColorConverter transform cannot handle dynamic frame size changes (this can happen with H264 videos for example) so we also need to insert a Resizer transform to handle transparently frame size changes. Change-Id: Id7f37a0af65f142fbe6d420ad7b2c1ac2156c21b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | WMF: fixed scrubbing and changing rate to 0 or negative values.Yoann Lopes2013-01-231-24/+36
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29147 Change-Id: I3e32e520d676d120d60bcd07d122006c1346eb0d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * | Make sure QVideoSurfaceGLPainter always uses a valid texture.Yoann Lopes2013-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | QVideoSurfaceGLPainter should not assume that the GL texture provided by the QVideoFrame is fully initialized for drawing. Change-Id: I752ecf69a3cf1faf0a7cf8f84b372c3b347824be Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Fixed QSGVideoNodes not deleting their materials.Yoann Lopes2013-01-153-0/+3
| | | | | | | | | | | | | | | Change-Id: Ia7597ade3066c23c54354e2cc36c907e6bf0dfea Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-1525-66/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Added seek() function to QML Video item and updated documentation.Yoann Lopes2013-01-151-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Video item inline example was wrong, changing read-only properties. Task-number: QTBUG-28741 Change-Id: Ia1f6c1110a301a96743e7ebfec51731fcaf6a862 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
| * | Fix: Bug fix in determination of scanline directionWouter Huysentruit2013-01-142-6/+33
| | | | | | | | | | | | | | | | | | | | | YUV and other compressed frame formats are always TopToBottom. Only for uncompressed RGB formats the sign of their height is used to indicate the scanline direction. Change-Id: I6474783583672861eeeb538b79d14ee3d6995f59 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
| * | Fix: Only flip video once for BottomToTop scanline directionsWouter Huysentruit2013-01-141-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Top & bottom of the texture coordinates are already flipped for BottomToTop scanline directions. So there is no need to flip top & bottom of the vertex coordinates too. Change-Id: I221b94afb65c194bdedb787414e6a436b8095fb2 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 19:27:12 +0000