[vlc-commits] vout: ios: always call reshape from MainThread

Thomas Guillem git at videolan.org
Wed Mar 7 15:47:28 CET 2018


vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Mar  6 13:17:26 2018 +0100| [59ead836676461c65b27b36100bda453f3308e72] | committer: Thomas Guillem

vout: ios: always call reshape from MainThread

We can safely remove the last call to reshape from the vout thread since
reshape is called from the glESView object when it is created.

(cherry picked from commit 3aceca60b42450e3ff6cd2853b4729d6662d7933)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=59ead836676461c65b27b36100bda453f3308e72
---

 modules/video_output/ios.m | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index 03cd0257d4..e4cdeb0481 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -123,7 +123,6 @@ vlc_module_end ()
 
 - (void)updateVoutCfg:(const vout_display_cfg_t *)cfg withVGL:(vout_display_opengl_t *)vgl;
 - (void)getPlaceLocked:(vout_display_place_t *)place;
-- (void)reshape;
 @end
 
 struct vout_display_sys_t
@@ -234,7 +233,6 @@ static int Open(vlc_object_t *this)
                                                  selector:@selector(applicationStateChanged:)
                                                      name:UIApplicationDidBecomeActiveNotification
                                                    object:nil];
-        [sys->glESView reshape];
         return VLC_SUCCESS;
 
     bailout:
@@ -675,13 +673,7 @@ static void GLESSwap(vlc_gl_t *gl)
 
 - (void)reshape
 {
-    if (![NSThread isMainThread])
-    {
-        [self performSelectorOnMainThread:@selector(reshape)
-                                                 withObject:nil
-                                              waitUntilDone:YES];
-        return;
-    }
+    assert([NSThread isMainThread]);
 
     vlc_mutex_lock(&_mutex);
     if (!_voutDisplay)



More information about the vlc-commits mailing list