[vlc-commits] macosx vout: avoid place_picture call for every mouse move event

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sat May  5 22:10:53 2012 +0200| [2a025f5df901ed244ca7f540e8fc6ac98a9c5a11] | committer: David Fuhrmann

macosx vout: avoid place_picture call for every mouse move event
(cherry picked from commit dc5988addd4d36655fcbce3fbb39e817ef88dc1f)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=2a025f5df901ed244ca7f540e8fc6ac98a9c5a11
---

 modules/video_output/macosx.m |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 1b236a7..278ef53 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -113,6 +113,8 @@ struct vout_display_sys_t
     picture_pool_t *pool;
     picture_t *current;
     bool has_first_frame;
+
+    vout_display_place_t place;
 };
 
 static int Open (vlc_object_t *this)
@@ -348,8 +350,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             const video_format_t *source;
             bool is_forced = false;
 
-            vout_display_place_t place;
-
             if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
             {
                 source = (const video_format_t *)va_arg (ap, const video_format_t *);
@@ -384,14 +384,14 @@ static int Control (vout_display_t *vd, int query, va_list ap)
                 cfg_tmp.display.height = bounds.size.height;
             }
 
-            vout_display_PlacePicture (&place, source, &cfg_tmp, false);
+            vout_display_PlacePicture (&sys->place, source, &cfg_tmp, false);
 
             /* For resize, we call glViewport in reshape and not here.
                This has the positive side effect that we avoid erratic sizing as we animate every resize. */
             if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
             {
                 // x / y are top left corner, but we need the lower left one
-                glViewport (place.x, cfg_tmp.display.height - (place.y + place.height), place.width, place.height);
+                glViewport (sys->place.x, cfg_tmp.display.height - (sys->place.y + sys->place.height), sys->place.width, sys->place.height);
             }
 
             [o_pool release];
@@ -610,7 +610,6 @@ static void OpenglSwap (vlc_gl_t *gl)
     VLCAssertMainThread();
 
     NSRect bounds = [self bounds];
-    vout_display_place_t place;
 
     @synchronized(self) {
         if (vd) {
@@ -618,14 +617,16 @@ static void OpenglSwap (vlc_gl_t *gl)
             cfg_tmp.display.width  = bounds.size.width;
             cfg_tmp.display.height = bounds.size.height;
 
-            vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, false);
+            vout_display_PlacePicture (&vd->sys->place, &vd->source, &cfg_tmp, false);
             vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height, vd->cfg->is_fullscreen);
         }
     }
 
     if ([self lockgl]) {
-        // x / y are top left corner, but we need the lower left one
-        glViewport (place.x, bounds.size.height - (place.y + place.height), place.width, place.height);
+        if (vd) { 
+            // x / y are top left corner, but we need the lower left one
+            glViewport (vd->sys->place.x, bounds.size.height - (vd->sys->place.y + vd->sys->place.height), vd->sys->place.width, vd->sys->place.height);
+        }
 
         @synchronized(self) {
             // This may be cleared before -drawRect is being called,
@@ -748,15 +749,12 @@ static void OpenglSwap (vlc_gl_t *gl)
 
     if (b_inside)
     {
-        vout_display_place_t place;
-        vout_display_PlacePicture (&place, &vd->source, vd->cfg, false);
-
-        if (place.width > 0 && place.height > 0)
+        if (vd && vd->sys->place.width > 0 && vd->sys->place.height > 0)
         {
             const int x = vd->source.i_x_offset +
-            (int64_t)(ml.x - place.x) * vd->source.i_visible_width / place.width;
+            (int64_t)(ml.x - vd->sys->place.x) * vd->source.i_visible_width / vd->sys->place.width;
             const int y = vd->source.i_y_offset +
-            (int64_t)((int)s_rect.size.height - (int)ml.y - place.y) * vd->source.i_visible_height / place.height;
+            (int64_t)((int)s_rect.size.height - (int)ml.y - vd->sys->place.y) * vd->source.i_visible_height / vd->sys->place.height;
 
             vout_display_SendEventMouseMoved (vd, x, y);
         }