#include "log.h"
#include "exceptions.h"
#include "frame_rate_change.h"
-#include "subtitle_content.h"
+#include "caption_content.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
extern "C" {
}
+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, node, version);
audio = AudioContent::from_xml (this, node, version);
- subtitle = SubtitleContent::from_xml (this, node, version);
+ caption = CaptionContent::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) {
_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<shared_ptr<Content> > c)
- : Content (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 SubtitleContent (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 && fc->subtitle->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
- throw JoinError (_("Content to be joined must use the same subtitle stream."));
- }
- }
-
- /* 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 ();
- _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
FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
}
}
- if (subtitle) {
- subtitle->as_xml (node);
+ if (only_caption()) {
+ only_caption()->as_xml (node);
}
boost::mutex::scoped_lock lm (_mutex);
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));
}
}
_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"));
+ }
+ }
}
if (!examiner->audio_streams().empty ()) {
_subtitle_streams = examiner->subtitle_streams ();
if (!_subtitle_streams.empty ()) {
- subtitle.reset (new SubtitleContent (this));
+ caption.clear ();
+ caption.push_back (shared_ptr<CaptionContent> (new CaptionContent (this)));
_subtitle_stream = _subtitle_streams.front ();
}
s += "_" + video->identifier();
}
- if (subtitle && subtitle->use() && subtitle->burn()) {
- s += "_" + subtitle->identifier();
+ if (only_caption() && only_caption()->use() && only_caption()->burn()) {
+ s += "_" + only_caption()->identifier();
}
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- switch (_colorspace) {
+ switch (_colorspace.get_value_or(AVCOL_SPC_UNSPECIFIED)) {
case AVCOL_SPC_RGB:
video->set_colour_conversion (PresetColourConversion::from_id ("srgb").conversion);
break;
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).
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).
_("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"),
};
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)"),
_("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));
}
}
projects / dcpomatic.git / blobdiff