summaryrefslogtreecommitdiffstats
path: root/src/multimedia/base
Commit message (Collapse)AuthorAgeFilesLines
* Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | | Reviewed-by: Derick Hawcroft
* Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | | | | | This ensures old frame data is cleared when swithing to progressively smaller frame sizes. Reviewed-by: Derick Hawcroft
* Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-7/+26
| | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
* QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-295-24/+411
| | | | | | | | OpenGL paint engine. This makes video rendering with QGraphicsVideoItem much faster on 64 bits systems. Reviewed-by: Justin McPherson
* Compile Qt in C++0x mode.Thiago Macieira2010-03-201-17/+17
| | | | | | | | | | | | | This is not valid in C++0x: char str[] = { 128, 0 }; Because 128 cannot be represented in a char. The same applies to conversion from int to qreal: it's a narrowing conversion, with possible data loss. More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing Reviewed-by: Trust Me
* Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-187-65/+79
| | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
* QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
| | | | Reviewed-by: Andrew den Exter
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-053-4/+4
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * Fix spelling in enumeration.Justin McPherson2010-03-053-4/+4
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-041-4/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-031-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Mac: Select Carbon when using the 10.4u SDK. fix connecting to an ID. make the value of QMAKE_QMAKE somewhat less magic Assistant: Don't warn for non-existing English to English translations. Assistant: Un-watch files at shutdown. Help system: Build search index with low priority. Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes ...
| | * OS X 10.4 compile error; required casting int to GLint.Martin Smith2010-03-021-4/+4
| | |
* | | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-042-10/+36
|/ / | | | | | | of playing from QIODevice based stream.
* | Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-031-5/+9
|/ | | | Reviewed-by:Andrew den Exter
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-262-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
| * QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
| | | | | | | | Reviewed-by: Andrew den Exter
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2420-6/+29
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. Implement toLatin1_helper with SSE2 Doc: add \since 4.7 to new QtMultimedia classes Autotest: add a test to ensure that the Qt headers are clean. Compile on Linux: close(2) is defined in #include <unistd.h> Improved gesture event delivery in graphicsview. Fixed a gesture autotest. Cache scene coordinates of a hotspot in a QGesture. Add an extra operator delete() to QSharedPointer's internals. Fix compilation on x86 with gcc if SSE2 is not enabled Comments the SSE implementation of fromLatin1_helper() Build fixes for the SIMD functions Implement QString::fromLatin1_helper() with SSE2 Cache the result of qDetectCPUFeatures() Move the SIMD detection from QtGui to QtCore Prevent stale QWidget pointers in QCocoaView
| * Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-2420-6/+29
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-242-0/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QMediaContent test; make sure to use network. Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-232-0/+15
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-232-0/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-232-10/+14
| | | |\
| | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-232-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now consistent with QMediaResource. Reviewed-by: Dmytro Poplavskiy
* | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
|/ / / /
* | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-231-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-221-1/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace. Fix compilation with namespace.
| | * | Fix compilation with namespace.ck2010-02-221-1/+3
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-221-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits) Second attempt at work-around for MSVC2008 compiler crash QNativeSocketEngine: Fix some error handling related to waitFor*() qdoc: List new QML elements in \sincelist for What's New page. Cocoa: fix namespace build Cocoa: Fix build with namespace Cocoa: namespace build fix doc: Fixed some qdoc errors. Don't include private headers from public headers. Fix compilation on HP-UXi: m_volume is a #define WinCE doesn't have sys/types.h Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds Fix compilation on recent Linux systems: getpid(2) is in unistd.h. Cocoa: calling QEventLoop::exec from mouse up causes problem Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined) Doc: Collected the Declarative UI tutorials together and renamed them. Doc: Simplified Commercial Editions for Qt 4.7. Work around MSVC2008 compiler crash doc: Added "\since 4.7" to a bunch of declarative stuff. Cocoa: event dispatcher eats mouse events Fix an issue about double-click on Mac OS X. ...
| * | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-221-1/+3
| |/ | | | | | | added/removed namespace macros as needed
* | Documentation fixes.Justin McPherson2010-02-222-10/+14
|/ | | | Reviewed-by: Nicholas Young
* Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-192-4/+4
|
* Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-197-26/+26
|
* 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-173-5/+5
| | | | | | 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.
* 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
|/
* Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate.Andrew den Exter2010-02-112-0/+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.
* 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.
* 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
|
* 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.