BOOST_FOREACH.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 1fb95535f0e74af738f262f481fc22e380d300e6..234c792fd3ddfff4c7915fa54bbcaca0dca22cda 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,7 +34,6 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "text_content.h"
-#include "decrypted_ecinema_kdm.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {
@@ -42,7 +41,6 @@ extern "C" {
 #include <libavutil/pixdesc.h>
 }
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -54,8 +52,8 @@ using std::cout;
 using std::pair;
 using std::make_pair;
 using std::max;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
 using namespace dcpomatic;
@@ -67,9 +65,6 @@ int const FFmpegContentProperty::KDM = 103;
 
 FFmpegContent::FFmpegContent (boost::filesystem::path p)
        : Content (p)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , _encrypted (false)
-#endif
 {
 
 }
@@ -130,9 +125,6 @@ FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list<string>
        _color_trc = get_optional_enum<AVColorTransferCharacteristic>(node, "ColorTransferCharacteristic");
        _colorspace = get_optional_enum<AVColorSpace>(node, "Colorspace");
        _bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       _encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
-#endif
 }
 
 FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
@@ -194,9 +186,6 @@ FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
        _color_trc = ref->_color_trc;
        _colorspace = ref->_colorspace;
        _bits_per_pixel = ref->_bits_per_pixel;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       _encrypted = ref->_encrypted;
-#endif
 }
 
 void
@@ -212,7 +201,7 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
        if (audio) {
                audio->as_xml (node);
 
-               BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+               for (auto i: audio->streams ()) {
                        shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
                        DCPOMATIC_ASSERT (f);
                        f->as_xml (node->add_child("AudioStream"));
@@ -256,11 +245,6 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
        if (_bits_per_pixel) {
                node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (*_bits_per_pixel));
        }
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (_encrypted) {
-               node->add_child("Encypted")->add_child_text ("1");
-       }
-#endif
 }
 
 void
@@ -311,7 +295,7 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                if (!examiner->audio_streams().empty ()) {
                        audio.reset (new AudioContent (this));
 
-                       BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
+                       for (auto i: examiner->audio_streams ()) {
                                audio->add_stream (i);
                        }
 
@@ -327,10 +311,6 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                        text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
                        _subtitle_stream = _subtitle_streams.front ();
                }
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               _encrypted = first_path.extension() == ".ecinema";
-#endif
        }
 
        if (examiner->has_video ()) {
@@ -344,10 +324,6 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
                set_video_frame_rate (24000.0 / 1001);
                video->set_length (video->length() * 24.0 / 30);
        }
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       _id = examiner->id ();
-#endif
 }
 
 string
@@ -368,7 +344,7 @@ string
 FFmpegContent::technical_summary () const
 {
        string as = "";
-       BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, ffmpeg_audio_streams ()) {
+       for (auto i: ffmpeg_audio_streams ()) {
                as += i->technical_summary () + " " ;
        }
 
@@ -431,7 +407,7 @@ FFmpegContent::full_length (shared_ptr<const Film> film) const
 
        if (audio) {
                DCPTime longest;
-               BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+               for (auto i: audio->streams()) {
                        longest = max (longest, DCPTime::from_frames(llrint(i->length() / frc.speed_up), i->frame_rate()));
                }
                return longest;
@@ -452,7 +428,7 @@ FFmpegContent::approximate_length () const
        DCPOMATIC_ASSERT (audio);
 
        Frame longest = 0;
-       BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+       for (auto i: audio->streams()) {
                longest = max (longest, Frame(llrint(i->length())));
        }
 
@@ -540,8 +516,10 @@ FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>&
                video->add_properties (p);
 
                if (_bits_per_pixel) {
-                       int const sub = 219 * pow (2, _bits_per_pixel.get() - 8);
-                       int const total = pow (2, _bits_per_pixel.get());
+                       /* Assuming there's three components, so bits per pixel component is _bits_per_pixel / 3 */
+                       int const lim_start = pow(2, _bits_per_pixel.get() / 3 - 4);
+                       int const lim_end = 235 * pow(2, _bits_per_pixel.get() / 3 - 8);
+                       int const total = pow(2, _bits_per_pixel.get() / 3);
 
                        switch (_color_range.get_value_or(AVCOL_RANGE_UNSPECIFIED)) {
                        case AVCOL_RANGE_UNSPECIFIED:
@@ -554,7 +532,7 @@ FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>&
                                /// file is limited, so that not all possible values are valid.
                                p.push_back (
                                        UserProperty (
-                                               UserProperty::VIDEO, _("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)
+                                               UserProperty::VIDEO, _("Colour range"), String::compose(_("Limited (%1-%2)"), lim_start, lim_end)
                                                )
                                        );
                                break;
@@ -691,7 +669,7 @@ FFmpegContent::ffmpeg_audio_streams () const
        vector<shared_ptr<FFmpegAudioStream> > fa;
 
        if (audio) {
-               BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+               for (auto i: audio->streams()) {
                        fa.push_back (dynamic_pointer_cast<FFmpegAudioStream> (i));
                }
        }
@@ -711,30 +689,3 @@ FFmpegContent::take_settings_from (shared_ptr<const Content> c)
        _filters = fc->_filters;
 }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-FFmpegContent::add_kdm (EncryptedECinemaKDM kdm)
-{
-       ChangeSignaller<Content> cc (this, FFmpegContentProperty::KDM);
-       boost::mutex::scoped_lock lm (_mutex);
-       _kdm = kdm;
-
-}
-
-bool
-FFmpegContent::kdm_timing_window_valid () const
-{
-       if (!_kdm) {
-               return true;
-       }
-
-       DCPOMATIC_ASSERT (Config::instance()->decryption_chain()->key());
-
-       DecryptedECinemaKDM decrypted (*_kdm, *Config::instance()->decryption_chain()->key());
-
-       dcp::LocalTime now;
-       return (!decrypted.not_valid_before() || *decrypted.not_valid_before() < now) &&
-               (!decrypted.not_valid_after() || now < *decrypted.not_valid_after());
-}
-
-#endif