Rename Subtitle -> Text
[dcpomatic.git] / src / lib / ffmpeg_content.cc
index a8206b13e05cdf0fa1ee7415027b714825a51f83..e18977944648fc1faff37e83987d8018a63fe473 100644 (file)
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -31,9 +32,8 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
-#include "raw_convert.h"
-#include "subtitle_content.h"
+#include "text_content.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>
@@ -53,9 +53,11 @@ using std::list;
 using std::cout;
 using std::pair;
 using std::make_pair;
+using std::max;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using dcp::raw_convert;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
@@ -64,19 +66,26 @@ int const FFmpegContentProperty::FILTERS = 102;
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film, p)
 {
-       video.reset (new VideoContent (this, film));
-       audio.reset (new AudioContent (this, film));
-       subtitle.reset (new SubtitleContent (this, film));
 
-       set_default_colour_conversion ();
+}
+
+template <class T>
+optional<T>
+get_optional_enum (cxml::ConstNodePtr node, string name)
+{
+       optional<int> const v = node->optional_number_child<int>(name);
+       if (!v) {
+               return optional<T>();
+       }
+       return static_cast<T>(*v);
 }
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
        : Content (film, node)
 {
-       video = VideoContent::from_xml (this, film, node, version);
-       audio = AudioContent::from_xml (this, film, node);
-       subtitle = SubtitleContent::from_xml (this, film, node, version);
+       video = VideoContent::from_xml (this, node, version);
+       audio = AudioContent::from_xml (this, node, version);
+       subtitle = TextContent::from_xml (this, node, version);
 
        list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
        for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
@@ -111,29 +120,58 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
                _first_video = ContentTime (f.get ());
        }
 
-       _color_range = static_cast<AVColorRange> (node->optional_number_child<int>("ColorRange").get_value_or (AVCOL_RANGE_UNSPECIFIED));
-       _color_primaries = static_cast<AVColorPrimaries> (node->optional_number_child<int>("ColorPrimaries").get_value_or (AVCOL_PRI_UNSPECIFIED));
-       _color_trc = static_cast<AVColorTransferCharacteristic> (
-               node->optional_number_child<int>("ColorTransferCharacteristic").get_value_or (AVCOL_TRC_UNSPECIFIED)
-               );
-       _colorspace = static_cast<AVColorSpace> (node->optional_number_child<int>("Colorspace").get_value_or (AVCOL_SPC_UNSPECIFIED));
+       _color_range = get_optional_enum<AVColorRange>(node, "ColorRange");
+       _color_primaries = get_optional_enum<AVColorPrimaries>(node, "ColorPrimaries");
+       _color_trc = get_optional_enum<AVColorTransferCharacteristic>(node, "ColorTransferCharacteristic");
+       _colorspace = get_optional_enum<AVColorSpace>(node, "Colorspace");
        _bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
 
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > c)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
        : Content (film, c)
 {
-       video.reset (new VideoContent (this, film, c));
-       audio.reset (new AudioContent (this, film, c));
-       subtitle.reset (new SubtitleContent (this, film, c));
+       vector<shared_ptr<Content> >::const_iterator i = c.begin ();
+
+       bool need_video = false;
+       bool need_audio = false;
+       bool need_subtitle = false;
+
+       if (i != c.end ()) {
+               need_video = static_cast<bool> ((*i)->video);
+               need_audio = static_cast<bool> ((*i)->audio);
+               need_subtitle = static_cast<bool> ((*i)->subtitle);
+       }
+
+       while (i != c.end ()) {
+               if (need_video != static_cast<bool> ((*i)->video)) {
+                       throw JoinError (_("Content to be joined must all have or not have video"));
+               }
+               if (need_audio != static_cast<bool> ((*i)->audio)) {
+                       throw JoinError (_("Content to be joined must all have or not have audio"));
+               }
+               if (need_subtitle != static_cast<bool> ((*i)->subtitle)) {
+                       throw JoinError (_("Content to be joined must all have or not have subtitles"));
+               }
+               ++i;
+       }
+
+       if (need_video) {
+               video.reset (new VideoContent (this, c));
+       }
+       if (need_audio) {
+               audio.reset (new AudioContent (this, c));
+       }
+       if (need_subtitle) {
+               subtitle.reset (new TextContent (this, c));
+       }
 
        shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
        DCPOMATIC_ASSERT (ref);
 
        for (size_t i = 0; i < c.size(); ++i) {
                shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
-               if (fc->subtitle->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+               if (fc->subtitle && fc->subtitle->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
                        throw JoinError (_("Content to be joined must use the same subtitle stream."));
                }
        }
@@ -152,13 +190,28 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_
 }
 
 void
-FFmpegContent::as_xml (xmlpp::Node* node) const
+FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
        node->add_child("Type")->add_child_text ("FFmpeg");
-       Content::as_xml (node);
-       video->as_xml (node);
-       audio->as_xml (node);
-       subtitle->as_xml (node);
+       Content::as_xml (node, with_paths);
+
+       if (video) {
+               video->as_xml (node);
+       }
+
+       if (audio) {
+               audio->as_xml (node);
+
+               BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+                       shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
+                       DCPOMATIC_ASSERT (f);
+                       f->as_xml (node->add_child("AudioStream"));
+               }
+       }
+
+       if (subtitle) {
+               subtitle->as_xml (node);
+       }
 
        boost::mutex::scoped_lock lm (_mutex);
 
@@ -170,12 +223,6 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
                (*i)->as_xml (t);
        }
 
-       BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
-               shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
-               DCPOMATIC_ASSERT (f);
-               f->as_xml (node->add_child("AudioStream"));
-       }
-
        for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
                node->add_child("Filter")->add_child_text ((*i)->id ());
        }
@@ -184,12 +231,20 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
                node->add_child("FirstVideo")->add_child_text (raw_convert<string> (_first_video.get().get()));
        }
 
-       node->add_child("ColorRange")->add_child_text (raw_convert<string> (_color_range));
-       node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (_color_primaries));
-       node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (_color_trc));
-       node->add_child("Colorspace")->add_child_text (raw_convert<string> (_colorspace));
+       if (_color_range) {
+               node->add_child("ColorRange")->add_child_text (raw_convert<string> (static_cast<int> (*_color_range)));
+       }
+       if (_color_primaries) {
+               node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (static_cast<int> (*_color_primaries)));
+       }
+       if (_color_trc) {
+               node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (static_cast<int> (*_color_trc)));
+       }
+       if (_colorspace) {
+               node->add_child("Colorspace")->add_child_text (raw_convert<string> (static_cast<int> (*_colorspace)));
+       }
        if (_bits_per_pixel) {
-               node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (_bits_per_pixel.get ()));
+               node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (*_bits_per_pixel));
        }
 }
 
@@ -201,35 +256,61 @@ FFmpegContent::examine (shared_ptr<Job> job)
        Content::examine (job);
 
        shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
-       video->take_from_examiner (examiner);
-       set_default_colour_conversion ();
+
+       if (examiner->has_video ()) {
+               video.reset (new VideoContent (this));
+               video->take_from_examiner (examiner);
+       }
+
+       boost::filesystem::path first_path = path (0);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
 
-               _subtitle_streams = examiner->subtitle_streams ();
-               if (!_subtitle_streams.empty ()) {
-                       _subtitle_stream = _subtitle_streams.front ();
+               if (examiner->has_video ()) {
+                       _first_video = examiner->first_video ();
+                       _color_range = examiner->color_range ();
+                       _color_primaries = examiner->color_primaries ();
+                       _color_trc = examiner->color_trc ();
+                       _colorspace = examiner->colorspace ();
+                       _bits_per_pixel = examiner->bits_per_pixel ();
+
+                       if (examiner->rotation()) {
+                               double rot = *examiner->rotation ();
+                               if (fabs (rot - 180) < 1.0) {
+                                       _filters.push_back (Filter::from_id ("vflip"));
+                                       _filters.push_back (Filter::from_id ("hflip"));
+                               } else if (fabs (rot - 90) < 1.0) {
+                                       _filters.push_back (Filter::from_id ("90clock"));
+                               } else if (fabs (rot - 270) < 1.0) {
+                                       _filters.push_back (Filter::from_id ("90anticlock"));
+                               }
+                       }
                }
 
-               BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
-                       audio->add_stream (i);
-               }
+               if (!examiner->audio_streams().empty ()) {
+                       audio.reset (new AudioContent (this));
+
+                       BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
+                               audio->add_stream (i);
+                       }
 
-               if (!audio->streams().empty ()) {
                        AudioStreamPtr as = audio->streams().front();
                        AudioMapping m = as->mapping ();
-                       film()->make_audio_mapping_default (m);
+                       film()->make_audio_mapping_default (m, first_path);
                        as->set_mapping (m);
                }
 
-               _first_video = examiner->first_video ();
+               _subtitle_streams = examiner->subtitle_streams ();
+               if (!_subtitle_streams.empty ()) {
+                       subtitle.reset (new TextContent (this));
+                       _subtitle_stream = _subtitle_streams.front ();
+               }
+
+       }
 
-               _color_range = examiner->color_range ();
-               _color_primaries = examiner->color_primaries ();
-               _color_trc = examiner->color_trc ();
-               _colorspace = examiner->colorspace ();
-               _bits_per_pixel = examiner->bits_per_pixel ();
+       if (examiner->has_video ()) {
+               set_default_colour_conversion ();
        }
 
        signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
@@ -239,8 +320,15 @@ FFmpegContent::examine (shared_ptr<Job> job)
 string
 FFmpegContent::summary () const
 {
-       /* Get the string() here so that the name does not have quotes around it */
-       return String::compose (_("%1 [movie]"), path_summary ());
+       if (video && audio) {
+               return String::compose (_("%1 [movie]"), path_summary ());
+       } else if (video) {
+               return String::compose (_("%1 [video]"), path_summary ());
+       } else if (audio) {
+               return String::compose (_("%1 [audio]"), path_summary ());
+       }
+
+       return path_summary ();
 }
 
 string
@@ -262,12 +350,19 @@ FFmpegContent::technical_summary () const
 
        string filt = Filter::ffmpeg_string (_filters);
 
-       return Content::technical_summary() + " - "
-               + video->technical_summary() + " - "
-               + audio->technical_summary() + " - "
-               + String::compose (
-                       "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt
-                       );
+       string s = Content::technical_summary ();
+
+       if (video) {
+               s += " - " + video->technical_summary ();
+       }
+
+       if (audio) {
+               s += " - " + audio->technical_summary ();
+       }
+
+       return s + String::compose (
+               "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt
+               );
 }
 
 void
@@ -297,7 +392,18 @@ DCPTime
 FFmpegContent::full_length () const
 {
        FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ());
-       return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+       if (video) {
+               return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+       }
+
+       DCPOMATIC_ASSERT (audio);
+
+       DCPTime longest;
+       BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+               longest = max (longest, DCPTime::from_frames (llrint (i->length() / frc.speed_up), i->frame_rate()));
+       }
+
+       return longest;
 }
 
 void
@@ -314,58 +420,61 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 string
 FFmpegContent::identifier () const
 {
-       SafeStringStream s;
-
-       s << Content::identifier() << "_"
-         << video->identifier() << "_"
-         << subtitle->identifier();
+       string s = Content::identifier();
 
-       boost::mutex::scoped_lock lm (_mutex);
-
-       if (_subtitle_stream) {
-               s << "_" << _subtitle_stream->identifier ();
+       if (video) {
+               s += "_" + video->identifier();
        }
 
-       for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-               s << "_" << (*i)->id ();
+       if (subtitle && subtitle->use() && subtitle->burn()) {
+               s += "_" + subtitle->identifier();
        }
 
-       return s.str ();
-}
+       boost::mutex::scoped_lock lm (_mutex);
 
-list<ContentTimePeriod>
-FFmpegContent::image_subtitles_during (ContentTimePeriod period, bool starting) const
-{
-       shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
-       if (!stream) {
-               return list<ContentTimePeriod> ();
+       if (_subtitle_stream) {
+               s += "_" + _subtitle_stream->identifier ();
        }
 
-       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> ();
+       for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+               s += "_" + (*i)->id ();
        }
 
-       return stream->text_subtitles_during (period, starting);
+       return s;
 }
 
 void
 FFmpegContent::set_default_colour_conversion ()
 {
+       DCPOMATIC_ASSERT (video);
+
        dcp::Size const s = video->size ();
 
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (s.width < 1080) {
-               video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion);
-       } else {
+       switch (_colorspace.get_value_or(AVCOL_SPC_UNSPECIFIED)) {
+       case AVCOL_SPC_RGB:
+               video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion);
+               break;
+       case AVCOL_SPC_BT709:
                video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
+               break;
+       case AVCOL_SPC_BT470BG:
+       case AVCOL_SPC_SMPTE170M:
+       case AVCOL_SPC_SMPTE240M:
+               video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion);
+               break;
+       case AVCOL_SPC_BT2020_CL:
+       case AVCOL_SPC_BT2020_NCL:
+               video->set_colour_conversion (PresetColourConversion::from_id ("rec2020").conversion);
+               break;
+       default:
+               if (s.width < 1080) {
+                       video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion);
+               } else {
+                       video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion);
+               }
+               break;
        }
 }
 
@@ -373,118 +482,141 @@ void
 FFmpegContent::add_properties (list<UserProperty>& p) const
 {
        Content::add_properties (p);
-       video->add_properties (p);
-       audio->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());
-
-               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 (UserProperty (_("Video"), _("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 (
-                               UserProperty (
-                                       _("Video"), _("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 (UserProperty (_("Video"), _("Colour range"), String::compose (_("Full (0-%1)"), total)));
-                       break;
-               default:
-                       DCPOMATIC_ASSERT (false);
+       if (video) {
+               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());
+
+                       switch (_color_range.get_value_or(AVCOL_RANGE_UNSPECIFIED)) {
+                       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 (UserProperty (UserProperty::VIDEO, _("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 (
+                                       UserProperty (
+                                               UserProperty::VIDEO, _("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 (UserProperty (UserProperty::VIDEO, _("Colour range"), String::compose (_("Full (0-%1)"), total)));
+                               break;
+                       default:
+                               DCPOMATIC_ASSERT (false);
+                       }
+               } else {
+                       switch (_color_range.get_value_or(AVCOL_RANGE_UNSPECIFIED)) {
+                       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 (UserProperty (UserProperty::VIDEO, _("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 (UserProperty (UserProperty::VIDEO, _("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 (UserProperty (UserProperty::VIDEO, _("Colour range"), _("Full")));
+                               break;
+                       default:
+                               DCPOMATIC_ASSERT (false);
+                       }
                }
-       } 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 (UserProperty (_("Video"), _("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 (UserProperty (_("Video"), _("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 (UserProperty (_("Video"), _("Colour range"), _("Full")));
-                       break;
-               default:
-                       DCPOMATIC_ASSERT (false);
+
+               char const * primaries[] = {
+                       _("Unspecified"),
+                       _("BT709"),
+                       _("Unspecified"),
+                       _("Unspecified"),
+                       _("BT470M"),
+                       _("BT470BG"),
+                       _("SMPTE 170M (BT601)"),
+                       _("SMPTE 240M"),
+                       _("Film"),
+                       _("BT2020"),
+                       _("SMPTE ST 428-1 (CIE 1931 XYZ)"),
+                       _("SMPTE ST 431-2 (2011)"),
+                       _("SMPTE ST 432-1 D65 (2010)"), // 12
+                       "", // 13
+                       "", // 14
+                       "", // 15
+                       "", // 16
+                       "", // 17
+                       "", // 18
+                       "", // 19
+                       "", // 20
+                       "", // 21
+                       _("JEDEC P22")
+               };
+
+               DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 23);
+               p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries.get_value_or(AVCOL_PRI_UNSPECIFIED)]));
+
+               char const * transfers[] = {
+                       _("Unspecified"),
+                       _("BT709"),
+                       _("Unspecified"),
+                       _("Unspecified"),
+                       _("Gamma 22 (BT470M)"),
+                       _("Gamma 28 (BT470BG)"),
+                       _("SMPTE 170M (BT601)"),
+                       _("SMPTE 240M"),
+                       _("Linear"),
+                       _("Logarithmic (100:1 range)"),
+                       _("Logarithmic (316:1 range)"),
+                       _("IEC61966-2-4"),
+                       _("BT1361 extended colour gamut"),
+                       _("IEC61966-2-1 (sRGB or sYCC)"),
+                       _("BT2020 for a 10-bit system"),
+                       _("BT2020 for a 12-bit system"),
+                       _("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
+                       _("SMPTE ST 428-1"),
+                       _("ARIB STD-B67 ('Hybrid log-gamma')")
+               };
+
+               DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19);
+               p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc.get_value_or(AVCOL_TRC_UNSPECIFIED)]));
+
+               char const * spaces[] = {
+                       _("RGB / sRGB (IEC61966-2-1)"),
+                       _("BT709"),
+                       _("Unspecified"),
+                       _("Unspecified"),
+                       _("FCC"),
+                       _("BT470BG (BT601-6)"),
+                       _("SMPTE 170M (BT601-6)"),
+                       _("SMPTE 240M"),
+                       _("YCOCG"),
+                       _("BT2020 non-constant luminance"),
+                       _("BT2020 constant luminance"),
+                       _("SMPTE 2085, Y'D'zD'x"),
+                       _("Chroma-derived non-constant luminance"),
+                       _("Chroma-derived constant luminance"),
+                       _("BT2100")
+               };
+
+               DCPOMATIC_ASSERT (AVCOL_SPC_NB == 15);
+               p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace.get_value_or(AVCOL_SPC_UNSPECIFIED)]));
+
+               if (_bits_per_pixel) {
+                       p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), *_bits_per_pixel));
                }
        }
 
-       char const * primaries[] = {
-               _("Unspecified"),
-               _("BT709"),
-               _("Unspecified"),
-               _("Unspecified"),
-               _("BT470M"),
-               _("BT470BG"),
-               _("SMPTE 170M (BT601)"),
-               _("SMPTE 240M"),
-               _("Film"),
-               _("BT2020"),
-               _("SMPTE ST 428-1 (CIE 1931 XYZ)")
-       };
-
-       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
-       p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
-
-       char const * transfers[] = {
-               _("Unspecified"),
-               _("BT709"),
-               _("Unspecified"),
-               _("Unspecified"),
-               _("Gamma 22 (BT470M)"),
-               _("Gamma 28 (BT470BG)"),
-               _("SMPTE 170M (BT601)"),
-               _("SMPTE 240M"),
-               _("Linear"),
-               _("Logarithmic (100:1 range)"),
-               _("Logarithmic (316:1 range)"),
-               _("IEC61966-2-4"),
-               _("BT1361 extended colour gamut"),
-               _("IEC61966-2-1 (sRGB or sYCC)"),
-               _("BT2020 for a 10-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 == 18);
-       p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
-
-       char const * spaces[] = {
-               _("RGB / sRGB (IEC61966-2-1)"),
-               _("BT709"),
-               _("Unspecified"),
-               _("Unspecified"),
-               _("FCC"),
-               _("BT470BG (BT601-6)"),
-               _("SMPTE 170M (BT601-6)"),
-               _("SMPTE 240M"),
-               _("YCOCG"),
-               _("BT2020 non-constant luminance"),
-               _("BT2020 constant luminance"),
-       };
-
-       DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
-       p.push_back (UserProperty (_("Video"), _("Colourspace"), spaces[_colorspace]));
-
-       if (_bits_per_pixel) {
-               p.push_back (UserProperty (_("Video"), _("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
+       if (audio) {
+               audio->add_properties (p);
        }
 }
 
@@ -503,8 +635,24 @@ vector<shared_ptr<FFmpegAudioStream> >
 FFmpegContent::ffmpeg_audio_streams () const
 {
        vector<shared_ptr<FFmpegAudioStream> > fa;
-       BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
-               fa.push_back (dynamic_pointer_cast<FFmpegAudioStream> (i));
+
+       if (audio) {
+               BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+                       fa.push_back (dynamic_pointer_cast<FFmpegAudioStream> (i));
+               }
        }
+
        return fa;
 }
+
+void
+FFmpegContent::take_settings_from (shared_ptr<const Content> c)
+{
+       shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (c);
+       if (!fc) {
+               return;
+               }
+
+       Content::take_settings_from (c);
+       _filters = fc->_filters;
+}