Commit Graph

1311 Commits

Author SHA1 Message Date
Nico Vertriest
c9b4793350 Doc: link errors
Task-number: QTBUG-34749
Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22
Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-07-01 13:10:14 +02:00
Yoann Lopes
c8b88cd027 Android: fix crash when stopping the camera while a recording is active
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>
2014-06-30 16:03:26 +02:00
Yoann Lopes
23d7bf7ac8 Android: fix registering recorded videos with the Android media scanner
Change-Id: I6dfc4e13b8a0bccb1bcfead728f7e1ddb7b58bb4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-06-30 16:02:22 +02:00
Yoann Lopes
99ce312731 Android: correctly update camera focus zones.
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>
2014-06-30 14:48:08 +02:00
Frederik Gladhorn
c46aa62c65 Merge remote-tracking branch 'origin/5.3.1' into 5.3
Change-Id: I6abb3fad4e03323919a9ee4dad62082784ac6160
2014-06-25 10:26:32 +02:00
Yoann Lopes
140c4a9eed Add changelog for 5.3.1.
Change-Id: I197a9c6a0fc623bdb3eafaa5fe970cb6a44546b4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-06-18 19:03:30 +02:00
Oswald Buddenhagen
1d73904b25 Bump version
Change-Id: I8af8aab3257d70270318a152a73380aebdd41a41
2014-06-18 00:36:14 +02:00
Yoann Lopes
34ab2b5369 Improved audiooutput and audioinput examples.
Always show the default audio device first in the drop-down box.

Change-Id: Icbafa9e316fd330fe7a9801a8e2efef6f20ff054
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-06-16 13:43:05 +02:00
Sergio Ahumada
150ff6662d Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: I689554fb6e47b8183013de271a776909a05398dc
2014-06-11 10:05:00 +02:00
Yoann Lopes
b99a4b3025 Make multimedia QML types available for the 5.3 import version.
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>
2014-06-10 15:02:24 +02:00
Yoann Lopes
eadf1c8c41 Fix static initialization order fiasco in some plugins.
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>
2014-06-06 11:12:21 +02:00
Christian Strømme
8a66559e0b Android: Use a file descriptor for all local media files.
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>
2014-06-05 23:25:23 +02:00
Yoann Lopes
d71aaca893 Improve default audio plugin selection.
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>
2014-06-05 11:42:16 +02:00
Yoann Lopes
a3a6670172 Android: don't start camera preview until the viewfinder is ready.
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>
2014-06-05 11:42:16 +02:00
Yoann Lopes
cf4aba93e4 Android: fix media player's volume.
- 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>
2014-06-05 11:42:16 +02:00
Topi Reinio
cb6b4e2079 Doc: Remove comment about preliminary API for Qt 5.0
Task-number: QTBUG-39195
Change-Id: I193321a29d06760e4ad5aa2eaca99d98b2e1f65a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-06-05 09:48:33 +02:00
Christian Strømme
b9b06defc7 Android: Don't expose java calls in the control classes.
Makes the abstraction more clear.

Change-Id: Ia9a7b0b157e1182158cd26b62775d13f6c5e1727
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-06-04 13:19:40 +02:00
Christian Strømme
1ef3ef6a30 Make it possible to build multimedia for embedded Android
Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-06-04 13:19:28 +02:00
Christian Strømme
9214742012 Android: Rename the wrapper classes
Change-Id: I2ce15c8475da3186f128ba59b7c58f9b5b0a67e1
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-06-04 13:19:21 +02:00
Yoann Lopes
efa4628e74 Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.
Task-number: QTBUG-39131
Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-05-30 14:47:54 +02:00
Yoann Lopes
5a0e49369d OpenSL: don't try to enqueue new buffers when the buffer queue is full.
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>
2014-05-30 14:47:20 +02:00
Yoann Lopes
69598e22f3 Remove C++11 code in iMX6 video node plugin.
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>
2014-05-30 14:46:42 +02:00
Yoann Lopes
92096afdb4 Android: fix calling start() and stop() on the video surface.
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>
2014-05-30 14:46:13 +02:00
Christian Strømme
7e668fe58f Android: Fix loading from qrc
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>
2014-05-21 00:14:15 +02:00
Yoann Lopes
93e73fd8ee DirectShow: remove debug output.
Task-number: QTBUG-38924
Change-Id: Ibc08fd99f6eb10035e4d7da963d4d384012bbdbf
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-05-19 14:57:23 +02:00
Yoann Lopes
e9e10b2b1f WMF: fix video frames' viewport.
It was not taken into account at all.

Change-Id: I4ce85aba214cb4d89dcd018b1616a2a38094b5a6
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-05-15 15:12:18 +02:00
Yoann Lopes
235c863db9 Android: fix QMediaPlayer::bufferStatus value.
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>
2014-05-15 15:12:18 +02:00
Andrew den Exter
c376e13abd Fix QSGVideoNode rendering of frames with stride != width.
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>
2014-05-15 12:45:06 +02:00
Yoann Lopes
9cf77e3bb5 Improve documentation for the QMediaPlayer::bufferStatus property.
The corresponding properties in the Audio and MediaPlayer QML elements
are also updated.

Change-Id: I7104d274d431e7712db2f045c375756e8c2ac03a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-05-15 12:41:44 +02:00
Sze Howe Koh
64726bfd15 Doc: Copy snippets from the Qt Multimedia module
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>
2014-05-14 06:22:45 +02:00
Christian Strømme
469f9a0c07 Android: Fix namespace usage.
Make it possible to build multimedia with a Qt namespace

Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-05-12 15:30:16 +02:00
Sze Howe Koh
1d6872ae9c Doc: Clean up references to Qt System Info
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>
2014-05-12 12:26:40 +02:00
Yoann Lopes
364258abfc PLS parser: Don't translate entries.
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>
2014-05-09 19:48:53 +02:00
Yoann Lopes
101dce7a29 GStreamer: disable clock syncing in video sink for live sources.
Task-number: QTBUG-38465
Change-Id: Icdf2df36b9b3c09dd047e60ac24e221a3d233c6f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2014-05-09 19:48:53 +02:00
Yoann Lopes
5339aed040 Moved QMediaStorageLocation out of the Android plugin.
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>
2014-05-09 16:33:12 +02:00
Frederik Gladhorn
703ee3879b Merge remote-tracking branch 'origin/release' into stable
Change-Id: I900412b4c6f894dec27b8158d498b2ff18404ced
2014-05-01 12:46:28 +02:00
Niels Weber
82d96105ce Fix documentation of qmlvideofx example
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>
2014-04-30 18:27:31 +02:00
Niels Weber
02c0229a05 Handle resizing of mainwindow better
Task-number: QTBUG-38121
Change-Id: I877fd5c626418a91850d43de31e71351c14eef25
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 13:40:42 +02:00
Niels Weber
c5d184cbe3 Selecting something now closes menu
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>
2014-04-30 13:40:34 +02:00
Niels Weber
2939c9953a Add missing background for effect selection list.
Also remove highlight and fix button text color.
Make Menu animation faster.

Task-number: QTBUG-38121
Change-Id: I7d5868d370a8dc7925cee5e694ae043970c569d9
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-04-30 13:40:26 +02:00
Andreas Holzammer
c9a3bbc3e6 [QNX] Introduce env variable for default audio sink
Make it possible to change the default audio sink
via a environment variable.

Change-Id: Id0e14318fc99a896b8a41196941b758a31d23600
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-04-25 10:46:51 +02:00
Fabian Bumberger
e3bc29963e Fix documentation error
Change-Id: I98f3e35677b5e07ea35898caec3f241b045b5033
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
2014-04-24 14:35:57 +02:00
Jani Heikkinen
7a88dd8c97 Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ieb521fb1e9f297a167eea19c771cb5915c01df97
2014-04-23 12:45:21 +03:00
Sergio Ahumada
78cff36ba8 Bump MODULE_VERSION to 5.3.1
Change-Id: Ie88b34ee769ab3abbd0a5ab0fd8b7938475916ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-22 17:54:55 +02:00
Niels Weber
4c8284de46 Rework qmlvideofx example
Task-number: QTBUG-38121
Change-Id: If06ba6ce2c66b4d735baaeb56e004861c62ea533
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-04-18 20:10:23 +02:00
Christian Strømme
b088962950 Android: Camera code clean-up
Change-Id: Ib400afde12067764c3dcc0f44e40ddc1abb3012f
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-04-15 16:46:57 +02:00
Christian Strømme
60a911096f Android: Use QMutexLock in camera callbacks.
We should not release the locks before the native callbacks returns.

Change-Id: Ia2691f6c5be66a3dcf371e48e3bac7498b401833
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-04-15 16:46:49 +02:00
Jerome Pasion
af73d55eff Doc: Improved example documentation
-added instructions on how to run the example
 (using \include to insert a section from qtbase/doc/global/)
-updated copyright year
-removed links to Qt 4 API
-rearranged some of the sections
-created links from the example pages to Qt Multimedia
-fixed QDoc warnings related to the example pages

Task-number: QTBUG-33597
Change-Id: Id45ce5cbd40dbfa384abd7260a316f6f6837c186
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2014-04-14 06:45:43 +02:00
Christian Strømme
b33e6d4672 Android: Release the surface texture when not in use
With some Android versions the preview texture is released when the
application is suspended. If we don't release the texture in our
code, the preview will be empty when the application resumes.

Task-number: QTBUG-38165

Change-Id: I72244727081d8f94ee5f6cb0ab660ca59f4bb2de
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-04-12 06:40:28 +02:00
Christian Strømme
8a047ef087 Android: Use Q_GLOBAL_STATIC instead of a static QMap
Change-Id: I7b65e0874051c4ef504914a0bd66e8471ec34fa7
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-04-09 16:13:38 +02:00