| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits)
Skip OpenGL threading tests on Mac as they were causing reboots
Fixed compile of autotests.
Fix warnings on gcc
Add experimental VBO support for drawCachedGlyphs()'s index array
Fix threaded gl autotest build failure on GLES2
Removed redundant debug output from trace benchmark.
Added two QML based traces to trace benchmark.
Fixed old trace files no longer working.
Reduced the memory footprint of qttrace files.
Added trace replayer benchmark.
Added --range and --single arguments to qttracereplay.
Always accept values reported directly using QTest::setBenchmarkResult.
Make threading use-cases work for X11
Run firstRun initialization in declarative/painting benchmark
Optimization for text drawing on OpenGL
Enable QStaticText in QtDeclarative painting benchmark
Fix no-webkit compiler helpviewer
Make sure height of glyph cache is a power of two
Fixes crash when destroying a QGraphicsItem.
Move benchmarks/qvector to benchmarks/corelib/tools/qvector
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
video outputs.
|
| | | | |
| | | | |
| | | | |
| | | | | |
size changes.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
To start playback and notify video output
when movie reached playable state.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |/ / / |
|
| |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (90 commits)
Switch RGB24 and BGR24 shaders back.
Disable the full screen video widget tests on X11.
Use the IPropertyBag interface to get audio device names.
Fix qmlgraphicsvideo.pro
Add qmlgraphicsvideo test to auto.pro
Fix QMediaServiceProvider test.
Make QMediaPlaylist test pass.
Fix QMediaPlayer test failure.
Fix qmlaudio.pro.
Make QMediaPlayer test compile.
Remove tests not relevant to playback functionality.
Remove tests that depend on playlist plugins.
Support YUV444 formats in QPainterVideoSurface.
Add qmlaudio test to auto.pro
Fix license headers.
Remove unused files.
Extend the mappings between Direct Show and QVideoFrame color formats.
Don't paint RGB24 frames as BGR24.
Added multimedia to qmlviewer
Fixed compile error in pulseaudio soundeffect implementation
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original
relationship was consistent with QImage's RGB24, making the direct show
RGB24 format BGR24.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (88 commits)
Use the IPropertyBag interface to get audio device names.
Fix qmlgraphicsvideo.pro
Add qmlgraphicsvideo test to auto.pro
Fix QMediaServiceProvider test.
Make QMediaPlaylist test pass.
Fix QMediaPlayer test failure.
Fix qmlaudio.pro.
Make QMediaPlayer test compile.
Remove tests not relevant to playback functionality.
Remove tests that depend on playlist plugins.
Support YUV444 formats in QPainterVideoSurface.
Add qmlaudio test to auto.pro
Fix license headers.
Remove unused files.
Extend the mappings between Direct Show and QVideoFrame color formats.
Don't paint RGB24 frames as BGR24.
Added multimedia to qmlviewer
Fixed compile error in pulseaudio soundeffect implementation
Always pass encoded URLs to GStreamer. Fixes issue with spaces in
Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is instead of parsing the identifier, which is guaranteed to have
a readable name in it.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The test was failing because an ignored warning wasn't being output.
Remove both the warning and ignore statements.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | | |
|
| | | |/ / |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | | |
|
| | | |/ /
| | | | |
| | | | |
| | | | | |
filenames.
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The mutex proctecting the queue was being released and reacquired
between when the head and tail are cleared, making it possible to append
a new item to a popped, or even deleted tail, resulting in a lost event.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When stopped, paused, at the end of media, and after a seek. This
prevents progress bars stopping just short of the end because the last
timed progress updates was 300ms before the end of playback.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Was off by one resulting in repeated playback of mp3s being cutt off.
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The correct function is freeData().
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Where unusable is not readable or sequential.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Explicitly clear the QPointer to QVideoWidget on destruction, otherwise
the destruction of the QVideoWidget will seeminly attempt to clear an
invalidated QPointer.
|
| | | | | | |
|