Don't request renderer control if null surface is set as video output.

QCamera and QMediaPlayer are likely to wait for valid
surface to be passed to the renderer control before startup, so after
player->setVideoOutput(nullSurface)
player will not start playback.

If the renderer control was already requested before for valid
surface it should be released when the null surface is assigned.

Change-Id: I3f78f2d82e61fae5f305874874c0ffbc4cb7dc1d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index f9b60f587..0ff341438 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -774,7 +774,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
         if (d->videoOutput)
             unbind(d->videoOutput);
 
-        d->videoOutput = bind(&d->surfaceOutput) ? &d->surfaceOutput : 0;
+        d->videoOutput = 0;
+
+        if (surface && bind(&d->surfaceOutput))
+            d->videoOutput =  &d->surfaceOutput;
+    }  else if (!surface) {
+        //unbind the surfaceOutput if null surface is set
+        unbind(&d->surfaceOutput);
+        d->videoOutput = 0;
     }
 }