summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Fix QML video app freeze on SymbianJuha Kukkonen2012-08-151-0/+8
| | | | | | | | | | | | | | | If EGL context gets destroyed before eglEndpointCancelNotificationNOK call then pending request is not completed. EGL context may get destroyed too early e.g. in background/key lock/task switch/app exit cases. Proper fix would require changes to platform side or adding sync between Qt and Mobility when EGL context is destroyed. Added workaround to Mobility side to complete pending request if eglEndpointCancelNotificationNOK does not complete request. Task-number: ou1cimx1#1010331
* Fix QML video crash on SymbianJuha Kukkonen2012-08-141-0/+4
| | | | | | | | | In certain cases, e.g. keylock/task switch, it's possible that EGL context is destroyed before imageAvailable signal is emitted. Added EGL context validity check before accessing image. Task-number: ou1cimx1#1010331
* Fix QML video not resuming after background/keylock/task switchJuha Kukkonen2012-08-141-2/+7
| | | | | | | | | | Multimedia framework sends video player error event when video playback is paused due to foreground lost event. Changed handling of this event to be similar to application foreground lost event. Task-number: ou1cimx1#1010331
* Fix build break when verbose multimedia traces are enabled on SymbianJuha Kukkonen2012-08-131-2/+2
| | | | Reviewed-by: TrustMe
* Fix for missing 1920x1088 video resolution for Nokia PureView 808Marko Kenttala2012-08-091-1/+1
| | | | | | | | | | | | | QMediaRecorder::supportedResolutions does not report 1920x1088 resolution to be available if codec is defined. Symbian drops every resolution above 1920x1080 for video/H264; profile-level-id=644028 codec. Changed maximum resolution for video/H264; profile-level-id=644028 to be 1920x1088. Task-number: QTMOBILITY-2069 Reviewed-by: Juha Kukkonen
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia ↵Qt Continuous Integration System2012-06-261-2/+4
|\ | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Fix null pointer crash in QtM Multimedia Camera plugin
| * Fix null pointer crash in QtM Multimedia Camera pluginAapo Haapanen2012-06-261-2/+4
| | | | | | | | | | | | | | Check the pointer before using it. Task-number: ou1cimx1#1008560 Reviewed-by: Juha Kukkonen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia ↵Qt Continuous Integration System2012-06-182-20/+19
|\| | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Symbian: Fix initial volume setting
| * Symbian: Fix initial volume settingJaakko Helanti2012-06-182-20/+19
| | | | | | | | | | | | | | | | | | This commit fixes the problem that when starting to play audio, the initial volume setting does not have any effect, but audio is played with a default volume. Task-number: QTMOBILITY-2061 Reviewed-by: Marko Kenttala <ext-marko.r.kenttala@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ↵Qt Continuous Integration System2012-06-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location: Update routing host address in location
| * | Update routing host address in locationJuha Kukkonen2012-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Updated routing host to use new address (route.nlp.nokia.com) Task-number: QTMOBILITY-2045 Reviewed-by: Aapo Haapanen
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qtmobility/qtmobilityJuha Kukkonen2012-03-087-232/+151
| |\ \
* | \ \ Merge branch 'master' of ↵Qt Continuous Integration System2012-05-221-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework: Fix a crash in S60MediaPlayerControl::setMedia
| * | | | Fix a crash in S60MediaPlayerControl::setMediaAapo Haapanen2012-05-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When S60MediaPlayerControl::setMedia is called, a new S60MediaPlayerSession is created and the old one is deleted. This can cause problems if setMedia is called as a result of a signal from the session. Change the deletion of old session to deleteLater() to avoid this problem. Task-number: ou1cimx1#993581 Reviewed-by: Juha Kukkonen
* | | | | Symbian documentation update for DocumentGalleryModelTuija Lindfors2012-04-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian platform does not support some rootType properties. The relevant documentation in qdeclarativegalleryquerymodel.cpp was updated. Task-number: QTMOBILITY-1962 Reviewed-by: Juha Kukkonen
* | | | | Added support for S60_VERSION 5.5Juha Kukkonen2012-04-131-0/+3
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Updated .pro files that would not work correctly if S60_VERSION is 5.5. Reviewed-by: Pasi Pentikainen
* | | | Fix crash in apps that assume access to frame dataMurray Read2012-04-124-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera service has been creating video frames with CPU addressable content, until recently. Some apps are written to assume this content is available and they now crash, since the camera service stated creating EGL video frames instead. The fix is to have the camera service default to creating CPU addressable video frames again, unless its client has set a property to allow it to use EGL. Task-number: ou1cimx1#991661 Reviewed-by: Juha Kukkonen
* | | | Fixed build failuresGareth Stockwell2012-03-193-5/+5
|/ / / | | | | | | | | | Reviewed-by: TrustMe
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo ↵Qt Continuous Integration System2012-03-092-18/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo: Improve GeneralInfo QML Element documentation. Improve StorageInfo QML element documentation Clarify QContactManagerEngine::waitForRequestFinished documentation Added missing since tags to QContactFetchHint documentation Clarify what is included in QContactDetail default schema. Improve GeneralInfo QML Element documentation. Improve NetworkInfo QML element documentation Clarify FeedbackEffect documentation
| * | | Improve GeneralInfo QML Element documentation.Juha Kukkonen2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixed signal name. Task-number: QTMOBILITY-1876
| * | | Improve GeneralInfo QML Element documentation.Juha Kukkonen2012-03-081-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | Added missing properties, signals and methods documentation. Task-number: QTMOBILITY-1876
| * | | Improve NetworkInfo QML element documentationJuha Kukkonen2012-03-081-13/+28
| | |/ | |/| | | | | | | | | | | | | Added missing documentation for some signals and properties Task-number: QTMOBILITY-1889
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ↵Qt Continuous Integration System2012-03-082-1/+29
|\ \ \ | |/ / |/| / | |/ | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location: Fix MapGroup visible property does not have effect
| * Fix MapGroup visible property does not have effectJuha Kukkonen2012-03-072-1/+29
| | | | | | | | | | | | | | MapGroup element's visible property did not have any effect as it did not change visibility of objects belonging to the group. Task-number: QTMOBILITY-1878
* | Fix build break in symbiansim component on SymbianJuha Kukkonen2012-02-141-1/+10
| | | | | | | | | | | | | | | | | | | | CI system uses public SDKs and not all SDK (e.g. 5th Ed) contain Telephony Configuration API headers. Changed implementation to use hard coded values as it's done elsewhere in contacts plugin. Reviewed-by: TrustMe
* | Fix contacts plugin platform version detection on SymbianJuha Kukkonen2012-02-132-1/+9
| | | | | | | | | | | | contactsmodel should be build on Symbian 5.3 platform. Reviewed-by: Pasi Pentikainen
* | Porting of contactmodel error #958574,#911410,#896532 from SR2 to SR1 (29980)Prankur Sarbhai2012-02-135-237/+139
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia ↵Qt Continuous Integration System2012-01-272-1/+2
|\ | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Use guarded pointer to viewport in Symbian QGraphicsVideoItem implementation Idle current consumption is high
| * Idle current consumption is highSridhar Ravipati2012-01-122-1/+2
| | | | | | | | | | Because of Unnecessary Timer events Current Consumption is high Case. 957531
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia ↵Qt Continuous Integration System2012-01-061-1/+3
|\| | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: S60MediaPlayer were crashing for empty QMediaContent
| * S60MediaPlayer were crashing for empty QMediaContentSridhar Ravipati2012-01-061-1/+3
| | | | | | | | | | | | | | | | If the setmedia is called with empty QMedia content then Session was getting deleted, because of that subsequent signal emits were crashing in EndOfMedia. Signed-off-by: Sridhar Ravipati <sridhar.ravipati@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ↵Qt Continuous Integration System2011-12-225-4/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location: Def file fix for previous commit Fix location plugins to use given network access manager.
| * | Fix location plugins to use given network access manager.Marko Kenttala2011-12-215-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed location plugins to use network access manager factory from desclarative engine. Application can specify which access manager factory is used. Task-number: ou1cimx1#925808 Reviewed-by: Juha Kukkonen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-vibra into ↵Qt Continuous Integration System2011-12-132-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-vibra: Fixed local variable was declared but never referenced compiler warning Fixed HapticsEffect causing application not to exit properly on Symbian
| * | | Fixed local variable was declared but never referenced compiler warningJuha Kukkonen2011-12-131-1/+0
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Fixed HapticsEffect causing application not to exit properly on SymbianJuha Kukkonen2011-12-132-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed plugin to release it's resources when event loop exits to ensure that plugin can be unloaded. Task-number: QTMOBILITY-1464 Task-number: ou1cimx1#948499 Reviewed-by: Miikka Heikkinen
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into ↵Qt Continuous Integration System2011-12-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts: Fix for ou1cimx1#946546, Incorrect implementation in contacts.pro-file prevents cleaning and rebuilding of qtmobility.
| * | | | Fix for ou1cimx1#946546, Incorrect implementation in contacts.pro-file ↵Markku Kaurila2011-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | prevents cleaning and rebuilding of qtmobility.
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia ↵Qt Continuous Integration System2011-12-06112-2228/+3411
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Fix license header and spelling error in f7c1dda0 Fix build break caused by f7c1dda0 Fix another build break caused by a9d8bf0d Added Function to handle HW/Media Key Events to Test Player Application Fix build break caused by a9d8bf0d Code clean up in Symbian MMF backend Trap leaves in non-leaving functions Use QSymbianGraphicsSystemHelper Add EGL video rendering path on Symbian Enabled deployment of infixed binaries on Symbian
| * | | Fix license header and spelling error in f7c1dda0Gareth Stockwell2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-1818 Task-number: MOBILITY-3084 Reviewed-by: TrustMe
| * | | Fix build break caused by f7c1dda0Gareth Stockwell2011-12-052-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow code to build when QT_NO_OPENGL is defined. Task-number: QTMOBILITY-1818 Task-number: MOBILITY-3084 Reviewed-by: TrustMe
| * | | Fix another build break caused by a9d8bf0dGareth Stockwell2011-12-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that cntbackendsdefs.h is exported to epoc32/include. Otherwise, we get a duplicate definition error, due to c999bb15. Task-number: QTMOBILITY-1810 Reviewed-by: TrustMe
| * | | Code clean up in Symbian MMF backendGareth Stockwell2011-11-2553-1896/+915
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes * Qt code style fixes * Correct whitespace * Indenting * Space around parentheses and operators * Removed excessive blank lines * Correct brace placement * Moved S60MediaSettings class into its own file * Moved some function implementations out of line * Removed uninformative API doc comments * Replaced use of Symbian TBool values (ETrue/EFalse) and macros (TRUE/FALSE) with true/false * Replaced use of NULL with 0 * Removed unnecessary #include directives * Changed some helpers from member to free functions Reviewed-by: TrustMe
| * | | Trap leaves in non-leaving functionsGareth Stockwell2011-11-251-7/+8
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Use QSymbianGraphicsSystemHelperGareth Stockwell2011-11-253-20/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for video rendering to work, the Symbian QtMultimediaKit backend needs access to QtGui functionality which is not exposed via public interfaces, namely: * QSymbianControl::setIgnoreFocusChanged(bool) * Setting custom painting modes, which control how content is blitted from the backing store into the native window surface * Requesting notification when Qt drawing starts and stops, so that the backend can ensure this does not interfere with video rendering. Until now, this was achieved by the backend including private QtGui headers. If these headers are not present in the environment in which QtMobility is compiled, a warning is printed, telling the user that video / viewfinder rendering will not work correctly when the resulting binaries are installed. This patch uses instead a Symbian-specific helper API which has been added to QtGui in Qt 4.8. Task-number: MOBILITY-747 Reviewed-by: mread
| * | | Add EGL video rendering path on SymbianGareth Stockwell2011-11-2528-230/+2269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for rendering video and camera viewfinder frames via EGL, as an alternative to the existing rendering path in which frames are sent directly to the compositing window manager. Rendering via EGL rather than directly to the compositor has a number of advantages, including: * Elimination of artefacts. The direct rendering path requires content on the video and UI surfaces to be synchronized; in the EGL rendering path, this synchronization is deferred to the OpenGLES/OpenVG implementation. * Full support for QGraphicsView and QML APIs. The direct rendering path does not support operations such as free rotation and shear transformations; these are supported by both OpenGLES and OpenVG. * Ability to transform video content using OpenGLES. Making video frames available to EGL means that they can be transformed using shader effects, or rendered into 3D scenes. It also has some disadvantages: * Greater memory consumption * Lower-quality scaling Due to these drawbacks, it is desirable to use the direct rendering path for 'standard' full-screen video playback / viewfinder display. The QGraphicsVideoItem implementation by defaut switches automatically between the two rendering paths; see comments in qgraphicsvideoitem_symbian.cpp for details. The EGL rendering path is implemented using the EGL_NOK_image_endpoint2 extension. If this is not available, QGraphicsVideoItem falls back to using the direct rendering path. If creation of the EGL endpoint fails, QGraphicsVideoItem falls back to using the direct rendering path. Task-number: QTMOBILITY-1818 Task-number: MOBILITY-3084 Reviewed-by: mread
| * | | Enabled deployment of infixed binaries on SymbianGareth Stockwell2011-11-2535-80/+136
| | | | | | | | | | | | | | | | | | | | Task-number: QTMOBILITY-1810 Reviewed-by: Miikka Heikkinen
* | | | Merge branch 'master' of ↵Qt Continuous Integration System2011-11-244-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework: Fix Symbian file cases for building on Linux host.
| * | | | Fix Symbian file cases for building on Linux host.Pasi Pentikainen2011-11-244-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Juha Kukkonen Task-number: ou1cimx1#896805
* | | | | Merge branch 'master' of ↵Qt Continuous Integration System2011-11-246-6/+6
|\| | | | | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration * 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework: Fix location doc file names clash Fill s_qstrings in QContactStringHolder::operator=(const QString&) disable gypsy and geoclue for harmattan platform