summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:08:48 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2020-01-15 19:08:48 +0200
commit2091eac697ff6f7be03203d3180633a417c8c58c (patch)
tree8b016b3960331af55345187d9f12450e73c4bd79
parent339e70a6f0da7c31c02f9744262d8f30b0dd04b8 (diff)
parentee50d9a38689c2d56d530ef41f94ee0f6844b571 (diff)
Merge 5.14 into 5.14.1v5.14.15.14.1
-rw-r--r--src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm1
-rw-r--r--src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
index a77d7de03..91f3cb7dc 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
@@ -185,7 +185,6 @@ void AVFCameraViewfinderSettingsControl2::setViewfinderSettings(const QCameraVie
return;
m_settings = settings;
- applySettings(m_settings);
}
QVideoFrame::PixelFormat AVFCameraViewfinderSettingsControl2::QtPixelFormatFromCVFormat(unsigned avPixelFormat)
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
index 3c59419e7..3e3736183 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -825,8 +825,6 @@ void AVFMediaPlayerSession::processEOS()
#endif
Q_EMIT positionChanged(position());
m_mediaStatus = QMediaPlayer::EndOfMedia;
- Q_EMIT mediaStatusChanged(m_mediaStatus);
-
m_state = QMediaPlayer::StoppedState;
// At this point, frames should not be rendered anymore.
@@ -834,6 +832,7 @@ void AVFMediaPlayerSession::processEOS()
if (m_videoOutput)
m_videoOutput->setLayer(nullptr);
+ Q_EMIT mediaStatusChanged(m_mediaStatus);
Q_EMIT stateChanged(m_state);
}