summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-18spec: use gstreamer 1.+ on Tizen 3.0 Mobilesubmit/tizen_ivi_panda/20140403.012106submit/tizen/20140318.999999submit/tizen/20140318.153154accepted/tizen/ivi/panda/20140403.014135accepted/tizen/ivi/panda/20140321.020558accepted/tizen/ivi/20140318.171219accepted/tizen/generic/20140319.075841accepted/tizen/generic/20140318.154659tizen_ivi_pandaaccepted/tizen_ivi_pandaaccepted/tizen_genericTomasz Olszak1-3/+3
Bug-Tizen:TIVI-2416 Change-Id: I0917044639dd4c72a53df8ed7c21aa23a65e559e Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-03-18Bump package version to 5.2.90+alphaTomasz Olszak1-4/+27
Bug-Tizen:TIVI-2416 Change-Id: I32785ac31eae1a09a2362b97aea050ee89140568 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-03-13spec: Explicitly add all content of cmake and qml/QtMultimedia.Tomasz Olszak1-3/+3
Bug-Tizen: TIVI-2416 Change-Id: I6c1e914a3779096151646d7111ea35c75339da30 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-03-13Exclude QtMultimedia from generic profile.Tomasz Olszak1-0/+3
Generic lacks gstreamer-0.10 framework. Bug-Tizen: TIVI-2416 Change-Id: I3c9271460328d7d8fdfbdefc0666c2e4c8a77518 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-03-13Added QtMultimedia specTomasz Olszak1-0/+228
Change-Id: Ie4db10c015c8a15387b4acfc4c152dc972b55b04 Tizen-Bug: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-03-13Initial porting effort to GStreamer 1.0.upstream/5.2.90+alphaYoann Lopes38-139/+1378
Imported from git@github.com:jhodapp/qtmultimedia.git Contributions from: Ilya Smelykh <ilya@videoexpertsgroup.com> Jim Hodapp <jim.hodapp@canonical.com> Sergio Schvezov <sergio.schvezov@canonical.com> Change-Id: I10fa5e5078efa4564ce833befd417008e26a90a9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-10Add missing documentation for Audio and MediaPlayer loops property.Yoann Lopes1-0/+24
Task-number: QTBUG-35306 Change-Id: If0e9784ede5db887d3756972e8db54b5485d6cdd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-03-07Fix typo Inavlid -> InvalidSergio Ahumada1-1/+1
Change-Id: I3fc6ec3cc319784f32368585ae4eb379317ef4ce Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-03-07WMF: each media player now has its own volume.Yoann Lopes2-28/+26
Instead of setting the volume on the audio session, which is shared by all QMediaPlayers, we now set the volume on the media player's own audio stream. This results in all QMediaPlayers correctly having independent volumes. [ChangeLog][QtMultimedia][Windows] QMediaPlayer::setVolume() does not affect the volume of other QMediaPlayers anymore. Task-number: QTBUG-30317 Change-Id: I8ea8ec47fc86127da01dc5c8247fb6f72c834630 Reviewed-by: Wouter Huysentruit <wouter_huysentruit@hotmail.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-07Make declarative-camera example show frames in the correct orientation.Yoann Lopes1-1/+2
VideoOutput's autoOrientation property should be set to true in order to always have the video frames in the same orientation as the screen. Change-Id: I76ebb2979070e52d4f62972d63896eada1a208be Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-07AVFoundation: fix crash when no camera is available on the system.Yoann Lopes1-3/+5
Change-Id: I0b473babae4d1fae605667957deca21ba1dc0c09 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-07CoreAudio: Set default audio category to Playback on iOSAndy Nichols3-1/+17
This fixes the issue that when we use QSoundEffect we dont need to get permission to use the microphone. This was because we were defaulting to PlayAndRecord. Now we only switch to the PlayAndRecord category when we try and use an input device. [ChangeLog][QtMultimedia][iOS] Using QSoundEffect (or SoundEffect in QML) no longer requires permission to use the microphone. Change-Id: I94535215497a718005c280bfd84b428b4bf1b16a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-07AVFoundation: Prevent Crash in QMediaPlayerAndy Nichols1-1/+4
Task-number: QTBUG-34213 Change-Id: I0883436175439abbb4ea964ed552a17b970ed05c Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-06Release videoframe on painter stop()Wouter Huysentruit1-0/+12
QVideoSurfaceGLPainter/QVideoSurfaceGlslPainter needs to release the video frame on stop (just like QVideoSurfaceGenericPainter already does). Change-Id: Iaf3eb13eaf51fbc22fab6b1f80db8e8978ac328d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-06tst_qcamerainfo: Fix weird symbol in license headerSergio Ahumada1-1/+1
Change-Id: Idff0ffb96fa86dd7faa9ff9b86338c238d4edcb5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-06GStreamer: Remove tags when an invalid QVariant is assigned.Andrew den Exter2-8/+15
Clear the tag list before syncing with reference set so old values are removed and explicitly remove invalid QVariants from the reference set so that the type correction doesn't result in invalid values being written instead. Change-Id: I7d1bdc95cd2a2d601720db84c9b3ef629477bc99 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-04videonode: imx6: clear texture cache when the format changesMichael Olbrich2-0/+19
The old textures won't match anyways. So there is no need to keep them. Change-Id: Id3482333d10cf022d04076ec0f5c7df475c522ae Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-04videonode: imx6: cleanup pixel formatsMichael Olbrich2-7/+5
All formats are now tested. Also, don't use the alpha channel. This is not quite correct for formats with alpha channel but for video probably a good idea. Change-Id: I4a2404d7c96023bb1e3fca41e1f224d23347f290 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-04enable imx6 specific QSGVideoNode based on a config testMichael Olbrich4-1/+53
This way it also works custom mkspecs Change-Id: I7414aac775b797da3487e9625c7212486118b532 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-04AVFoundation: Cleanup AVCaptureSession with proper reference countingAndy Nichols1-0/+17
The reference counting was not being done for AVCaptureSession so it was being destroyed before we got a chance to properly clean it up (which lead to crashes). We also make sure to remove any observers from AVCaptureSession now before destroying it. Task-number: QTBUG-37109 Task-number: QTBUG-29955 Change-Id: Ia9b49ad1eab01b4f7424e2a1c699d903cd9bf902 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-04AVFoundation: implement QCameraInfoControl.Yoann Lopes11-66/+258
Change-Id: I05f3daa5c4acb90e046e26d6d577ae40dfed0e30 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-03-04AVFoundation: Call stop() on VideoSurface when changing sourcesAndy Nichols1-0/+5
Before we were reusing the active surface when we switched videos. This leads to an inconsitency in states, and the sourceRect property of the video surface does not get updated. Task-number: QTBUG-28655 Change-Id: Ie29bf1d9b1c11b6f51a869253c730202001c07cf Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-04AVFoundation: Fix y-inverted QML VideosAndy Nichols1-2/+3
When the code that supports iOS was added, we introduced a bug where QML videos would be played y-inverted on OS X. This is because we made no effort to y-invert the Framebuffer Object before rendering the texture in the SceneGraph. Now we render the video the the FBO y-inverted, so there is no need to y-invert the resulting texture. Task-number: QTBUG-35955 Change-Id: I41af1aaae57923b9972b5be5ec65f7d2a97d77c5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03AVFoundation: Remove debug codeAndy Nichols1-2/+2
Some debug code made it into the released code, so each time you used the QWidget based video player the terminal would print data about the window frame size. Change-Id: I86eb00ce5edb23b7a2abf6a63893cd17aaeb0ee3 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03CoreAudio: Use the real default audio device for QSoundEffectAndy Nichols1-3/+8
There is an assumption in QtMultimedia that the first audio device returned by QAudioDeviceInfo::availableDevices is the default device, so we must make an effor to make sure this is true. This commit should fix the issue on OS X. Task-number: QTBUG-36638 Change-Id: Id388d7218b465cb29d826f46ee825e982c5f7ffc Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03CoreAudio: Make it possible to set volume on of QAudioOutputAndy Nichols1-3/+28
QAudioOutput::setVolume stopped working for CoreAudio when it was ported to live in it's own plugin. This was because it was not possible to set the volume of QAudioOutput in iOS. Now the functionality has been restored and added for iOS as well. For OS X we use the old method of setting the volume property of the AudioUnit. On iOS it is not possible to set the volume on a per AudioUnit basis, so we now manually modify the buffer contents (the same we do for QAudioInput already). Task-number: QTBUG-36756 Change-Id: I42b5892fe5534217043fa55e7b5b9a4ce824050d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03AVFoundation: Improve config testAndy Nichols2-1/+3
This should prevent the avfoundation plugin from being built on system that can not support using it (ex. 32bit builds on OS X 10.7) Task-number: QTBUG-36239 Change-Id: I9f861b7580b0e015ddbc1231440d677bf6eee1ec Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03CoreAudio: Allow more flexability when specifying SampleRatesAndy Nichols1-3/+6
The available sample rates for a given device are the nominal sample rates reported by the device. It is possible to use other sample rates and CoreAudio will take care of the conversion. So what we will do is report what rates are available for a device, but not explicitly require those sample rates to have a valid format. Task-number: QTBUG-36265 Change-Id: Idbbdeacbb6bc1fe434bcd8dec519ad70d4ccd545 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-03-03Prefer to use normalised signal/slot signaturesSergio Ahumada6-20/+20
Change-Id: I48ae4b46f7a0342a1436ba78958b057e919e3a8a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-03-01Add missing virtual destructor for new classThiago Macieira1-0/+1
qmediaserviceproviderplugin.h:166:28: error: ‘struct QMediaServiceCameraInfoInterface’ has virtual functions and accessible non-virtual destructor [-Werror=non-virtual-dtor] Change-Id: I08c6718bfd87c5adeea9969afdd4766150163238 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-28Android: implement QCameraInfoControl.Yoann Lopes14-170/+273
VideoOutput will now take into account the camera sensor orientation to adjust the viewport orientation, we don't need to apply a rotation on the Android Camera anymore. Change-Id: Ia7639f0a5711ab6cc6f80b9716bc1a6f389499b4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-02-28VideoOutput: fix autoOrientation with a camera source.Yoann Lopes3-2/+28
Don't assume the camera frames are always in the same orientation as the display in its primary orientation. We now take into account the camera sensor position and orientation to calculate the viewport orientation. Change-Id: Ib333c87f1804d1010ada42cb757e4fab78d75a04 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-02-28New QCameraInfo class.Yoann Lopes54-153/+2217
The class allows to get the list of available cameras on the system as well as getting some static information about them such as their unique ID, display name, physical position and sensor orientation. This makes QCamera::availableDevices() and QCamera::deviceDescription() obsolete. This patch contains the API, documentation and auto-tests but not the actual implementation by each backend (except for retrieving the default camera device). [ChangeLog][QtMultimedia] Added new QCameraInfo class [ChangeLog][QtMultimedia] QCamera: availableDevices() and deviceDescription() are deprecated, use QCameraInfo instead Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-02-25QSoundEffect: fix changing the loop count while playing.Yoann Lopes4-13/+96
The running count was not updated with the new value. Auto-test added and documentation updated to be more clear about this behavior. Task-number: QTBUG-36643 Change-Id: I29e98ca4679f950a75133b21873738bcb72d23d4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-02-21android: add missing feature tags.Yoann Lopes1-1/+3
Adding the CAMERA and RECORD_AUDIO permissions implicitely makes some features a hard requirement for the app. By adding these features in the .pro file, androiddeployqt will mark them as unrequired in the final package. Change-Id: Ie9357d05626cb12272001d63b04e230737fbf1bc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-02-19QNX: Use window group of top-level window for mmrFrank Osterfeld1-2/+10
Pass the top-level window's window group to mm-renderer, as required by mmr. Change-Id: I2a2e8b4aa48f5c2292b03593c6d528068f383b5c Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-02-19Merge remote-tracking branch 'origin/dev' into stableOswald Buddenhagen103-628/+958
Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
2014-02-17Fix linking problem when built with -no-openglAndy Shaw1-0/+3
When -no-opengl was used then it was not automatically pulling in the needed Windows libraries as it was not loading opengl.prf to get them from. Change-Id: I9b73e5ee01da964a64c71b6261ff4ed98ce6f1a9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-17Use QVERIFY2 for elapsed time in tst_QMediaPlayerBackend::seekPauseSeek().Friedemann Kleint1-6/+10
The test has been observed to fail sometimes, try to obtain values. Change-Id: Id0374b7ad3d593c099500e771bc4d8cc50f26651 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-14AVFoundation: mirror viewfinder frames of front-facing cameras.Yoann Lopes4-7/+56
Change-Id: I95920aa459ff0931819cb6f8278ab296db542601 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-02-12Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn19-82/+911
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
2014-02-11adding zero-copy-QSGVideoNode for imx6upstream/5.2.2Thomas Senyk12-1/+749
On imx6 there is a platform-specific API to implement memory-mapping from gstreamer-buffer to opengl-texture. This plugin uses this API to avoid CPU-based-memory-copy. This allows fluid video-playback up to 1080p with very little CPU load. Before even 720p used one cpu-core completely and wasn't fluid. Change-Id: I0c33eb5d475393a65459291ce9290fa0753de4a5 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-02-10Add meta-data mappings for GPS and camera make and model to camerabin.Andrew den Exter1-2/+9
This enables writing gps positioning information to captured images. Change-Id: I663f7b94b5e6040865358df1ae45d67b73c54f92 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-10Fix gstreamer crash when meta-data is of incorrect type.Andrew den Exter1-56/+66
GStreamer tags are typed and the correct type must be used when inserting a value into a GstTagList or subsequent merges or data accesses can crash because of invalid casts. Found while adding additional mappings for GPS values. Change-Id: I95ab40a480a4685bf4e69064315557faa9de288e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-07Replace win32-g++ with mingw scopeKai Koehne2-4/+2
Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: Ib46b9e83f690b0b26933b73764c7d7d4b031d792 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-07QAudioOutput: Don't guess media role if one has not been provided in ↵Robin Burchell1-10/+2
setCategory. Trying to heuristically guess this kind of thing is almost always a bad idea. Expect the creator of the output to explicitly tell us the category instead of guessing. This fixes QAudioOutput not respecting system volume on Sailfish. Change-Id: If1d05192f513eb54fdfbd1df217286f329b2bfe8 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-07QSoundEffect: Don't try guess a media role if one has not been provided.Robin Burchell1-5/+1
Trying to heuristically guess this kind of thing is almost always a bad idea. Expect the creator of the output to explicitly tell us the category instead of guessing. Change-Id: I5f2988e2456685f3622e0ab136951b1742215f71 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-03Normalize signal & slot signatures in connectionThiago Macieira15-32/+32
Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-03Ensure the backend has had its geometry updated.Roger Maclean1-0/+3
When trying to play video in an overlay window, the video fails to be displayed because everything that would cause updateGeometry to be called on the backend has already occurred prior to the backend having been created. Change-Id: Ida3c8feea69b497a18e9f44d7143bed03380d6ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-02-03Don't mirror the image from the camera unless it has been flippedAndy Shaw2-3/+39
The camera itself can have a mode set that causes the image to be flipped so instead of always mirroring the image that is taken from the camera we check for the supported modes first and then check the mode and only mirror if it is set. Otherwise we assume that it does not need horizontally flipping but that it needs vertically flipping which seems to be the standard for cameras on Windows. [ChangeLog][QtMultimedia][Windows] Fixed the incorrect mirroring of the image from the camera Task-number: QTBUG-30365 Change-Id: I166b1f354e8d91c9a6c64f64164d782b52df98d8 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:25:08 +0000