summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | | | | | The service links against the multimedia library in addition to the mediaservices libarary, and QAbstractVideoSurface is defined in QtMultimedia, no QtMediaServices.
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-1637-185/+185
| | | | Reviewed-by: Dmytro Poplavskiy
* Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | | | Reviewed-by:Justin McPherson
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-1540-191/+191
|
* Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
| | | | | | | | | To ensure the sequential play() calls work without setMedia(). Since in many case new media is assigned to playback after EOS, seeking is delayed and performed just before playing the same media. Task-number: QTBUG-9798 Reviewed-by: Andrew den Exter
* Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-0/+1
| | | | | | | Can be enabled by settings setAutoFillBackground or the Qt::WA_OpaquePaintEvent to true. Reviewed-by: Dmytro Poplavskiy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-292-1/+10
|\
| * Change availabilty of camera related code.Justin McPherson2010-03-292-1/+10
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | QuickTime video widget: use widget palette for video background color.Dmytro Poplavskiy2010-03-291-1/+2
|/ | | | Reviewed-by: Justin McPherson
* QuickTime media backend: ensure quicktime notification areDmytro Poplavskiy2010-03-291-4/+4
| | | | | | received in the player session thread. Reviewed-by: Justin McPherson
* QuickTime backend: disable video outputs in stopped state.Dmytro Poplavskiy2010-03-2910-33/+19
| | | | | | | | | To keep backend behaviour consistent with other platforms. Also dropped QT7VideoOutput::setEnabled(), currentry the video output is disabled with passing null movie, this allows to ensure the movie is not retained more than necessary. Reviewed-by: Justin McPherson
* QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-296-42/+249
| | | | | | | | OpenGL paint engine. This makes video rendering with QGraphicsVideoItem much faster on 64 bits systems. Reviewed-by: Justin McPherson
* Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | | | | | A positive image height is supposed to indicate BottomToTop scan line direction, but this would seem to be true for RGB formats. Reviewed-by: Dmytro Poplavskiy
* Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
* Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| | | | | Reviewed-by: Dmytro Poplavskiy Task-number: QTBUG-9118
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-2212-55/+86
|\
| * Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1810-39/+39
| | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| * Pause the direct show graph when the playback rate is 0.0.Andrew den Exter2010-03-172-16/+47
| | | | | | | | Reviewed-by: Justin McPherson
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-157-41/+222
|\ \ | |/
| * Gstreamer player: allow video output changes during video playback.Dmytro Poplavskiy2010-03-152-18/+186
| | | | | | | | Reviewed-by: Andrew den Exter
| * Install plugins to correct path.Justin McPherson2010-03-153-3/+3
| | | | | | | | | | Task-number: QTBUG-9001 Reviewed-by: Kurt Korbatits
| * Delayed initialization of gstreamer video widget.Dmytro Poplavskiy2010-03-082-20/+33
| | | | | | | | | | | | | | This saves time/memory when the video widget control is not used, and allows using of audio only QMediaPlayer in non gui applications. Reviewed-by: Justin McPherson
* | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
|/ | | | | | movie when MovieViewOutput output is disabled. Reviewed-by: Justin McPherson
* Fixed compiler warningDmytro Poplavskiy2010-03-051-0/+1
| | | | Reviewed-by: Justin McPherson
* QuickTime movie view output: emit the natural size changesDmytro Poplavskiy2010-03-051-1/+4
| | | | Reviewed-by: Justin McPherson
* QT7 mediaservice; Fix memory leakJustin McPherson2010-03-031-0/+1
| | | | Reviewed-by: Dmytro Poplavskiy
* Undo a doc revert.Justin McPherson2010-03-031-1/+1
| | | | Reviewed-by: Dmytro Poplavskiy
* Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| | | | | | during player session lifetime Reviewed-by: Andrew den Exter
* Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| | | | | Task-number: QTMOBILITY-67 Reviewed-by: Andrew den Exter
* Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| | | | | | | | without waiting for play() or pause(). To keep behaviour consisten with the rest of backends. Reviewed-by: Andrew den Exter
* typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| | | | Reviewed-by: Paul Olav Tvete
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2638-168/+437
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2538-168/+437
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingAndrew den Exter2010-02-2523-71/+202
| | |\
| | | * QT7; Fix warnings.Justin McPherson2010-02-251-31/+43
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-255-34/+76
| | | |\
| | | | * Fixed QTMoview object leak.Dmytro Poplavskiy2010-02-252-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | | | * Use the monitor color space for video output.Dmytro Poplavskiy2010-02-252-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the main monitor color space is used. Colorspace correction is disabled by default for renderer video output, since video frames can on any output device, not only on the main monitor. Reviewed-by: Justin McPherson
| | | | * Try to start media playback on all load state changes.Dmytro Poplavskiy2010-02-252-30/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QuickTime doesn't start movie playback as soon as it loaded, it's necessary to start manualy after suitable load state reached. Reviewed-by: Justin McPherson
| | | * | Qt namespace fixes.Justin McPherson2010-02-2517-6/+83
| | | |/ | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Move a QFile include outside the namespace. Reviewed-by: Justin McPherson
| | * | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There a number of interfaces and guid constants used by the media service that aren't defined by mingw. Define these locally. Reviewed-by: Justin McPherson
| | * | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some filters use interfaces from the windows media sdk instead of those from direct show. These interfaces aren't required for playback, but can provide better feedback about the current media than would otherwise be available. Reviewed-by: Justin McPherson
| | * | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | |/ | | | | | | | | | | | | | | | It's unnecessary and not supported on all compilers. Reviewed-by: Justin McPherson
| | * QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
| | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-251-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. 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. ...
| * | Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-251-1/+1
| |/ | | | | | | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith
* | Merge remote branch 'origin/master'Olivier Goffart2010-02-2413-46/+44
|\ \ | |/ | | | | | | | | Conflicts: configure src/plugins/mediaservices/mediaservices.pro
| * Add -mediaservice argument to configure.Andrew den Exter2010-02-241-11/+13
| | | | | | | | | | | | | | | | Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2312-42/+38
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.