summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-06-07 12:06:52 +0200
committerLiang Qi <liang.qi@qt.io>2017-06-07 12:52:58 +0200
commit7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847 (patch)
tree0fb34738dd5b4abd222ffac7b25f904c456006d9 /src/multimedia
parentbadecdbc46df6ada383f1dfd006fa3dfff1706c6 (diff)
parenta6cc1af0546ab10701c10475315139ebb50ad1e5 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/configure.json12
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp4
-rw-r--r--src/multimedia/recording/qmediarecorder.cpp4
3 files changed, 11 insertions, 9 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index 4f0532ad4..e250f2b9a 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -137,16 +137,10 @@
"type": "compile",
"test": "evr"
},
- "gstreamer_encodingprofiles_1_0": {
- "label": "GStreamer encoding-profile.h",
- "type": "compile",
- "use": "gstreamer_1_0",
- "test": "gstreamer_encodingprofiles"
- },
- "gstreamer_encodingprofiles_0_10": {
+ "gstreamer_encodingprofiles": {
"label": "GStreamer encoding-profile.h",
"type": "compile",
- "use": "gstreamer_0_10",
+ "use": "gstreamer",
"test": "gstreamer_encodingprofiles"
},
"gpu_vivante": {
@@ -230,7 +224,7 @@
},
"gstreamer_encodingprofiles": {
"label": "GStreamer encoding-profile.h",
- "condition": "(features.gstreamer_1_0 && tests.gstreamer_encodingprofiles_1_0) || (features.gstreamer_0_10 && tests.gstreamer_encodingprofiles_0_10)",
+ "condition": "features.gstreamer && tests.gstreamer_encodingprofiles",
"output": [ "privateFeature" ]
},
"gstreamer_photography": {
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index c9b9b4fc1..16fdec8ea 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -362,6 +362,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
} else if (hasStreamPlaybackFeature) {
control->setMedia(media, file.data());
} else {
+#if QT_CONFIG(temporaryfile)
QTemporaryFile *tempFile = new QTemporaryFile;
// Preserve original file extension, some backends might not load the file if it doesn't
@@ -383,6 +384,9 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
file.reset(tempFile);
control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), 0);
+#else
+ qWarning("Qt was built with -no-feature-temporaryfile: playback from resource file is not supported!");
+#endif
}
} else {
qrcMedia = QMediaContent();
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index d3962b78f..3bab3dada 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -909,6 +909,10 @@ void QMediaRecorder::stop()
\enum QMediaRecorder::State
\value StoppedState The recorder is not active.
+ If this is the state after recording then the actual created recording has
+ finished being written to the final location and is ready on all platforms
+ except on Android. On Android, due to platform limitations, there is no way
+ to be certain that the recording has finished writing to the final location.
\value RecordingState The recording is requested.
\value PausedState The recorder is paused.
*/