Merge lp:~tombeckmann/audience/aspect-ration-second-try into lp:~audience-members/audience/trunk

[Tom Beckmann]

fix ratio constrain in CSD

I think it's working now, so I'm proposing it for being merged. I'm not 100% sure it will work seamlessly in all cases though, so I haven't removed the debug prints yet.

The system works by locking the window's aspect ratio after a resize has finished or while it pauses. This is required, as outlined before, because of the CSD, which adds a constant padding around the video, so in turn the entire window's aspect ratio is no longer constant when resized.

[lp:~tombeckmann/audience/aspect-ration-second-try]

467. By Tom Beckmann on 2014-11-25

try to work around minimal black bars occuring because of the resize operation

[Artem Anufrij (artem-anufrij)]

Hey Tom,
"audience" crashes on add a new video into playlist.

It doesn't happening on currently version.

review: Needs Fixing

[Tom Beckmann (tombeckmann)]

After some investigations we found out that this crash is not related to this branch.

[Artem Anufrij (artem-anufrij)]

Some videos have a wrong ratio.

See screenshot:

https://launchpadlibrarian.net/191499677/Screenshot%20from%202014-11-29%2021%3A59%3A56.png

review: Needs Fixing (ratio)

[PerfectCarl (name-is-carl)]

What is the status of this work?

How can we test it in a reproducible way?
(we can't just get our hands on random movies and see what happens).

[Viko Adi Rahmawan (vikoadi)]

It works!
btw, there is a bug where i can't resize window twice, not until i fullscreen-unfullscreen the window (trunk affected too)
so maybe just remove debugging code, merge from trunk than merge it to trunk

[Tom Beckmann (tombeckmann)]

I'll be focusing on gala the next couple of days (and then probably some other project will have to take immediate priority). If you like, I can change the branch ownership to ~elementary-apps (if you're part of that team, or your account directly) so you can take over from here.

[Viko Adi Rahmawan (vikoadi)]

i think unresizable bug is different problem, so my proposal we should just merge this branch into trunk.

[Tom Beckmann (tombeckmann)]

I'll leave that decision completely to you, feel free to do any adjustments you like while merging :)

[Viko Adi Rahmawan (vikoadi)]

fix ratio constrain in CSD

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-11-02 19:13:36 +0000
+++ src/Audience.vala	2014-11-25 18:33:34 +0000
@@ -89,6 +89,7 @@
         private static App app; // global App instance
         private Audience.Widgets.VideoPlayer video_player;
         private Audience.Widgets.BottomBar bottom_bar;
+        private Gtk.HeaderBar header;
         private Clutter.Stage stage;
         private Gtk.Revealer unfullscreen_bar;
         private GtkClutter.Actor bottom_actor;
@@ -167,7 +168,7 @@
             mainbox.pack_start (clutter);
             mainbox.pack_start (welcome);
 
-            var header = new Gtk.HeaderBar ();
+            header = new Gtk.HeaderBar ();
             header.set_show_close_button (true);
             header.get_style_context ().remove_class ("header-bar");
 
@@ -275,7 +276,7 @@
                 return false;
             });
 
-            mainwindow.size_allocate.connect ((alloc) => {on_size_allocate (alloc);});
+            mainwindow.size_allocate.connect (on_size_allocate);
             mainwindow.motion_notify_event.connect ((event) => {
                 if (event.window == null)
                     return false;
@@ -551,12 +552,62 @@
             mainwindow.get_window ().move_resize (monitor.width / 2 - width / 2 + monitor.x,
                 monitor.height / 2 - height / 2 + monitor.y,
                 width, height);
-
-            if (settings.keep_aspect) {
+        }
+
+        uint update_aspect_ratio_timeout = 0;
+        bool update_aspect_ratio_locked = false;
+        int prev_width = 0;
+        int prev_height = 0;
+        /**
+         * Updates the window's aspect ratio locking if enabled.
+         * Return type is just there to make it compatible with Idle.add()
+         */
+        private bool update_aspect_ratio ()
+        {
+            if (!settings.keep_aspect || video_player.video_width < 1 || video_player.height < 1
+                || !clutter.visible)
+                return false;
+
+            if (update_aspect_ratio_timeout != 0)
+                Source.remove (update_aspect_ratio_timeout);
+
+            update_aspect_ratio_timeout = Timeout.add (200, () => {
+                Gtk.Allocation a;
+                clutter.get_allocation (out a);
+                print ("%i %i %i,%i\n", a.x, a.y, (mainwindow.get_allocated_width () - clutter.get_allocated_width ()) / 2, (mainwindow.get_allocated_height () - clutter.get_allocated_height ()) / 2);
+                double width = clutter.get_allocated_width ();
+                double height = width * video_player.video_height / (double) video_player.video_width;
+                double width_offset = mainwindow.get_allocated_width () - width;
+                double height_offset = mainwindow.get_allocated_height () - clutter.get_allocated_height ();
+
+                print ("Width: %f, Height: %f, Offset: %f (%f, %f)\n", width, height, height_offset, video_player.video_width, video_player.video_height);
+
                 var geom = Gdk.Geometry ();
-                geom.min_aspect = geom.max_aspect = video_w / (double)video_h;
+                geom.min_aspect = geom.max_aspect = (width + width_offset) / (height + height_offset);
+
+                var w = mainwindow.get_allocated_width ();
+                var h = (int) (w * geom.max_aspect);
+                int b, c;
+
                 mainwindow.get_window ().set_geometry_hints (geom, Gdk.WindowHints.ASPECT);
-            }
+
+                mainwindow.get_window ().constrain_size (geom, Gdk.WindowHints.ASPECT, w, h, out b, out c);
+                print ("Result: %i %i == %i %i\n", w, h, b, c);
+                mainwindow.get_window ().resize (b, c);
+
+                update_aspect_ratio_timeout = 0;
+
+                Idle.add (() => {
+                    prev_width = mainwindow.get_allocated_width ();
+                    prev_height = mainwindow.get_allocated_height ();
+
+                    return false;
+                });
+
+                return false;
+            });
+
+            return false;
         }
 
         private void on_window_state_changed (Gdk.WindowState window_state) {
@@ -603,6 +654,9 @@
                     old_h = alloc.height;
                 }
             }
+
+            if (prev_width != mainwindow.get_allocated_width () && prev_height != mainwindow.get_allocated_height ())
+                Idle.add (update_aspect_ratio);
         }
 
         private bool update_pointer_position (double y, int window_height) {
@@ -854,4 +908,4 @@
     var app = Audience.App.get_instance ();
 
     app.run (args);
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-10-05 06:13:09 +0000
+++ src/Widgets/VideoPlayer.vala	2014-11-25 18:33:34 +0000
@@ -102,7 +102,7 @@
                     if (video != null && video.data != null) {
                         var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
                         video_height = video_info.get_height ();
-                        video_width = get_video_width (video_info);
+                        video_width = query_video_width (video_info);
                     }
                 } catch (Error e) {
                     error ();
@@ -161,8 +161,8 @@
         public dynamic Gst.Element playbin;
         Clutter.Texture video;
 
-        uint video_width;
-        uint video_height;
+        public uint video_width { get; private set; }
+        public uint video_height { get; private set; }
 
         public GnomeSessionManager session_manager;
         uint32 inhibit_cookie;
@@ -459,7 +459,7 @@
             playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, new_position);
         }
 
-        uint get_video_width (Gst.PbUtils.DiscovererVideoInfo video_info) {
+        uint query_video_width (Gst.PbUtils.DiscovererVideoInfo video_info) {
             var par = get_video_par (video_info);
             if (par == -1) {
                 return video_info.get_width ();
@@ -477,4 +477,4 @@
             return num / (double)denom;
         }
     }
-}
\ No newline at end of file
+}