Fix sizeHint() of QVideoWidget/QVideoGraphicsItem

Doesn't yet fix all test failures, but it's an
improvement.

Change-Id: I775857f1fb580b78ae137dc71ee445a15eafd0a7
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 16 insertions, 4 deletions

diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp
index ee4c81cc6..47ebd3033 100644
--- a/src/multimedia/video/qvideosink.cpp
+++ b/src/multimedia/video/qvideosink.cpp
@@ -374,6 +374,15 @@ QPlatformVideoSink *QVideoSink::platformVideoSink()
     return d->videoSink;
 }
 
+/*!
+    Returns the size of the video currently being played back. If no video is being played,
+    this method returns an invalid size.
+ */
+QSize QVideoSink::videoSize() const
+{
+    return d->videoSink->nativeSize();
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qvideosink.cpp"
diff --git a/src/multimedia/video/qvideosink.h b/src/multimedia/video/qvideosink.h
index 7092f80bf..1fa308266 100644
--- a/src/multimedia/video/qvideosink.h
+++ b/src/multimedia/video/qvideosink.h
@@ -95,6 +95,7 @@ public:
     void paint(QPainter *painter, const QVideoFrame &frame);
 
     QPlatformVideoSink *platformVideoSink();
+    QSize videoSize() const;
 
 Q_SIGNALS:
     // would never get called in windowed mode
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index eebda495b..ff7b488d6 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -308,11 +308,13 @@ void QVideoWidget::setSaturation(float saturation)
  */
 QSize QVideoWidget::sizeHint() const
 {
-//    Q_D(const QVideoWidget);
+    Q_D(const QVideoWidget);
 
-// #####
-//    if (d->video)
-//        return d->backend->sizeHint();
+    if (d->videoSink) {
+        auto size = d->videoSink->videoSize();
+        if (size.isValid())
+            return size;
+    }
 
     return QWidget::sizeHint();
 }