Innocuous build fixes.

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9cd0395f2f6b22c02846a5f6d77859d1d0e9ef0d..54e0b470aa15ded1acc1dc93e762eef27b008b4a 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -18,6 +18,7 @@
 */
 
 #include "ffmpeg_content.h"
+#include "video_content.h"
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "ffmpeg_audio_stream.h"
@@ -60,18 +61,18 @@ int const FFmpegContentProperty::FILTERS = 102;
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film, p)
-       , VideoContent (film, p)
        , AudioContent (film, p)
        , SubtitleContent (film, p)
+       , video (new VideoContent (film))
 {
-
+       set_default_colour_conversion ();
 }
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
        : Content (film, node)
-       , VideoContent (film, node, version)
        , AudioContent (film, node)
        , SubtitleContent (film, node, version)
+       , video (new VideoContent (film, node, version))
 {
        list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
        for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -117,9 +118,9 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > c)
        : Content (film, c)
-       , VideoContent (film, c)
        , AudioContent (film, c)
        , SubtitleContent (film, c)
+       , video (new VideoContent (film, c))
 {
        shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
        DCPOMATIC_ASSERT (ref);
@@ -150,7 +151,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("FFmpeg");
        Content::as_xml (node);
-       VideoContent::as_xml (node);
+       video->as_xml (node);
        AudioContent::as_xml (node);
        SubtitleContent::as_xml (node);
 
@@ -194,6 +195,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
        take_from_video_examiner (examiner);
+       set_default_colour_conversion ();
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -252,7 +254,7 @@ FFmpegContent::technical_summary () const
        string filt = Filter::ffmpeg_string (_filters);
 
        return Content::technical_summary() + " - "
-               + VideoContent::technical_summary() + " - "
+               + video->technical_summary() + " - "
                + AudioContent::technical_summary() + " - "
                + String::compose (
                        "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt
@@ -305,7 +307,8 @@ FFmpegContent::identifier () const
 {
        SafeStringStream s;
 
-       s << VideoContent::identifier() << "_"
+       s << Content::identifier() << "_"
+         << video->identifier() << "_"
          << SubtitleContent::identifier();
 
        boost::mutex::scoped_lock lm (_mutex);
@@ -394,7 +397,8 @@ FFmpegContent::audio_streams () const
 void
 FFmpegContent::add_properties (list<UserProperty>& p) const
 {
-       VideoContent::add_properties (p);
+       Content::add_properties (p);
+       video->add_properties (p);
        AudioContent::add_properties (p);
 
        if (_bits_per_pixel) {
@@ -456,10 +460,11 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE 170M (BT601)"),
                _("SMPTE 240M"),
                _("Film"),
-               _("BT2020")
+               _("BT2020"),
+               _("SMPTE ST 428-1 (CIE 1931 XYZ)")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 10);
+       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
        p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
 
        char const * transfers[] = {
@@ -478,10 +483,12 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("BT1361 extended colour gamut"),
                _("IEC61966-2-1 (sRGB or sYCC)"),
                _("BT2020 for a 10-bit system"),
-               _("BT2020 for a 12-bit system")
+               _("BT2020 for a 12-bit system"),
+               _("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
+               _("SMPTE ST 428-1")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 16);
+       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 18);
        p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
 
        char const * spaces[] = {
@@ -505,3 +512,20 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                p.push_back (UserProperty (_("Video"), _("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
        }
 }
+
+/** Our subtitle streams have colour maps, which can be changed, but
+ *  they have no way of signalling that change.  As a hack, we have this
+ *  method which callers can use when they've modified one of our subtitle
+ *  streams.
+ */
+void
+FFmpegContent::signal_subtitle_stream_changed ()
+{
+       signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
+}
+
+double
+FFmpegContent::subtitle_video_frame_rate () const
+{
+       return video->video_frame_rate ();
+}