Merge lp:~shockone89/audience/aspect-ratio into lp:~audience-members/audience/trunk

[Volodymyr Shatsky]

Better detect aspect ratio

Fixed.

[Cody Garver (codygarver)]

I played a_bout_de_souffle.m4v using this branch, mpv, and Totem and they all displayed a different AR. I didn't have time to do screenshots and measure the pixels though, which do you think is displaying it correctly?

[Danielle Foré (danrabbit)]

Okay, so from what I can tell the aspect ratio is still wrong with this branch.

Totem and Chrome both play the video at 4:3, and Audience is showing 1.4:1

review: Needs Fixing

[Danielle Foré (danrabbit)]

Way closer than trunk though. We can probably just merge

[Volodymyr Shatsky (shockone89)]

The video is broken. Its width and height metadata are set to 1px. But PAR is correct. We deduce the original resolution from it. Maybe the players you mentioned just fall back to 4:3.

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-04-28 12:58:09 +0000
+++ src/Widgets/VideoPlayer.vala	2014-05-04 13:33:40 +0000
@@ -93,8 +93,8 @@
                     var video = info.get_video_streams ();
                     if (video.data != null) {
                         var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-                        video_width = video_info.get_width ();
                         video_height = video_info.get_height ();
+                        video_width = get_video_width (video_info);
                     }
                 } catch (Error e) {
                     error ();
@@ -592,5 +592,23 @@
                 }
             } catch (Error e) { warning (e.message); }
         }
+
+        uint get_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;
+        }
     }
 }
\ No newline at end of file