From: Roger Maclean <rmaclean@qnx.com>
Date: Fri, 31 Jan 2014 19:58:54 +0000 (-0500)
Subject: Ensure the backend has had its geometry updated.
X-Git-Tag: upstream/5.2.95+rc1~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f8ccc88e827aeb09f6f9c7219f2d5f5013c6ebb;p=platform%2Fupstream%2Fqtmultimedia.git

Ensure the backend has had its geometry updated.

When trying to play video in an overlay window, the video fails to
be displayed because everything that would cause updateGeometry to be
called on the backend has already occurred prior to the backend having
been created.

Change-Id: Ida3c8feea69b497a18e9f44d7143bed03380d6ae
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
---

diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 321fd5e..a04b38c 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -247,7 +247,10 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service)
     if (!backendAvailable) {
         qWarning() << Q_FUNC_INFO << "Media service has neither renderer nor window control available.";
         m_backend.reset();
+    } else if (!m_geometryDirty) {
+        m_backend->updateGeometry();
     }
+
     return backendAvailable;
 }