Revert "Bump libdcp for new method."

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 24a38f2cda97c45d39d63150a2ce69ca43865223..a8b5a26ebbc0c4e91a9385d2aa67b5a724cf9bb2 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -1,25 +1,24 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "playlist.h"
-#include "sndfile_content.h"
-#include "sndfile_decoder.h"
 #include "video_content.h"
 #include "subtitle_content.h"
 #include "ffmpeg_decoder.h"
@@ -30,7 +29,7 @@
 #include "job.h"
 #include "config.h"
 #include "util.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
@@ -155,7 +154,7 @@ Playlist::video_identifier () const
                }
        }
 
-       MD5Digester digester;
+       Digester digester;
        digester.add (t.c_str(), t.length());
        return digester.get ();
 }
@@ -240,7 +239,7 @@ public:
 };
 
 int
-Playlist::best_dcp_frame_rate () const
+Playlist::best_video_frame_rate () const
 {
        list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
@@ -266,14 +265,14 @@ Playlist::best_dcp_frame_rate () const
 
                float this_error = 0;
                BOOST_FOREACH (shared_ptr<Content> j, _content) {
-                       if (!j->video || !j->video->has_own_frame_rate()) {
+                       if (!j->video || !j->video_frame_rate()) {
                                continue;
                        }
 
                        /* Best error for this content; we could use the content as-is or double its rate */
                        float best_error = min (
-                               float (fabs (i->source - j->video->frame_rate ())),
-                               float (fabs (i->source - j->video->frame_rate () * 2))
+                               float (fabs (i->source - j->video_frame_rate().get())),
+                               float (fabs (i->source - j->video_frame_rate().get() * 2))
                                );
 
                        /* Use the largest difference between DCP and source as the "error" */
@@ -375,7 +374,13 @@ Playlist::active_frame_rate_change (DCPTime t, int dcp_video_frame_rate) const
                        /* This is the first piece of content (going backwards...) that starts before t,
                           so it's the active one.
                        */
-                       return FrameRateChange ((*i)->video->frame_rate(), dcp_video_frame_rate);
+                       if ((*i)->video_frame_rate ()) {
+                               /* This content specified a rate, so use it */
+                               return FrameRateChange ((*i)->video_frame_rate().get(), dcp_video_frame_rate);
+                       } else {
+                               /* No specified rate so just use the DCP one */
+                               return FrameRateChange (dcp_video_frame_rate, dcp_video_frame_rate);
+                       }
                }
        }
 
@@ -506,3 +511,28 @@ Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_
        /* Add on 64k for bits and pieces (metadata, subs etc) */
        return video + audio + 65536;
 }
+
+string
+Playlist::content_summary (DCPTimePeriod period) const
+{
+       string best_summary;
+       int best_score = -1;
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               int score = 0;
+               optional<DCPTimePeriod> const o = DCPTimePeriod(i->position(), i->end()).overlap (period);
+               if (o) {
+                       score += 100 * o.get().duration().get() / period.duration().get();
+               }
+
+               if (i->video) {
+                       score += 100;
+               }
+
+               if (score > best_score) {
+                       best_summary = i->path(0).leaf().string();
+                       best_score = score;
+               }
+       }
+
+       return best_summary;
+}