summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Doc: link errorsNico Vertriest2014-07-013-4/+3
| | | | | | | | | | | | Task-number: QTBUG-34749 Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Android: fix crash when stopping the camera while a recording is activeYoann Lopes2014-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | When unloading the camera, any active recording is automatically stopped, which in turn triggers the viewfinder to be restarted... We don't try anymore to restart the viewfinder after stopping recording unless the camera is still active. Change-Id: I77e4e3fc8d7116ac660d8bb23f6c400ebed4ffed Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix registering recorded videos with the Android media scannerYoann Lopes2014-06-301-1/+1
| | | | | | | | | | Change-Id: I6dfc4e13b8a0bccb1bcfead728f7e1ddb7b58bb4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: correctly update camera focus zones.Yoann Lopes2014-06-301-15/+14
| | | | | | | | | | | | | | | | | | When setting a null custom focus point, we were correctly resetting the focus zones but we were not emitting the focusZonesChanged signal, causing the QML Camera to not update its focus zones. Change-Id: I59940c4cd2979fa08dc26566dc0f6d19e503f64f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Merge remote-tracking branch 'origin/5.3.1' into 5.3Frederik Gladhorn2014-06-251-0/+61
| |\ | | | | | | | | | Change-Id: I6abb3fad4e03323919a9ee4dad62082784ac6160
| | * Add changelog for 5.3.1.v5.3.1Yoann Lopes2014-06-181-0/+61
| | | | | | | | | | | | | | | Change-Id: I197a9c6a0fc623bdb3eafaa5fe970cb6a44546b4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | | Implement customFocusPoint in camerabin backend.Andrew den Exter2014-07-104-7/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a regions-of-interest event containing a rectangle surrounding the focus point to the camera source when the camera's focusPointMode is QCameraFocus::CustomFocusPoint. Reset the regions-of-interest if the focusPointMode changes to any other value. [ChangeLog][GStreamer] Implement customFocusPoint in camerabin backend. Change-Id: If75405733b18d476dff5467abae3f08271caf06a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Add QML accessors for camera viewfinder properties.Andrew den Exter2014-07-095-2/+249
| | | | | | | | | | | | | | | | | | | | | [ChangeLog] Added QML accessors for camera viewfinder properties. Change-Id: I05a2a6c552aa8606e8dc31a11d1cfdedf66c554f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Support per-plane strides and data offsets in QVideoFrame.Andrew den Exter2014-07-087-41/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since just adding a new virtual isn't binary compatible add a new derivative type with a virtual member and connect it up through a virtual in the private class. [ChangeLog] Support for per-plane strides and data offsets in QVideoFrame. Task-number: QTBUG-38345 Change-Id: I1974c2b0b454d130e17971ce549031259d61f9cd Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Add meta-data accessors to the QML Camera type.Andrew den Exter2014-07-074-46/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add write accessors to the properties of QDeclarativeMediaMetaData as well as additional properties for previously unmapped image keys and add a metaData property exposing this to QDeclarativeCamera. [ChangeLog] New metaData property for the QML Camera type. Change-Id: I4456b7b6120842f7ad9a1b175e42b9fb332adf13 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Fix change-of-sign warningThiago Macieira2014-07-071-3/+3
| | | | | | | | | | | | | | | | | | | | | qgstappsrc.cpp(54): warning #68: integer conversion resulted in a change of sign Change-Id: I0bf8c93cb5e27114a8857dc650ac506152607491 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-072-2/+0
| | | | | | | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I5761a583cc1242f31f1beece7da2236c47e3a9bd Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Fix compilation with -no-openglKai Koehne2014-07-012-5/+10
| | | | | | | | | | | | | | | Change-Id: Ib8f39dcea58018f076d6a3fa733303958c707f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-262-5/+12
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a
| * | Bump versionOswald Buddenhagen2014-06-181-1/+1
| |/ | | | | | | Change-Id: I8af8aab3257d70270318a152a73380aebdd41a41
| * Improved audiooutput and audioinput examples.Yoann Lopes2014-06-162-5/+12
| | | | | | | | | | | | | | Always show the default audio device first in the drop-down box. Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Fix stuttering with RTSP streams.Andrew den Exter2014-06-261-0/+1
| | | | | | | | | | | | | | | | | | Set the rtspsrc buffer-mode to 'slave' which is the default in gstreamer 1.0 and doesn't cause the stuttering apparent with the default buffer mode. Change-Id: I4241fbe638c176ad93f441a3f76a1041ef1cb6bb Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Enable both PulseAudio and Alsa plugins on Linux.Yoann Lopes2014-06-191-5/+2
| | | | | | | | | | | | | | | | | | | | It was previously only one or the other, and all Qt packages for linux were only including the PulseAudio backend. Now, both will be included; if PulseAudio is available it will be used by default, otherwise it will fall back to Alsa. Change-Id: I393c7728ec9741b1b58681608c184cd1b92126b1 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-14168-2724/+2755
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
| * Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-118-353/+353
| |\ | | | | | | | | | Change-Id: I689554fb6e47b8183013de271a776909a05398dc
| | * Make multimedia QML types available for the 5.3 import version.Yoann Lopes2014-06-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | At least one type needs to be registered with the 5.3 version number to make it known to the QML engine. Change-Id: Iacfe62650b4194fbb89135fef7cb148309227ce2 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| | * Fix static initialization order fiasco in some plugins.Yoann Lopes2014-06-065-347/+337
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some static variables were initialized using QMediaMetaData values, which are also statically initialized. Task-number: QTBUG-39202 Change-Id: Ibedc0a77d96cdfa575aad122c4ec654e6830e1f7 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
| | * Android: Use a file descriptor for all local media files.Christian Strømme2014-06-052-6/+11
| |/ | | | | | | | | | | | | | | | | Using a fd is more consistent across different Android versions and also works with files that are in the applications private storage. Task-number: QTBUG-39346 Change-Id: I462822459d12d7842d15f1cb7caafc75c18fe32c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Improve default audio plugin selection.Yoann Lopes2014-06-051-6/+21
| | | | | | | | | | | | | | | | | | When no audio plugin is marked as default, use the first plugin available. Change-Id: Ide8db0fe55f43c4881c24505c1e2821b0fc176f6 Reviewed-by: Dyami Caliri <dyami@dragonframe.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: don't start camera preview until the viewfinder is ready.Yoann Lopes2014-06-052-12/+26
| | | | | | | | | | | | | | | | | | If no video output is set for a camera, don't try to start the camera and report an error. If the video output is not ready, delay starting until it is. Change-Id: Id08e31a4e795b71ac036a6532e9499ca5670d790 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix media player's volume.Yoann Lopes2014-06-051-11/+18
| | | | | | | | | | | | | | | | | | - Preserve the volume when changing the current media. - Don't actually set a new volume when the media player is muted. Intead, save the value to apply it when setMuted(false) is called. Change-Id: I829eb280406ea35ff82a0c2638b2d19cf1d90643 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Doc: Remove comment about preliminary API for Qt 5.0Topi Reinio2014-06-051-7/+3
| | | | | | | | | | | | Task-number: QTBUG-39195 Change-Id: I193321a29d06760e4ad5aa2eaca99d98b2e1f65a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Android: Don't expose java calls in the control classes.Christian Strømme2014-06-0415-114/+238
| | | | | | | | | | | | | | Makes the abstraction more clear. Change-Id: Ia9a7b0b157e1182158cd26b62775d13f6c5e1727 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Make it possible to build multimedia for embedded AndroidChristian Strømme2014-06-042-3/+3
| | | | | | | | | | Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Android: Rename the wrapper classesChristian Strømme2014-06-0434-533/+533
| | | | | | | | | | Change-Id: I2ce15c8475da3186f128ba59b7c58f9b5b0a67e1 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.Yoann Lopes2014-05-3025-271/+150
| | | | | | | | | | | | Task-number: QTBUG-39131 Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * OpenSL: don't try to enqueue new buffers when the buffer queue is full.Yoann Lopes2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | It could lead to corrupted sound since we were overwritting buffers that weren't played yet. Task-number: QTBUG-39015 Change-Id: I4c015c5383b813955998145d6316acc8c22f19a3 Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Remove C++11 code in iMX6 video node plugin.Yoann Lopes2014-05-301-2/+2
| | | | | | | | | | | | | | | | | | Use Q_FOREACH instead of C++11 range-based For loops. Task-number: QTBUG-38900 Change-Id: I2b9f8444f2ac3ae71811112244c687cab79753c9 Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Android: fix calling start() and stop() on the video surface.Yoann Lopes2014-05-301-1/+1
| | | | | | | | | | | | | | | | | | We restart the surface when the frame size changes, though we were not using the correct function to get the surface's current frame size. This was causing start() and stop() to be called for every frame. Change-Id: I8ff4b4852cb7fcc92ac3b1b3ad7bf991d7bddc6b Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: Fix loading from qrcChristian Strømme2014-05-212-1/+6
| | | | | | | | | | | | | | | | | | On Android < 4.1 our temporary file is discarded without checking the content. With this change we just open the file and pass the fd to the mediaplayer instead. Change-Id: I9233822725d8987c572b2d0b598721cee886de80 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * DirectShow: remove debug output.Yoann Lopes2014-05-191-7/+0
| | | | | | | | | | | | Task-number: QTBUG-38924 Change-Id: Ibc08fd99f6eb10035e4d7da963d4d384012bbdbf Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * WMF: fix video frames' viewport.Yoann Lopes2014-05-151-0/+12
| | | | | | | | | | | | | | It was not taken into account at all. Change-Id: I4ce85aba214cb4d89dcd018b1616a2a38094b5a6 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Android: fix QMediaPlayer::bufferStatus value.Yoann Lopes2014-05-152-3/+17
| | | | | | | | | | | | | | | | | | | | | | It was returning the buffering progress for the whole media, which is not what is expected according to the documentation. It should return instead how much the playback buffer is filled. This information is not available on Android so we simply return 100% when the status is BufferedMedia or BufferingMedia, 0% otherwise. Change-Id: I9fb55a9317948ba9375291a57bbf100f186382a2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Fix QSGVideoNode rendering of frames with stride != width.Andrew den Exter2014-05-152-18/+73
| | | | | | | | | | | | | | | | | | | | Adjust texture coordinates to not render padding at the end of lines, and better calculate the stride of UV planes. Task-number: QTBUG-38218 Task-number: QTBUG-30447 Change-Id: I7b7577979719c48460b838f7dcc89b9d17741f79 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Improve documentation for the QMediaPlayer::bufferStatus property.Yoann Lopes2014-05-152-7/+21
| | | | | | | | | | | | | | | | The corresponding properties in the Audio and MediaPlayer QML elements are also updated. Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Copy snippets from the Qt Multimedia moduleSze Howe Koh2014-05-142-0/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a compilable subsection of... - src/multimedia/doc/snippets/multimedia-snippets/camera.cpp - src/multimedia/doc/snippets/multimedia-snippets/video.cpp ...into the snippet folder searched by: - src/multimediawidgets/qcameraviewfinder.cpp - src/multimediawidgets/qgraphicsvideoitem.cpp - src/multimediawidgets/qvideowidget.cpp - src/multimediawidgets/qvideowidgetcontrol.cpp Change-Id: Ica3c21b65bc57d5686a594afca09e771cc376cc0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Android: Fix namespace usage.Christian Strømme2014-05-125-6/+12
| | | | | | | | | | | | | | Make it possible to build multimedia with a Qt namespace Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Clean up references to Qt System InfoSze Howe Koh2014-05-124-0/+10
| | | | | | | | | | | | | | | | | | The module is not released yet; the current documentation is misleading. Change-Id: Ia20ac8e3504942f6f60b94264f3a12497e09da24 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * PLS parser: Don't translate entries.Yoann Lopes2014-05-091-3/+3
| | | | | | | | | | | | | | | | | | Each entry in a PLS file uses the keywords 'File', 'Title' and 'Length' in English, it should not be translated to the user's locale... Task-number: QTBUG-38755 Change-Id: Ibd5bee18a856b3ebc1fdb177241db7a39b65d264 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * GStreamer: disable clock syncing in video sink for live sources.Yoann Lopes2014-05-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-38465 Change-Id: Icdf2df36b9b3c09dd047e60ac24e221a3d233c6f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-098-49/+82
| | | | | | | | | | | | | | | | It's now a private API in the QtMultimedia library in order to be accessible in other plugins. Change-Id: I63541de1e8c540cebc210f9037646ce74d866c6f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-0116-64/+81
| |\ | | | | | | | | | Change-Id: I900412b4c6f894dec27b8158d498b2ff18404ced
| | * Fix documentation of qmlvideofx examplev5.3.0-rc1v5.3.0Niels Weber2014-04-3012-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documentation fit to the current state of the example. Task-number: QTBUG-38121 Change-Id: I3379e3328d07ef8bcdb35a5e3821ab194c3443c4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * Handle resizing of mainwindow betterNiels Weber2014-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-38121 Change-Id: I877fd5c626418a91850d43de31e71351c14eef25 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| | * Selecting something now closes menuNiels Weber2014-04-301-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | On a closed menu, the text is now hidden. Task-number: QTBUG-38121 Change-Id: I305fd4f24768115ed21495857cce672d8cbd2135 Reviewed-by: Petref Saraci <petref.saraci@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 23:02:45 +0000