summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-194-76/+76
|
* Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-196-7/+3
|
* Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-1910-102/+102
|
* Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-181-4/+4
| | | | | | This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original relationship was consistent with QImage's RGB24, making the direct show RGB24 format BGR24.
* Make QMediaPlaylist test pass.Andrew den Exter2010-02-171-1/+0
| | | | | The test was failing because an ignored warning wasn't being output. Remove both the warning and ignore statements.
* Fix QMediaPlayer test failure.Andrew den Exter2010-02-175-12/+11
| | | | | | Prepending the Qt namespace with QT_PREPEND_NAMESPACE in a Q_DECLARE_METATYPE statement is unecessary and appears not to work with signal declarations in QSignalSpy.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-171-2/+74
|\
| * Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-171-2/+74
| |
* | Fix license headers.Justin McPherson2010-02-172-4/+4
|/
* Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-161-0/+26
| | | | | | A non-swizzling shader was being used for RGB24. This looked correct on linux because the gstreamer backend was misidentifying BGR24 as RGB24. And since BGR is supported include it in the list of supported formats.
* Fixed compile error in pulseaudio soundeffect implementationKurt Korbatits2010-02-162-3/+3
|
* Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.Andrew den Exter2010-02-161-0/+5
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimediaJustin McPherson2010-02-152-15/+17
|\
| * Fix flickering when items are overlaid on QGraphicsVideoItem.Andrew den Exter2010-02-152-5/+7
| | | | | | | | | | | | | | Re-enable scissor and stencil tests so the texture frame is clipped correctly. Otherwise when an overlaid item is updated the entire frame will be redrawn not just the part intersecting the updated item, resulting in other items being drawn over.
| * Extend hue rotation to a full 360 degrees.Andrew den Exter2010-02-151-1/+1
| |
| * Fix hue rotation in QPainterVideoSurface.Andrew den Exter2010-02-151-9/+9
| |
* | Add missing QT_MODULE to header.Justin McPherson2010-02-151-0/+2
| |
* | Cleanup include files.Justin McPherson2010-02-155-17/+50
| |
* | Use correct license headers.Justin McPherson2010-02-1510-20/+20
| |
* | Use correct path for private header.Justin McPherson2010-02-151-1/+1
| |
* | Use correct path for headers and source in qml.pri.Justin McPherson2010-02-151-6/+6
| |
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-146-4/+12
|\ \ | |/ |/|
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-134-4/+0
| |\ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| | * Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | |
| * | Doc: more \since 4.7Volker Hilsheimer2010-02-051-0/+4
| | |
| * | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
| | |
* | | Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate.Andrew den Exter2010-02-113-2/+2
| | | | | | | | | | | | | | | | | | | | | This reverts aec0628295cda95f2169e3007368797ba6585ee3 and fixes the actual problem, which is the destructors for for classes inheriting QMediaObjectPrivate weren't being called resulting in QPointer destructors also not being called.
* | | Fix crash on exit in player example on Windows.Andrew den Exter2010-02-101-0/+2
| | | | | | | | | | | | | | | | | | Explicitly clear the QPointer to QVideoWidget on destruction, otherwise the destruction of the QVideoWidget will seeminly attempt to clear an invalidated QPointer.
* | | maemo define spelling incorrect.Kurt Korbatits2010-02-091-1/+1
| | |
* | | Don't clear the video output when the video widget is hidden.Andrew den Exter2010-02-082-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changing the video output is a heavy task and is likely to interrupt playback. Not really worth the cost for knowing the video isn't being decoded while it cant be seen. This also applies to the QGraphicsVideoItem.
* | | Update QML media element documentation.Andrew den Exter2010-02-082-54/+628
| | |
* | | Correct QtMedia::SampleRate property mapping.Andrew den Exter2010-02-081-1/+1
| | | | | | | | | | | | Was mapped to frequency instead of sampleRate.
* | | Remove documentation for QGraphicsVideoItem::FillMode.Andrew den Exter2010-02-081-12/+0
| | | | | | | | | | | | No longer exists.
* | | Make nativeSizeChanged() signal non-const.Andrew den Exter2010-02-081-1/+1
| | |
* | | qmlsound changed to soundeffect element.Kurt Korbatits2010-02-0512-195/+1786
| | |
* | | Fix license headers.Andrew den Exter2010-02-051-2/+2
| | |
* | | Add an internal function for setting the default media servie provider.Andrew den Exter2010-02-052-0/+27
| | | | | | | | | | | | This allows auto tests to override the default service provider.
* | | Remove deprecated enum and member variables from video graphics items.Andrew den Exter2010-02-053-12/+0
| | |
* | | Make the paused property of the QML media elements indepent of playing.Andrew den Exter2010-02-054-25/+73
| | |
* | | Don't emit the metaDataChanged signal twice on a meta-data write.Andrew den Exter2010-02-051-3/+1
| | | | | | | | | | | | | | | | | | The QMetaDataControl implementation will emeit the changed signal when appropriate, so it's not necessary to emit it in QMetaDataControlMetaObject as well.
* | | Propagate error signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-056-9/+20
| | |
* | | Connect changed signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-051-0/+6
| | |
* | | Round off volume when converting from real to int.Andrew den Exter2010-02-051-2/+4
| | | | | | | | | | | | And return a volume of 0 if there's no player control.
* | | Added QNetworkRequest constructor to QMediaResource.Nicholas Young2010-02-043-3/+28
| | |
* | | Construct the meta-object directly instead of using QMetaObjectBuilder.Andrew den Exter2010-02-032-49/+175
| | | | | | | | | | | | Removes the dependency on QtDeclarative for this class.
* | | Clip the paint region of QGraphicsVideoItem to it's bounding rect.Andrew den Exter2010-02-033-42/+64
| | |
* | | Add lost QmlMediaBase header file.Andrew den Exter2010-02-021-0/+155
| | |
* | | Export QPainterVideoSurface for QtWebKit.Andrew den Exter2010-02-011-1/+1
| | |
* | | Merge ../../qt/masterJustin McPherson2010-01-2915-73/+60
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/tests.xml
| * | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-2815-73/+60
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp