From e6c2bf5906843850b6fbcb94635129b4948e5c38 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Jan 2015 10:31:39 +0000 Subject: [PATCH] Forward-port DAR/SAR UI stuff from 1.x. --- src/lib/video_content.cc | 13 +++++++++++-- 1 file 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 + Copyright (C) 2013-2015 Carl Hetherington 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 (); } + -- 2.30.2