summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* tr()-Fixes.Friedemann Kleint2012-11-292-19/+19
| | | | | | | | Make WMF-player error message consistent (sentences, no exclamation marks). Improve wording. Change-Id: I876b26067fb374833037aa93dd9675ab556bf972 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix QGstreamerPlayerSession::availablePlaybackRanges()Andras Becsi2012-11-282-20/+15
| | | | | | | | | | | | | | | Since buffering information through buffering queries is only valid if progressive download buffering (on-disk caching) is enabled or local media is played and we explicitly disable on-disk buffering because of cleanup issues with gstreamer availablePlaybackRanges() always returns an empty range for online media. Seeking is also possible using http range requests therefore if valid playback ranges could not be determined we should return the [0..duration] range unless the source is a live stream or the duration is unknown. Change-Id: Idbebc0fdde5053c6f9c0b3794c6d122492c6239c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Doc: cleanup multimedia overviewAndy Nichols2012-11-281-3/+10
| | | | | | | Added an introduction, and fix some formatting. Change-Id: Ic23416cf1113895a1895a53f310530a83a9013d3 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Update links from labs.qt.nokia.com to blog.qt.digia.comSergio Ahumada2012-11-272-2/+2
| | | | | Change-Id: I003c9a5061efe586ecdadde58827ef4887b49b5f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Cleanup diagram placeholder in Camera OverviewAndy Nichols2012-11-271-4/+0
| | | | | | | | | The diagram still needs to be done, but is not necessary for the 5.0 release. Task-number: QTBUG-28235 Change-Id: I1e8b4d731c00516408de89be81d4ecb8bde3d016 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QT7: Remove usage of QMAKE_MAC_XARCHAndy Nichols2012-11-231-7/+3
| | | | | | | | | Support for QMAKE_MAC_XARCH was removed in Qt 5.0, so it shouldn't be used in the QT7 plugin, as it causes build failures. Task-number: QTBUG-27180 Change-Id: I7d907a9afbcbc4989b794350c94d0f619e4d2b7d Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix building of examples.Friedemann Kleint2012-11-2214-321/+54
| | | | | | | | | | | | | | - Correct install paths - Add missing resources - Add declarative-radio - Remove deploy/install logic from qmlapplicationviewer.pri and snippet .pro-files of the video examples and add normal install rules. Task-number: QTBUG-27977 Change-Id: Iadecb14d9330c752f6fb739918da743a854ba236 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix building of installed player example.Friedemann Kleint2012-11-211-1/+1
| | | | | | Task-number: QTBUG-27977 Change-Id: I383cd971a54d40008f9a5899f043abb9961c489a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* AVFoundation: Enable QImage based frame fallbackAndy Nichols2012-11-215-22/+95
| | | | | | | | | | | QGraphicsVideoItem was not working because the QPainterVideoSurface was unable to paint BGR32 format OpenGL textures. Now if the QGraphicsView window has a QGLWidget viewport, we use the GLTextureHandle to render the video, otherwise we fallback to the software QImage rendered case. Task-number: QTBUG-28017 Change-Id: I9304e0a2536f15075ae34cdd509ef24fbc18604e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Multimedia: examples coding style unificationhjk2012-11-2169-459/+387
| | | | | Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce Reviewed-by: David Schulz <david.schulz@digia.com>
* QtMultimedia: examples/camera coding stylehjk2012-11-216-72/+57
| | | | | | | Also unconditionally include code for Qt >= 4.7 Change-Id: Ic8b9d009a54f9e0fe7e9477c75c125ad09a485ee Reviewed-by: David Schulz <david.schulz@digia.com>
* Doc: Polish the description of changes to the Qt Multimedia moduleSze Howe Koh2012-11-211-62/+46
| | | | | | | | | | | | | | | | - Fix errors - QtMultimediaKit is renamed to QMultimedia, not QtMultimedia - It's not necessary to explicitly convert metadata keys into strings -- Q_DECLARE_METADATA takes care of that - The introduction of MediaPlayer and VideoOutput does not affect existing code - Follow module naming guidelines at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation - Shorten descriptions, improve flow - Remove trivia Change-Id: I3ab9bb2f8f33cbea52b5993f3060d929a7e39ef1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* AVFoundation: Fix broken requestControl logicAndy Nichols2012-11-201-6/+10
| | | | | | | | | | AVFMediaPlayerService::requestControl was returning the video output control after the video output was created, and this could result in unexpected behavior, as well as prematurely calling releaseControl on the video output. This should fix the "player" example on OS X. Change-Id: Ie23b1176272a1f9daa5edeec856141ac52a450c7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove nonfunctional mediaDownloadEnabled propertyAndras Becsi2012-11-203-24/+3
| | | | | | | | | | | | | | I suppose this was introduced after an API freeze to try to support on-disk buffering but since the code does not set the GST_PLAY_FLAG_DOWNLOAD flag on the player element the feature is not only undocumented but also nonfunctional. If on-disk buffering is needed we should add proper API to enable/disable it for all backends which might be possible with Qt 5.1 the earliest. Change-Id: I6b42a06166509db0023a3e0263ecc3a36f0d2bdb Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* simplified exampleMaurice Kalinowski2012-11-202-10/+0
| | | | | | | | | - do not use any opengl additions inside this simple example - also fixes problems in relation to mixing angle with GLWidgets Task-number: QTBUG-27963 Change-Id: I69a966b886cd8b3e88d6f3be48463eee59baa58a Reviewed-by: hjk <qthjk@ovi.com>
* Clean up QGstreamerPlayerSessionAndras Becsi2012-11-202-18/+3
| | | | | | | | Remove dead code and fix compiler warnings about unused and uninitialized variables. Change-Id: I809d905e13234db1dbc1b9c2a0ac887c5c712fc7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Media is always set to be seekable with the gstreamer backendAndras Becsi2012-11-201-16/+9
| | | | | | | | | | | | | | Since the used mechanism for querying whether the media is seekable was unreliable the code has been commented out and the media always set to be seekable. Query for seeking capabilities after the duration is known in updateDuration() which retries to determine the duration multiple times if unsuccessful and use gst_query_parse_seeking to check if the media is seekable or not. Change-Id: I141dfb1616dc59f8c92a698ddb2867f63a2656b9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-205-244/+23
|\ | | | | | | Change-Id: Ia45daee9b5089c01300cf27484296809dd87302f
| * Doc: Removed extra qdocconf files.Jerome Pasion2012-11-075-243/+23
| | | | | | | | | | | | | | | | The variables and macros are in qtbase/doc/global. Corrected QHP variables. Change-Id: I4b5816d0d0ce7a228ed27944fb9471f390f7334d Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia ↵Jerome Pasion2012-11-02164-327/+3719
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Idb607da32f80784d94556443be6740c6d7223411
| * | doc: update documentation project name to match module nameTor Arne Vestbø2012-10-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise qdoc will fail to find the index file when looking for qtbase/doc/qtmodulename/qtmodulename.index. Change-Id: I116b09350f157a42df6dbdb9d3029f4917f59299 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix qmake warning about missing headers.Friedemann Kleint2012-11-191-2/+2
| | | | | | | | | | | | | | | Change-Id: I41caa02e09a4e0f81e6e5cbf3590c92fa0edaf68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Fix syncqt-warnings.Friedemann Kleint2012-11-1978-201/+201
| | | | | | | | | | | | | | | | | | | | | Use include with module name for the multimedia-classes. Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | WMF: Fixed color adjustment when using the EVR window control.Yoann Lopes2012-11-191-1/+1
| | | | | | | | | | | | | | | Change-Id: I007937b358f062cd9d3d3c02e3a0780d6b2539be Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | Fix compilation with -no-rtti.Friedemann Kleint2012-11-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Availability of dynamic_cast should be checked. Task-number: QTBUG-27939 Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | | Fix a possible crash in QSoundEffect.Robin Burchell2012-11-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pa_stream_cork may fail, and pa_operation_unref won't handle that gracefully, so check the return value before unreffing. Done-with: Vesa-Matti Hartikainen Change-Id: If789e37a13f85487c79dd8a03a7ca3624b1412d2 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | Adding 3rdparty library libfftreal to install stepHolger Ihrig2012-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding libfftreal to install step in this directory, otherwise it will not be deployed for the installers Task-Number: QTBUG-27876 Change-Id: I090b61def94eee9c63d732067036b3ca5398cc52 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-082-4/+4
| | | | | | | | | | | | | | | | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Doc: Put QMediaMetaData in the Qt Multimedia modulev5.0.0-beta2Sze Howe Koh2012-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | This should have been done in 13fd00199a6a41af2bdbb876fe33c75547e3d996 Change-Id: I3ce6e3ccde5f29cce3c24ee539dee6fcdff7b653 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | Blackberry: Add a page with platform-specific documentationThomas McGuire2012-11-072-0/+83
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic03c59523648ee25c419ec5d80122da9a717aa2d Reviewed-by: Bernd Weimer <bweimer@rim.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Blackberry: Enable support for audioengine if availableThomas McGuire2012-11-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | BB10 ships OpenAL, so the audio engine works there. Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2 Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Fix the bufferProgress property of QDeclarativeAudioAndras Becsi2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bufferProgress property of QDeclarativeAudio is documented to hold how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full) and should be declared to be of type qreal instead of int. The implementation was correctly normalizing the buffer status percentage to the [0, 1] range but the returned value was truncated to int in QML because of the faulty property declaration. Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | | Enable the "#include <QAudio>" camel-case header (regression)Sze Howe Koh2012-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The header was available in Qt 4, but somehow went missing. Change-Id: I5e54921afd6e196d67db797331a0b0093f41ce34 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-0628-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0678-384/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Enable the "#include <QMediaMetaData>" camel-case headerSze Howe Koh2012-11-066-538/+638
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the QMediaMetaData namespace into new files, and have sync.profile generate the camel-case header during compilation. For now, the new header (qmediametadata.h) is included whereever the old one appears (qtmedianamespace.h), but an audit will be done later to make explicit #includes only where necessary. NOTE: Git may think that a rename has occurred. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I63705722a5e175628d56128888a94ae4c20879f2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-0633-502/+500
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-0518-92/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now. note that in the qmediaserviceprovider test we must override that. also, TARGET munging is done automatically. Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | fix VPATHOswald Buddenhagen2012-11-051-0/+1
| |/ |/| | | | | | | | | | | | | | | the code relied on the now removed qmake misfeature of adding DEPENDPATH to VPATH. Change-Id: I3bea30a25776eb945fbd65f9e9811c91d882893f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | test: Mark tst_QSoundEffect as insignificantSergio Ahumada2012-11-011-1/+2
| | | | | | | | | | | | | | Task-number: QTBUG-26509 Task-number: QTBUG-26748 Change-Id: Id8952c2ed3e2a261907eed1e160fc187af6983ce Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* | CMake: Remove obsolete test_modules testStephen Kelly2012-11-013-82/+0
| | | | | | | | | | | | | | The generated module_includes test is a super-set of this test. Change-Id: I33d665a38d664c049028519d73dfad912fc22a1f Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
* | CMake: Test module includesStephen Kelly2012-10-311-0/+7
| | | | | | | | | | Change-Id: I1676efff8071fa0fae13bb484a5e18928e35f663 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-25120-240/+0
| | | | | | | | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix the QML list interfaceFriedemann Kleint2012-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The QML list interface was changed, so that there is now a read only constructor and the default properties are removed. This is because the original interface was very runtime centric, like other parts in QML. The new interface was changed for the needs of the QML designer and debugger. Task-number: QTBUG-9390 Change-Id: Ia61a2457432b4fc5c0cf440eeebd9d3a6c4c6463 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | add install path to ruleMaurice Kalinowski2012-10-221-0/+3
| | | | | | | | | | | | | | | | fix installation into prefix directory. Change-Id: I6838589e2e186d4f23d240e0e7c2772a46af3a9d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Fix for QuickTime 7 media player backendCaroline Chao2012-10-193-16/+33
| | | | | | | | | | | | | | | | | | Fix build on Mac 10.6 (32bits) Task-number: QTBUG-27179 Change-Id: If0b83605650966bf801b5fbb06d02c113d0b4214 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Add MediaPlayer support to AVFoundation pluginAndy Nichols2012-10-1925-1/+3591
| | | | | | | | | | | | | | | | | | | | This plugin would be used on Mac 10.7+ where without the QuickTime C API our QT7 media player performance was crippled. Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Doc: Removed dependency on qtmultimedia.cssVenugopal Shivashankar2012-10-191-5/+0
| | | | | | | | | | | | | | | | All module documentation must use the global HTML template and style sheet in qtbase\doc\global. Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Make QGstreamerPlayerSession 'VAAPI-aware'.Yoann Lopes2012-10-172-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment the GStreamer player pipeline is not setup properly when the VAAPI plugin is available, resulting in no video being shown. Added 'video/x-surface' as one of the default raw formats for the decodebin. Don't use vaapidecode when the video sink is not compatible. This is a preliminary patch to support VAAPI. In the current state vaapidecode will never be used as none of our video sinks support the video/x-surface format. Change-Id: I39f339b483d4052dd1e29c2b0ef06343d5670224 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-10-173-3/+3
| | | | | | | | | | | | Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 07:11:26 +0000