summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-01-14 10:31:39 +0000
committerCarl Hetherington <cth@carlh.net>2015-01-14 10:31:39 +0000
commite6c2bf5906843850b6fbcb94635129b4948e5c38 (patch)
treead8e4b0841c19b37b1e9765aa10b3f625fde431f /src/lib
parentf50ef83dc201047ff27a6ebd9b56104ce120dd9a (diff)
Forward-port DAR/SAR UI stuff from 1.x.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/video_content.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 077972fab..5dc9e3d66 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -525,7 +525,15 @@ VideoContent::processing_description () const
video_size_after_3d_split().height
);
- d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+
+ float ratio = video_size_after_3d_split().ratio ();
+
+ if (sample_aspect_ratio ()) {
+ d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+ ratio *= sample_aspect_ratio().get ();
+ }
+
+ d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
}
if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
@@ -570,3 +578,4 @@ VideoContent::processing_description () const
return d.str ();
}
+