Merge lp:~l-admin-3/snap-elementary/dynamic-video-size into lp:snap-elementary

[Marcus Wichelmann]

Automatically resize the window based on the resolution of the webcam. The window size is limited to 80% of the screen.

This branch enables the automatically resizing of the window depending on the resolution of the webcam and fixes the FIXME. The window size is limited to 80% of the screen.

[lp:~l-admin-3/snap-elementary/dynamic-video-size]

321. By Marcus Wichelmann on 2015-02-27

Use the uri of the first detected camera

322. By Marcus Wichelmann on 2015-02-27

Fix the broken gallery-view

323. By Marcus Wichelmann on 2015-02-27

Calculate the thumbnail-width correctly so all four rows are shown

[Danielle Foré (danrabbit)]

Hm I like that it sets the aspect ratio correctly, but I don't like that it can't be resized. But I guess that's a problem in trunk as well.

[lp:~l-admin-3/snap-elementary/dynamic-video-size]

324. By Marcus Wichelmann on 2015-03-02

Constant added and window now resizable.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-24 07:15:47 +0000
+++ CMakeLists.txt	2015-03-02 14:02:46 +0000
@@ -40,7 +40,7 @@
 
 # Dependencies
 find_package (PkgConfig)
-set (SNAP_DEPS gee-0.8 gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0>=3.10 gdk-x11-3.0 granite gstreamer-1.0 gstreamer-video-1.0 x11 gudev-1.0 zeitgeist-2.0)
+set (SNAP_DEPS gee-0.8 gobject-2.0 glib-2.0 gio-2.0 gtk+-3.0>=3.10 gdk-x11-3.0 granite gstreamer-1.0 gstreamer-video-1.0 gstreamer-pbutils-1.0 x11 gudev-1.0 zeitgeist-2.0)
 pkg_check_modules (DEPS REQUIRED ${SNAP_DEPS})
 
 set(NORMAL_CFLAGS ${DEPS_CFLAGS})
@@ -57,4 +57,4 @@
 add_subdirectory (po)
 
 # Data
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.desktop DESTINATION share/applications)
\ No newline at end of file
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/snap-photobooth.desktop DESTINATION share/applications)

=== modified file 'src/Services/ThumbnailProvider.vala'
--- src/Services/ThumbnailProvider.vala	2015-02-26 12:35:06 +0000
+++ src/Services/ThumbnailProvider.vala	2015-03-02 14:02:46 +0000
@@ -36,8 +36,8 @@
         private Gee.Set<Thumbnail> cache;
         private int temp_thumb;
 
-        public static const int THUMB_WIDTH = Widgets.Camera.WIDTH / 4;
-        public static const int THUMB_HEIGHT = Widgets.Camera.HEIGHT / 4;
+        public uint thumb_width = 0;
+        public uint thumb_height = 0;
 
         public signal void thumbnail_loaded (Thumbnail thumbnail);
 
@@ -46,10 +46,12 @@
          * to obtain thumbnails for files in a specific path
          * @param path the path where the provider will look for thumbnails
          */
-        public ThumbnailProvider (File path) {
+        public ThumbnailProvider (File path, uint thumb_width, uint thumb_height) {
             this.path = path;
             this.cache = new Gee.TreeSet<Thumbnail> ();
             this.temp_thumb = 0;
+            this.thumb_width = thumb_width;
+            this.thumb_height = thumb_height;
         }
 
         /**
@@ -88,7 +90,7 @@
                 Gdk.Pixbuf pix = null;
                 if (attr == null) pix = new Gdk.Pixbuf.from_file (file.get_path ());
                 else pix = new Gdk.Pixbuf.from_file (attr);
-                pix = pix.scale_simple (THUMB_WIDTH, THUMB_HEIGHT, 0);
+                pix = pix.scale_simple ((int)thumb_width, (int)thumb_height, 0);
                 thumb = new Thumbnail (file, pix);
             } catch (Error err) {
                 warning ("Error: get_thumbnail failed: %s", err.message);
@@ -104,7 +106,7 @@
                                             "-o", out_path, // Output file
                                             "-c", "png",
                                             "-f", "-t", "10",
-                                            "-s", THUMB_WIDTH.to_string () };
+                                            "-s", thumb_width.to_string () };
                     string[] spawn_env = Environ.get ();
                     Pid child_pid;
 
@@ -121,7 +123,7 @@
                     });
 
                     Gdk.Pixbuf pix = new Gdk.Pixbuf.from_file (out_path);
-                    pix = pix.scale_simple (THUMB_WIDTH, THUMB_HEIGHT, 0);
+                    pix = pix.scale_simple ((int)thumb_width, (int)thumb_height, 0);
                     thumb = new Thumbnail (file, pix);
                     thumb.is_temp = true;
                     thumb.temp_file = File.new_for_path (out_path);

=== modified file 'src/SnapWindow.vala'
--- src/SnapWindow.vala	2015-02-26 12:35:06 +0000
+++ src/SnapWindow.vala	2015-03-02 14:02:46 +0000
@@ -41,28 +41,40 @@
         private File video_path;
 
         private bool camera_detected;
+        private string camera_uri;
 
         public SnapWindow (Snap.SnapApp snap_app) {
             this.snap_app = snap_app;
             this.set_application (this.snap_app);
 
             this.title = "Snap";
-            this.window_position = Gtk.WindowPosition.CENTER;
             this.icon_name = "snap-photobooth";
             this.set_size_request (640, 480);
-            this.resizable = false;
 
-            // Init thumbnail providers
+            // Get paths
             photo_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.PHOTO));
             video_path = File.new_for_path (Resources.get_media_dir (Widgets.Camera.ActionType.VIDEO));
-            Resources.photo_thumb_provider = new Services.ThumbnailProvider (photo_path);
-            Resources.video_thumb_provider = new Services.ThumbnailProvider (video_path);
 
             // camera
-            camera_detected = this.detect_camera ();
+            camera_uri = this.detect_camera ();
+            camera_detected = camera_uri != "";
+
+            // Setup the camera
+            this.camera = new Snap.Widgets.Camera (camera_uri);
+
+            // Calculate thumbnail sizes
+            var thumb_width = (camera.video_width - 19) / 4 - 18; // 19 = scrollbar_width + 2 * margin; 4 = row-count; 18 = 2 * item_padding + column_spacing
+            var thumb_height = (int)(((float)thumb_width / camera.video_width) * camera.video_height);
+
+            // Init thumbnail providers
+            Resources.photo_thumb_provider = new Services.ThumbnailProvider (photo_path, thumb_width, thumb_height);
+            Resources.video_thumb_provider = new Services.ThumbnailProvider (video_path, thumb_width, thumb_height);
 
             // Setup UI
             setup_window ();
+
+            // Set the window position
+            this.window_position = Gtk.WindowPosition.CENTER;
         }
 
         void setup_window () {
@@ -151,7 +163,6 @@
             this.gallery = new Snap.Widgets.Gallery ();
 
             // Setup preview area
-            this.camera = new Snap.Widgets.Camera ();
             this.camera.capture_start.connect (() => {
                 // Disable uneeded buttons
                 gallery_button.sensitive = false;
@@ -189,7 +200,7 @@
             this.show_all ();
         }
 
-        private bool detect_camera () {
+        private string detect_camera () {
             try {
                 var video_devices = File.new_for_path ("/dev/.");
                 FileEnumerator enumerator = video_devices.enumerate_children (FileAttribute.STANDARD_NAME, 0);
@@ -197,7 +208,7 @@
                 while ((info = enumerator.next_file (null)) != null) {
                     if (info.get_name ().has_prefix ("video")){
                         debug ("camera found: %s", info.get_name ());
-                        return true;
+                        return "v4l2:///dev/%s".printf (info.get_name ());
                     }
                 }
             } catch (Error err) {
@@ -205,7 +216,7 @@
             }
 
             debug ("no camera");
-            return false;
+            return "";
         }
 
         protected override bool delete_event (Gdk.EventAny event) {

=== modified file 'src/Widgets/Camera.vala'
--- src/Widgets/Camera.vala	2015-02-26 12:35:06 +0000
+++ src/Widgets/Camera.vala	2015-03-02 14:02:46 +0000
@@ -26,8 +26,10 @@
             CAPTURING;
         }
 
-        public static const int WIDTH = 640;
-        public static const int HEIGHT = 480;
+        private const double PERCENTAGE_SCREEN = 0.6;
+
+        public uint video_width = 640;
+        public uint video_height = 480;
 
         private ActionType type;
 
@@ -39,9 +41,7 @@
         public signal void capture_start ();
         public signal void capture_stop ();
 
-        public class Camera () {
-            this.set_size_request (WIDTH, HEIGHT); // FIXME
-
+        public class Camera (string camera_uri) {
             this.videoflip = Gst.ElementFactory.make ("videoflip", "videoflip");
             this.videoflip.set_property ("method", 4);
 
@@ -54,7 +54,7 @@
                 return true;
             });
 
-            var preview_caps = Gst.Caps.from_string ("video/x-raw, format=\"rgb\", width = (int) %d, height = (int) %d".printf (WIDTH, HEIGHT));
+            var preview_caps = Gst.Caps.from_string ("video/x-raw, format=\"rgb\"");
             this.camerabin.set_property ("preview-caps", preview_caps);
 
             // Workaround to fix a CSD releated bug.
@@ -65,6 +65,37 @@
                 this.set_visual (visual);
             // workaround END
 
+            try {
+                var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (camera_uri);
+                var video = info.get_video_streams ();
+
+                if (video != null && video.data != null) {
+                    var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
+
+                    video_width = video_info.get_width ();
+                    video_height = video_info.get_height ();
+                }
+
+                var current_screen = this.get_screen ();
+                var screen_width = current_screen.get_width ();
+                var screen_height = current_screen.get_height ();
+
+                if (video_width >= screen_width * PERCENTAGE_SCREEN || video_height >= screen_height * PERCENTAGE_SCREEN) {
+                    if ((float)screen_width / video_width < (float)screen_height / video_height) {
+                        var new_video_width = (int)(screen_width * PERCENTAGE_SCREEN);
+                        video_height = (int)(((float)new_video_width / video_width) * video_height);
+                        video_width = new_video_width;
+                    } else {
+                        var new_video_height = (int)(screen_height * PERCENTAGE_SCREEN);
+                        video_width = (int)(((float)new_video_height / video_height) * video_width);
+                        video_height = new_video_height;
+                    }
+                }
+            } catch (Error e) {
+                debug ("Getting the video-size failed: %s", e.message);
+            }
+
+            this.set_size_request ((int)video_width, (int)video_height);
             this.show_all ();
             this.play ();
         }