summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Loop video infinetely on qmlvideofx.sanevala2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | User cannot press cancel after folder up.sanevala2013-02-191-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved cancel button on top of folder list views. Selected file is not anymore emitted on cancel. Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | User is not able to select file from FileBrowser and play it.sanevala2013-02-192-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When string is converted to Url qrc:// scheme is used. Fix Filebrowser to use file:// scheme instead. Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Video has ended UI say tap to stop.sanevala2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Loop video infinetely so tap to stop & start state is correct. Change-Id: I56af6eb00fcc7811cc25099df3c7fa47f429a3e6 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | User cannot press cancel after folder up.sanevala2013-02-191-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved cancel button on top of folder list views. Selected file is not anymore emitted on cancel. Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Fix qrc references on qmlvideo example.sanevala2013-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | User is not able to select file from FileBrowser and play it.sanevala2013-02-192-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When string is converted to Url qrc:// scheme is used. Fix Filebrowser to use file:// scheme instead. Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Fix XPASS on Ubuntu Precise Pangolin.Friedemann Kleint2013-02-182-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf Reviewed-by: Tobias Koenig Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | | Remove QPointerBase bic check.Stephen Kelly2013-02-134-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ifd43a34125af1116b130321df6256b2a7a9b05a2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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 "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-01-316-9/+44
|\ \ \ \
| * | | | Merge branch 'release' into stableSergio Ahumada2013-01-296-9/+44
| |\| | | | | | | | | | | | | | | | | | Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
| | * | | Add a changelog for the BC breakv5.0.1Thiago Macieira2013-01-291-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I768fcbbc871207e99466a2e1a9c7a67d98a2c897 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | | 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>
| | * | | Doc: corrected reference to snippet in qsoundeffect.cppNico Vertriest2013-01-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29101 Change-Id: Ie8cfd257736b0329d9aa5d1f5270c85651d335ec Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@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: Summarized documentation fixes in changelog file.Jerome Pasion2013-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1713bb96c043195af0dadb91b294b6a64db60ad4 Reviewed-by: Sergio Ahumada <sergio.ahumada@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-1726-67/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * | | Update changes file for 5.0.1 releaseSergio Ahumada2013-01-111-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d5fbb280146042da3894ecfdb544e0cbffb3368 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Oleg Shparber <trollixx@gmail.com>
| | * | | Merge branch 'stable' into releaseSergio Ahumada2013-01-0965-230/+651
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973
| | * | | | point dependencies to 'release' branchesSergio Ahumada2012-12-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iabbadc65f1cd3cd8c43f10971b0b5213e459c268 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | | | tst_bic: Replace test data for linux-gcc-ia32Sergio Ahumada2013-01-314-4079/+34187
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ia32 bic data was re-generated due to a BIC introduced by a45d35c07f9eed27fc286ab5fbc00789d45259b5 While we are at it, add a new set of data for amd64. Change-Id: Id210b57f68229aaca09c0cd81bd371392d2bcc74 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | | Doc: Fix module name formatSze Howe Koh2013-01-2916-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-255-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgetsSergio Ahumada2013-01-152-1/+20492
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I070b233b3358abd16bda8e83c139b7ad61b6fdd0 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | | | Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-1526-67/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | | | make use of qtHaveModule()Oswald Buddenhagen2013-01-1116-24/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | | tst_bic: Add test data for linux-gcc-ia32Sergio Ahumada2013-01-113-0/+9583
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I51cabb707107ae6cc788ff04b0886dc3d06b3693 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | | | Update copyright year in Digia's license headersSergio Ahumada2013-01-101002-1002/+1002
| |/ / / |/| | | | | | | | | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | | WMF: added more metadata keys (on Windows 7 and later).Yoann Lopes2013-01-081-5/+216
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01eebd0582d33eb3d581176bba2a84fa75db2463 Reviewed-by: Jason Barron <jason@cutehacks.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | | Compile in 32-bit mode.Morten Johan Sørvig2013-01-083-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CGRect == NSRect only in 64-bit mode. Don't add -framework QuickTime based on the host arch, use QT_ARCH instead. Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | | remove leftover code from multimediawidgets carve-outOswald Buddenhagen2013-01-081-5/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* | | | WMF: release video controls before releasing the sessionYoann Lopes2013-01-075-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the VideoRendererControl, also stop the video surface at the same time. This fixes a crash when changing video. Change-Id: I49484f8b277c345dafb3e5947cf5d23df15546f3 Reviewed-by: Jason Barron <jason@cutehacks.com>
* | | | WMF: Fixed uninitialized member variable.Yoann Lopes2013-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iee60d6eee7bbf9dd7804216f4a49c4549f41ba5a Reviewed-by: Jason Barron <jason@cutehacks.com>
* | | | WMF: re-enabled video probes and made it more robust.Yoann Lopes2013-01-075-67/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the way the custom MF Transform (getting the frames) works: - Recreate it whenever we load a new media - During media type negotiation between nodes, the MFT should support the same types as the video sink supports - Allow input and output types to be changed as many times as needed, otherwise the topology cannot be resolved in some cases Change-Id: I7ca77e1a3dee83643f1a97f2e6ada9c5c0e88309 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 22:14:02 +0000