Trim some unused stream includes / usings.

[libdcp.git] / src / reel_picture_asset.cc

diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 7099d7d2f7dfa4be7c4f26c873a52d09ff56687d..de106c794befacb78ef475958aa3b3b858f60eff 100644 (file)
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/reel_picture_asset.h
@@ -24,16 +38,18 @@
 #include "reel_picture_asset.h"
 #include "picture_asset.h"
 #include "dcp_assert.h"
+#include "raw_convert.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <iomanip>
+#include <cmath>
 
 using std::bad_cast;
 using std::string;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 using namespace dcp;
 
 ReelPictureAsset::ReelPictureAsset ()
@@ -49,7 +65,7 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entr
        , _frame_rate (asset->frame_rate ())
        , _screen_aspect_ratio (asset->screen_aspect_ratio ())
 {
-       
+
 }
 
 ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
@@ -60,13 +76,13 @@ ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
        try {
                _screen_aspect_ratio = Fraction (node->string_child ("ScreenAspectRatio"));
        } catch (XMLError& e) {
-               /* Maybe it's not a fraction */
-       }
-       try {
-               float f = node->number_child<float> ("ScreenAspectRatio");
-               _screen_aspect_ratio = Fraction (f * 1000, 1000);
-       } catch (bad_cast& e) {
+               /* It's not a fraction */
+               try {
+                       float f = node->number_child<float> ("ScreenAspectRatio");
+                       _screen_aspect_ratio = Fraction (f * 1000, 1000);
+               } catch (bad_cast& e) {
 
+               }
        }
 }
 
@@ -77,12 +93,29 @@ ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 
        /* Find <MainPicture> */
        xmlpp::Node* mp = find_child (node, cpl_node_name ());
-       
+
        mp->add_child ("FrameRate")->add_child_text (String::compose ("%1 %2", _frame_rate.numerator, _frame_rate.denominator));
        if (standard == INTEROP) {
-               stringstream s;
-               s << std::fixed << std::setprecision (2) << (float (_screen_aspect_ratio.numerator) / _screen_aspect_ratio.denominator);
-               mp->add_child ("ScreenAspectRatio")->add_child_text (s.str ());
+
+               /* Allowed values for this tag from the standard */
+               float allowed[] = { 1.33, 1.66, 1.77, 1.85, 2.00, 2.39 };
+               int const num_allowed = sizeof(allowed) / sizeof(float);
+
+               /* Actual ratio */
+               float ratio = float (_screen_aspect_ratio.numerator) / _screen_aspect_ratio.denominator;
+
+               /* Pick the closest and use that */
+               optional<float> closest;
+               optional<float> error;
+               for (int i = 0; i < num_allowed; ++i) {
+                       float const e = fabsf (allowed[i] - ratio);
+                       if (!closest || e < error.get()) {
+                               closest = allowed[i];
+                               error = e;
+                       }
+               }
+
+               mp->add_child ("ScreenAspectRatio")->add_child_text (raw_convert<string> (closest.get(), 2, true));
        } else {
                mp->add_child ("ScreenAspectRatio")->add_child_text (
                        String::compose ("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator)
@@ -108,7 +141,7 @@ ReelPictureAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt
        if (!ReelAsset::equals (other, opt, note)) {
                return false;
        }
-       
+
        shared_ptr<const ReelPictureAsset> rpa = dynamic_pointer_cast<const ReelPictureAsset> (other);
        if (!rpa) {
                return false;