diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:04:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 03:04:15 +0100 |
| commit | bd0cd075337a8711b29b7e3d568ae4afb46d1887 (patch) | |
| tree | a5065ffc8387f9154107d529e4e90879f338736e /src/plugins/avfoundation | |
| parent | d9e029e02f992ca0e94d50138843dcd204e9f152 (diff) | |
| parent | ee50d9a38689c2d56d530ef41f94ee0f6844b571 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie511ad4ccac1b5bde6686bbe2c391dd175dd3274
Diffstat (limited to 'src/plugins/avfoundation')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm | 1 | ||||
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | 3 |
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); } |