Use get_pixel_size rather than get_size which is slightly nicer as we then don't...

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 4e49e12548f7dfb7c11720a37695c21f0f95a4de..5cd5d3729b9ef9fdafa0d3cf8bf1c6b471b8841a 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -36,11 +36,13 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 using std::string;
 using std::vector;
@@ -73,7 +75,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 {
        list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
        for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
-               _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (*i)));
+               _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (*i, version)));
                if ((*i)->optional_number_child<int> ("Selected")) {
                        _subtitle_stream = _subtitle_streams.back ();
                }
@@ -129,10 +131,18 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_
                }
        }
 
+       /* XXX: should probably check that more of the stuff below is the same in *this and ref */
+
        _subtitle_streams = ref->subtitle_streams ();
        _subtitle_stream = ref->subtitle_stream ();
        _audio_streams = ref->ffmpeg_audio_streams ();
        _first_video = ref->_first_video;
+       _filters = ref->_filters;
+       _color_range = ref->_color_range;
+       _color_primaries = ref->_color_primaries;
+       _color_trc = ref->_color_trc;
+       _colorspace = ref->_colorspace;
+       _bits_per_pixel = ref->_bits_per_pixel;
 }
 
 void
@@ -185,9 +195,6 @@ FFmpegContent::examine (shared_ptr<Job> job)
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
        take_from_video_examiner (examiner);
 
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-
        {
                boost::mutex::scoped_lock lm (_mutex);
 
@@ -200,7 +207,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
                if (!_audio_streams.empty ()) {
                        AudioMapping m = _audio_streams.front()->mapping ();
-                       film->make_audio_mapping_default (m);
+                       film()->make_audio_mapping_default (m);
                        _audio_streams.front()->set_mapping (m);
                }
 
@@ -278,10 +285,8 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 DCPTime
 FFmpegContent::full_length () const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ());
-       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate());
+       FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ());
+       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
 }
 
 void
@@ -317,26 +322,49 @@ FFmpegContent::identifier () const
 }
 
 list<ContentTimePeriod>
-FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const
+FFmpegContent::image_subtitles_during (ContentTimePeriod period, bool starting) const
+{
+       shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
+       if (!stream) {
+               return list<ContentTimePeriod> ();
+       }
+
+       return stream->image_subtitles_during (period, starting);
+}
+
+list<ContentTimePeriod>
+FFmpegContent::text_subtitles_during (ContentTimePeriod period, bool starting) const
 {
        shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
        if (!stream) {
                return list<ContentTimePeriod> ();
        }
 
-       return stream->subtitles_during (period, starting);
+       return stream->text_subtitles_during (period, starting);
 }
 
 bool
-FFmpegContent::has_text_subtitles () const
+FFmpegContent::has_image_subtitles () const
 {
+       BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, subtitle_streams()) {
+               if (i->has_image_subtitles()) {
+                       return true;
+               }
+       }
+
        return false;
 }
 
 bool
-FFmpegContent::has_image_subtitles () const
+FFmpegContent::has_text_subtitles () const
 {
-       return !subtitle_streams().empty ();
+       BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, subtitle_streams()) {
+               if (i->has_text_subtitles()) {
+                       return true;
+               }
+       }
+
+       return false;
 }
 
 void
@@ -374,12 +402,18 @@ FFmpegContent::add_properties (list<pair<string, string> >& p) const
 
                switch (_color_range) {
                case AVCOL_RANGE_UNSPECIFIED:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is unknown (not specified in the file).
                        p.push_back (make_pair (_("Colour range"), _("Unspecified")));
                        break;
                case AVCOL_RANGE_MPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is limited, so that not all possible values are valid.
                        p.push_back (make_pair (_("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)));
                        break;
                case AVCOL_RANGE_JPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is full, so that all possible pixel values are valid.
                        p.push_back (make_pair (_("Colour range"), String::compose (_("Full (0-%1)"), total)));
                        break;
                default:
@@ -388,12 +422,18 @@ FFmpegContent::add_properties (list<pair<string, string> >& p) const
        } else {
                switch (_color_range) {
                case AVCOL_RANGE_UNSPECIFIED:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is unknown (not specified in the file).
                        p.push_back (make_pair (_("Colour range"), _("Unspecified")));
                        break;
                case AVCOL_RANGE_MPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is limited, so that not all possible values are valid.
                        p.push_back (make_pair (_("Colour range"), _("Limited")));
                        break;
                case AVCOL_RANGE_JPEG:
+                       /// TRANSLATORS: this means that the range of pixel values used in this
+                       /// file is full, so that all possible pixel values are valid.
                        p.push_back (make_pair (_("Colour range"), _("Full")));
                        break;
                default: