Merge lp:~phablet-team/qtubuntu-media/release-sink-properly into lp:qtubuntu-media

[Alfonso Sanchez-Beato]

Release sink before creating a new one so resources are properly freed.

Release sink before creating a new one so resources are properly freed.

[Jim Hodapp (jhodapp)]

One minor thing to fix.

review: Needs Fixing (code)

[lp:~phablet-team/qtubuntu-media/release-sink-properly]

118. By Alfonso Sanchez-Beato on 2017-02-20

Address review comments

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Review comment addressed, also added a comment for further clarification.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

=== modified file 'src/aal/aalvideorenderercontrol.cpp'
--- src/aal/aalvideorenderercontrol.cpp	2016-07-20 21:26:54 +0000
+++ src/aal/aalvideorenderercontrol.cpp	2017-02-20 08:34:55 +0000
@@ -274,6 +274,11 @@
 {
     if (m_textureId == 0) {
         m_textureId = static_cast<GLuint>(textureID);
+        // Remove old instance first (assignment first creates the new object,
+        // then removes the old one, but we need the resources from the old
+        // object to create the new one, so we force the right order with an
+        // initial pointer reset).
+        m_videoSink.reset();
         m_videoSink = m_service->createVideoSink(textureID);
         if (not m_videoSink)
         {