projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove details video properties from non-video content XML.
[dcpomatic.git] / src / lib / ffmpeg_content.cc
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 44e1b2afb22363499a8b5d9c0b772ade907c1931..2233f5f8ca24969c5949c58bda0283c1a9468c10 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -69,6 +69,17 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::pa
 
 }
 
+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)
 {
@@ -109,12 +120,10 @@ 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");
 
 }
@@ -222,12 +231,20 @@ FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) 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> (static_cast<int> (_color_range)));
-       node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (static_cast<int> (_color_primaries)));
-       node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (static_cast<int> (_color_trc)));
-       node->add_child("Colorspace")->add_child_text (raw_convert<string> (static_cast<int> (_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));
        }
 }
 
@@ -243,7 +260,6 @@ FFmpegContent::examine (shared_ptr<Job> job)
        if (examiner->has_video ()) {
                video.reset (new VideoContent (this));
                video->take_from_examiner (examiner);
-               set_default_colour_conversion ();
        }
 
        boost::filesystem::path first_path = path (0);
@@ -281,6 +297,10 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
        }
 
+       if (examiner->has_video ()) {
+               set_default_colour_conversion ();
+       }
+
        signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
        signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 }
@@ -394,7 +414,7 @@ FFmpegContent::identifier () const
                s += "_" + video->identifier();
        }
 
-       if (subtitle) {
+       if (subtitle && subtitle->use() && subtitle->burn()) {
                s += "_" + subtitle->identifier();
        }
 
@@ -420,10 +440,29 @@ FFmpegContent::set_default_colour_conversion ()
 
        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;
        }
 }
 
@@ -439,7 +478,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                        int const sub = 219 * pow (2, _bits_per_pixel.get() - 8);
                        int const total = pow (2, _bits_per_pixel.get());
 
-                       switch (_color_range) {
+                       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).
@@ -463,7 +502,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                                DCPOMATIC_ASSERT (false);
                        }
                } else {
-                       switch (_color_range) {
+                       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).
@@ -497,11 +536,21 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                        _("BT2020"),
                        _("SMPTE ST 428-1 (CIE 1931 XYZ)"),
                        _("SMPTE ST 431-2 (2011)"),
-                       _("SMPTE ST 432-1 D65 (2010)")
+                       _("SMPTE ST 432-1 D65 (2010)"), // 12
+                       "", // 13
+                       "", // 14
+                       "", // 15
+                       "", // 16
+                       "", // 17
+                       "", // 18
+                       "", // 19
+                       "", // 20
+                       "", // 21
+                       _("JEDEC P22")
                };
 
-               DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 13);
-               p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries]));
+               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"),
@@ -526,7 +575,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                };
 
                DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19);
-               p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
+               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)"),
@@ -541,13 +590,16 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                        _("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 == 12);
-               p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace]));
+               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.get ()));
+                       p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), *_bits_per_pixel));
                }
        }
 
@@ -582,10 +634,13 @@ FFmpegContent::ffmpeg_audio_streams () const
 }
 
 void
-FFmpegContent::use_template (shared_ptr<const Content> c)
+FFmpegContent::take_settings_from (shared_ptr<const Content> c)
 {
-       Content::use_template (c);
-
        shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (c);
+       if (!fc) {
+               return;
+               }
+
+       Content::take_settings_from (c);
        _filters = fc->_filters;
 }
Development branch of dcpomatic