Merge lp:~vikoadi/audience/fix-resize into lp:~vikoadi/audience/audience-refactor

[Viko Adi Rahmawan]

merge fix-resize branch

[Viko Adi Rahmawan (vikoadi)]

review: Approve

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2015-06-19 14:28:39 +0000
+++ src/Audience.vala	2015-09-04 13:47:58 +0000
@@ -168,6 +168,7 @@
             mainwindow.set_application (this);
             mainwindow.set_titlebar (header);
             mainwindow.window_position = Gtk.WindowPosition.CENTER;
+            mainwindow.gravity = Gdk.Gravity.CENTER;
             mainwindow.show_all ();
             if (!settings.show_window_decoration)
                 mainwindow.decorated = false;
@@ -200,40 +201,26 @@
         }
 
         public void set_content_size (double width, double height, double content_height){
-            double width_offset = mainwindow.get_allocated_width () - width;
-            double height_offset = mainwindow.get_allocated_height () - content_height;
-
-            print ("Width: %f, Height: %f, Offset: %f )\n", width, height,content_height);
-
             var geom = Gdk.Geometry ();
-            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);
-
-        }
-
-        public void on_configure_window (uint video_w, uint video_h) {
-            Gdk.Rectangle monitor;
-            var screen = Gdk.Screen.get_default ();
-            screen.get_monitor_geometry (screen.get_monitor_at_window (mainwindow.get_window ()), out monitor);
-
-            int width = 0, height = 0;
-            if (monitor.width > video_w && monitor.height > video_h) {
-                width = (int) mainwindow.get_allocated_width ();
-                height = (int) mainwindow.get_allocated_height ();
+
+            if (width == 0
+                && height == 0
+                && content_height == 0) {
+                geom.min_aspect = geom.max_aspect = 0;
             } else {
-                width = (int)(monitor.width * 0.9);
-                height = (int)((double)video_h / video_w * width);
+                double width_offset = mainwindow.get_allocated_width () - width;
+                double height_offset = mainwindow.get_allocated_height () - content_height;
+
+                debug ("Width: %f, Height: %f, Offset: %f )\n", width, height, content_height);
+
+                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.resize(width, height);
+
+            mainwindow.set_geometry_hints (mainwindow, geom, Gdk.WindowHints.ASPECT);
         }
 
         private void on_player_ended () {

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-06-14 07:03:13 +0000
+++ src/CMakeLists.txt	2015-09-04 13:47:58 +0000
@@ -11,13 +11,14 @@
 # pkgconfig, real C code
 find_package (PkgConfig)
 
-set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
+set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 gstreamer-tag-1.0)
 set (VALA_DEPS
     granite>=0.3.0
     clutter-gtk-1.0
     gdk-x11-3.0
     gstreamer-1.0
     gstreamer-pbutils-1.0
+    gstreamer-video-1.0
     gstreamer-tag-1.0
 )
 

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2015-06-22 17:39:00 +0000
+++ src/Widgets/PlayerPage.vala	2015-09-04 13:47:58 +0000
@@ -35,7 +35,6 @@
         public signal void ended ();
 
         public PlayerPage () {
-            /* video_player = Widgets.VideoPlayer.get_default (); */
             video_player = new Widgets.VideoPlayer();
             video_player.notify["playing"].connect (() => {bottom_bar.toggle_play_pause ();});
 
@@ -190,8 +189,6 @@
                 App.get_instance ().mainwindow.set_keep_above (video_player.playing && settings.stay_on_top);
             });
 
-            video_player.configure_window.connect ((video_w, video_h) => {App.get_instance ().on_configure_window (video_w, video_h);});
-
             bottom_bar.time_widget.slider_motion_event.connect ((event) => {
                 int x, y;
                 bottom_bar.translate_coordinates (App.get_instance ().mainwindow, (int)event.x, (int)event.y, out x, out y);
@@ -224,6 +221,7 @@
         ~PlayerPage () {
             video_player.playing = false;
 
+            App.get_instance ().set_content_size (0, 0, 0);
             this.size_allocate.disconnect (on_size_allocate);
             App.get_instance ().mainwindow.window_state_event.disconnect (on_window_state_event);
             App.get_instance ().mainwindow.key_press_event.disconnect (on_key_press_event);

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2015-07-15 17:19:55 +0000
+++ src/Widgets/VideoPlayer.vala	2015-09-04 13:47:58 +0000
@@ -35,6 +35,16 @@
     SOFT_COLORBALANCE = (1 << 10)
 }
 
+/* use internal function while
+ * https://bugzilla.gnome.org/show_bug.cgi?id=754567
+ * isn't fixed
+ */
+[CCode (cprefix = "Gst", gir_namespace="GstVideo", gir_version="1.0", lower_case_cprefix="gst_video_", cheader_filename = "gst/video/video.h")]
+namespace GstVideo {
+    [CCode (cheader_filename = "gst/video/video.h")]
+    public static extern bool calculate_display_ratio (out uint dar_n, out uint dar_d, uint video_width, uint video_height, uint video_par_n, uint video_par_d, uint display_par_n, uint display_par_d);
+}
+
 namespace Audience.Widgets {
     public class VideoPlayer : Actor {
         public bool at_end;
@@ -94,8 +104,10 @@
                     var video = info.get_video_streams ();
                     if (video != null && video.data != null) {
                         var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-                        video_height = video_info.get_height ();
-                        video_width = query_video_width (video_info);
+                        uint w, h;
+                        get_media_size (video_info, out w, out h);
+                        video_width = w;
+                        video_height = h;
                     }
                 } catch (Error e) {
                     error ();
@@ -103,8 +115,6 @@
                     return;
                 }
 
-                intial_relayout = true;
-
                 playbin.get_bus ().set_flushing (true);
                 playing = false;
                 playbin.set_state (Gst.State.READY);
@@ -180,7 +190,6 @@
         public signal void audio_tags_changed ();
         public signal void error ();
         public signal void plugin_install_done ();
-        public signal void configure_window (uint video_w, uint video_h);
         public signal void progression_changed (double current_time, double total_time);
         public signal void external_subtitle_changed (string? uri);
         
@@ -363,16 +372,10 @@
             }
         }
 
-        bool intial_relayout = false;
         public bool relayout () {
             if (video_width < 1 || video_height < 1 || uri == null)
                 return false;
 
-            if (intial_relayout) {
-                configure_window (video_width, video_height);
-                intial_relayout = false;
-            }
-
             var stage = get_stage ();
             var aspect = stage.width / video_width < stage.height / video_height ?
                 stage.width / video_width : stage.height / video_height;
@@ -485,22 +488,39 @@
             playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, new_position);
         }
 
-        uint query_video_width (Gst.PbUtils.DiscovererVideoInfo video_info) {
-            var par = get_video_par (video_info);
-            if (par == -1) {
-                return video_info.get_width ();
-            }
-            return (uint)(video_height * par);
-        }
-
-        //pixel aspect ratio
-        double get_video_par (Gst.PbUtils.DiscovererVideoInfo video_info) {
-            var num = video_info.get_par_num ();
-            var denom = video_info.get_par_denom ();
-            if (num == 1 && denom == 1) {
-                return -1; //Error.
-            }
-            return num / (double)denom;
+
+
+        private void get_media_size (Gst.PbUtils.DiscovererVideoInfo video_info, out uint video_width, out uint video_height) {
+            var video_w = video_info.get_width ();
+            var video_h = video_info.get_height ();
+            var video_par_n = video_info.get_par_num ();
+            var video_par_d = video_info.get_par_denom ();
+            if (video_par_n == 0 || video_par_d == 0) {
+                debug ("width and/or height 0, assumming 1/1");
+                video_par_n = 1;
+                video_par_d = 1;
+            }
+            debug ("video PAR %u/%u", video_par_n, video_par_d);
+
+            uint num;
+            uint den;
+            if (!GstVideo.calculate_display_ratio (out num, out den, video_w, video_h, video_par_n, video_par_d, 1, 1)) {
+                warning ("overflow calculating display ratio");
+                num = 1;
+                den = 1;
+            }
+            debug ("calculated scale ratio %u / %u for %ux%u", num, den, video_w, video_h);
+
+            if (video_w % num == 0) {
+                debug ("keeping video width");
+                video_width = video_w;
+                video_height = (uint) Gst.Util.uint64_scale (video_w, den, num);
+            } else {
+                debug ("keeping video height");
+                video_width = (uint) Gst.Util.uint64_scale (video_h, num, den);
+                video_height = video_h;
+            }
+            debug ("scaling to %ux%u", video_width, video_height);
         }
 
         void update_subtitle_font () {