summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-25 03:01:36 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-25 03:01:36 +0200
commitae48330c105c24851312004a189487608542eb49 (patch)
tree873e1627c5bc3c05a2d4ece95f675b99fec891f3
parent2aa1e634404a048e18b2870b321557ff5713b3e8 (diff)
parente8a82901e2456bd6112cb1298b795f202b80a36d (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
-rw-r--r--src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp4
-rw-r--r--src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp18
2 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
index 9631a6ba7..7aa7b97b8 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -379,6 +379,9 @@ void QAndroidMediaPlayerControl::play()
setMedia(mMediaContent, mMediaStream);
}
+ if (!mMediaContent.isNull())
+ setState(QMediaPlayer::PlayingState);
+
if ((mState & (AndroidMediaPlayer::Prepared
| AndroidMediaPlayer::Started
| AndroidMediaPlayer::Paused
@@ -387,7 +390,6 @@ void QAndroidMediaPlayerControl::play()
return;
}
- setState(QMediaPlayer::PlayingState);
mMediaPlayer->play();
}
diff --git a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
index 9930dd2e1..fbd698eea 100644
--- a/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
+++ b/src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp
@@ -205,18 +205,11 @@ void MmRendererVideoWindowControl::attachDisplay(mmr_context_t *context)
return;
}
- QWindow *windowForGroup = window;
-
- //According to mmr_output_attach() documentation, the window group name of the
- //application's top-level window is expected.
- while (windowForGroup->parent())
- windowForGroup = windowForGroup->parent();
-
const char * const groupNameData = static_cast<const char *>(
- nativeInterface->nativeResourceForWindow("windowGroup", windowForGroup));
+ nativeInterface->nativeResourceForWindow("windowGroup", window));
if (!groupNameData) {
qDebug() << "MmRendererVideoWindowControl: Unable to find window group for window"
- << windowForGroup;
+ << window;
return;
}
@@ -250,9 +243,7 @@ void MmRendererVideoWindowControl::updateVideoPosition()
{
QWindow * const window = findWindow(m_winId);
if (m_context && m_videoId != -1 && window) {
- QPoint topLeft = m_fullscreen ?
- QPoint(0,0) :
- window->mapToGlobal(m_displayRect.topLeft());
+ QPoint topLeft = m_displayRect.topLeft();
QScreen * const screen = window->screen();
int width = m_fullscreen ?
@@ -262,7 +253,8 @@ void MmRendererVideoWindowControl::updateVideoPosition()
screen->size().height() :
m_displayRect.height();
- if (m_metaData.hasVideo()) { // We need the source size to do aspect ratio scaling
+ if (m_metaData.hasVideo() && m_metaData.width() > 0 && m_metaData.height() > 0) {
+ // We need the source size to do aspect ratio scaling
const qreal sourceRatio = m_metaData.width() / static_cast<float>(m_metaData.height());
const qreal targetRatio = width / static_cast<float>(height);