diff options
| author | Doris Verria <doris.verria@qt.io> | 2021-05-14 14:32:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-19 11:10:01 +0000 |
| commit | 3df89f0e7d218577e66dbb7cc489ee4b0eb8c72b (patch) | |
| tree | f0bea913cbf0a9743795ec969aaf0921e4fb7fe7 /src/multimedia | |
| parent | 1955e9f3fb527a8e1a33f51e0a50b7627a1ac8fe (diff) | |
Fix test failures for tst_qmediaplayerbackend on macOS
Change-Id: Icbd402e06941316c240e09bc409cafd68e14b459
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm index f701bdf50..9aa3354f5 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm @@ -827,7 +827,7 @@ void AVFMediaPlayer::play() if (m_state == QMediaPlayer::PlayingState) return; - if (m_videoOutput) + if (m_videoOutput && m_videoSink) m_videoOutput->setLayer([static_cast<AVFMediaPlayerObserver*>(m_observer) playerLayer]); // Reset media status if the current status is EndOfMedia @@ -859,7 +859,7 @@ void AVFMediaPlayer::pause() m_state = QMediaPlayer::PausedState; - if (m_videoOutput) + if (m_videoOutput && m_videoSink) m_videoOutput->setLayer([static_cast<AVFMediaPlayerObserver*>(m_observer) playerLayer]); [[static_cast<AVFMediaPlayerObserver*>(m_observer) player] pause]; @@ -1170,6 +1170,8 @@ void AVFMediaPlayer::resetStream(QIODevice *stream) void AVFMediaPlayer::nativeSizeChanged(QSize size) { + if (!m_videoSink) + return; qDebug() << "presentation size" << size; m_videoSink->setNativeSize(size); } |