Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix QMediaPlayer test failure. | Andrew den Exter | 2010-02-17 | 5 | -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-team | Justin McPherson | 2010-02-17 | 1 | -2/+74 |
|\ | |||||
| * | Support YUV444 formats in QPainterVideoSurface. | Andrew den Exter | 2010-02-17 | 1 | -2/+74 |
| | | |||||
* | | Fix license headers. | Justin McPherson | 2010-02-17 | 2 | -4/+4 |
|/ | |||||
* | Don't paint RGB24 frames as BGR24. | Andrew den Exter | 2010-02-16 | 1 | -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 implementation | Kurt Korbatits | 2010-02-16 | 2 | -3/+3 |
| | |||||
* | Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL. | Andrew den Exter | 2010-02-16 | 1 | -0/+5 |
| | |||||
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia | Justin McPherson | 2010-02-15 | 2 | -15/+17 |
|\ | |||||
| * | Fix flickering when items are overlaid on QGraphicsVideoItem. | Andrew den Exter | 2010-02-15 | 2 | -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 Exter | 2010-02-15 | 1 | -1/+1 |
| | | |||||
| * | Fix hue rotation in QPainterVideoSurface. | Andrew den Exter | 2010-02-15 | 1 | -9/+9 |
| | | |||||
* | | Add missing QT_MODULE to header. | Justin McPherson | 2010-02-15 | 1 | -0/+2 |
| | | |||||
* | | Cleanup include files. | Justin McPherson | 2010-02-15 | 5 | -17/+50 |
| | | |||||
* | | Use correct license headers. | Justin McPherson | 2010-02-15 | 10 | -20/+20 |
| | | |||||
* | | Use correct path for private header. | Justin McPherson | 2010-02-15 | 1 | -1/+1 |
| | | |||||
* | | Use correct path for headers and source in qml.pri. | Justin McPherson | 2010-02-15 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-14 | 6 | -4/+12 |
|\ \ | |/ |/| | |||||
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 4 | -4/+0 |
| |\ | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp | ||||
| | * | Doc: remove \preliminary tag from public multimedia classes | Volker Hilsheimer | 2010-02-12 | 4 | -4/+0 |
| | | | |||||
| * | | Doc: more \since 4.7 | Volker Hilsheimer | 2010-02-05 | 1 | -0/+4 |
| | | | |||||
| * | | Doc: add \since 4.7 to new functions. | Volker Hilsheimer | 2010-02-05 | 1 | -0/+8 |
| | | | |||||
* | | | Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate. | Andrew den Exter | 2010-02-11 | 3 | -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 Exter | 2010-02-10 | 1 | -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 Korbatits | 2010-02-09 | 1 | -1/+1 |
| | | | |||||
* | | | Don't clear the video output when the video widget is hidden. | Andrew den Exter | 2010-02-08 | 2 | -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 Exter | 2010-02-08 | 2 | -54/+628 |
| | | | |||||
* | | | Correct QtMedia::SampleRate property mapping. | Andrew den Exter | 2010-02-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Was mapped to frequency instead of sampleRate. | ||||
* | | | Remove documentation for QGraphicsVideoItem::FillMode. | Andrew den Exter | 2010-02-08 | 1 | -12/+0 |
| | | | | | | | | | | | | No longer exists. | ||||
* | | | Make nativeSizeChanged() signal non-const. | Andrew den Exter | 2010-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | qmlsound changed to soundeffect element. | Kurt Korbatits | 2010-02-05 | 12 | -195/+1786 |
| | | | |||||
* | | | Fix license headers. | Andrew den Exter | 2010-02-05 | 1 | -2/+2 |
| | | | |||||
* | | | Add an internal function for setting the default media servie provider. | Andrew den Exter | 2010-02-05 | 2 | -0/+27 |
| | | | | | | | | | | | | This allows auto tests to override the default service provider. | ||||
* | | | Remove deprecated enum and member variables from video graphics items. | Andrew den Exter | 2010-02-05 | 3 | -12/+0 |
| | | | |||||
* | | | Make the paused property of the QML media elements indepent of playing. | Andrew den Exter | 2010-02-05 | 4 | -25/+73 |
| | | | |||||
* | | | Don't emit the metaDataChanged signal twice on a meta-data write. | Andrew den Exter | 2010-02-05 | 1 | -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 Exter | 2010-02-05 | 6 | -9/+20 |
| | | | |||||
* | | | Connect changed signals from QMediaPlayerControl to media QML elements. | Andrew den Exter | 2010-02-05 | 1 | -0/+6 |
| | | | |||||
* | | | Round off volume when converting from real to int. | Andrew den Exter | 2010-02-05 | 1 | -2/+4 |
| | | | | | | | | | | | | And return a volume of 0 if there's no player control. | ||||
* | | | Added QNetworkRequest constructor to QMediaResource. | Nicholas Young | 2010-02-04 | 3 | -3/+28 |
| | | | |||||
* | | | Construct the meta-object directly instead of using QMetaObjectBuilder. | Andrew den Exter | 2010-02-03 | 2 | -49/+175 |
| | | | | | | | | | | | | Removes the dependency on QtDeclarative for this class. | ||||
* | | | Clip the paint region of QGraphicsVideoItem to it's bounding rect. | Andrew den Exter | 2010-02-03 | 3 | -42/+64 |
| | | | |||||
* | | | Add lost QmlMediaBase header file. | Andrew den Exter | 2010-02-02 | 1 | -0/+155 |
| | | | |||||
* | | | Export QPainterVideoSurface for QtWebKit. | Andrew den Exter | 2010-02-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge ../../qt/master | Justin McPherson | 2010-01-29 | 15 | -73/+60 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: tests/auto/tests.xml | ||||
| * | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-01-28 | 15 | -73/+60 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp | ||||
| | * | Revert "Frequency to SampleRate and channels to channelCount." | Kurt Korbatits | 2010-01-14 | 12 | -96/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp | ||||
| | * | Revert "Added setChannelCount() to QAudioFormat." | Kurt Korbatits | 2010-01-14 | 8 | -34/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp | ||||
* | | | Add Audio and Video QML elements. | Justin McPherson | 2010-01-28 | 8 | -2/+1737 |
| | | | |||||
* | | | Add size, offset and fillMode properties to QGraphicsVideoItem. | Justin McPherson | 2010-01-28 | 4 | -34/+185 |
| | | | | | | | | | | | | From: Andrew den Exter committed 9fb251df to qtmobility/qtm-multimedia | ||||
* | | | Add an audioAvailable property to QMediaPlayer. | Justin McPherson | 2010-01-28 | 4 | -0/+47 |
| | | | | | | | | | | | | from: Andrew den Exter committed 00373999 to qtmobility/qtm-multimedia |