X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=77c7c9ecd9e88ea9fd9cfbdec88eb4e4649d0cf8;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=b34fdf6aa811bd48fbfecf8a69b25c80ae51eafa;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index b34fdf6aa..77c7c9ecd 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -32,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 #include extern "C" { #include @@ -58,6 +57,7 @@ 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; @@ -119,22 +119,50 @@ FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr no } -FFmpegContent::FFmpegContent (shared_ptr film, vector > c) +FFmpegContent::FFmpegContent (shared_ptr film, vector > c) : Content (film, c) { - /* XXX: this should look at c to decide which of video/audio/subtitle - get created. - */ - video.reset (new VideoContent (this, c)); - audio.reset (new AudioContent (this, c)); - subtitle.reset (new SubtitleContent (this, c)); + vector >::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 ((*i)->video); + need_audio = static_cast ((*i)->audio); + need_subtitle = static_cast ((*i)->subtitle); + } + + while (i != c.end ()) { + if (need_video != static_cast ((*i)->video)) { + throw JoinError (_("Content to be joined must all have or not have video")); + } + if (need_audio != static_cast ((*i)->audio)) { + throw JoinError (_("Content to be joined must all have or not have audio")); + } + if (need_subtitle != static_cast ((*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 ref = dynamic_pointer_cast (c[0]); DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr fc = dynamic_pointer_cast (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.")); } } @@ -153,10 +181,10 @@ FFmpegContent::FFmpegContent (shared_ptr film, vectoradd_child("Type")->add_child_text ("FFmpeg"); - Content::as_xml (node); + Content::as_xml (node, with_paths); if (video) { video->as_xml (node); @@ -194,10 +222,10 @@ FFmpegContent::as_xml (xmlpp::Node* node) const node->add_child("FirstVideo")->add_child_text (raw_convert (_first_video.get().get())); } - node->add_child("ColorRange")->add_child_text (raw_convert (_color_range)); - node->add_child("ColorPrimaries")->add_child_text (raw_convert (_color_primaries)); - node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert (_color_trc)); - node->add_child("Colorspace")->add_child_text (raw_convert (_colorspace)); + node->add_child("ColorRange")->add_child_text (raw_convert (static_cast (_color_range))); + node->add_child("ColorPrimaries")->add_child_text (raw_convert (static_cast (_color_primaries))); + node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert (static_cast (_color_trc))); + node->add_child("Colorspace")->add_child_text (raw_convert (static_cast (_colorspace))); if (_bits_per_pixel) { node->add_child("BitsPerPixel")->add_child_text (raw_convert (_bits_per_pixel.get ())); } @@ -360,29 +388,27 @@ FFmpegContent::set_filters (vector const & filters) string FFmpegContent::identifier () const { - SafeStringStream s; - - s << Content::identifier(); + string s = Content::identifier(); if (video) { - s << "_" << video->identifier(); + s += "_" + video->identifier(); } if (subtitle) { - s << "_" << subtitle->identifier(); + s += "_" + subtitle->identifier(); } boost::mutex::scoped_lock lm (_mutex); if (_subtitle_stream) { - s << "_" << _subtitle_stream->identifier (); + s += "_" + _subtitle_stream->identifier (); } for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { - s << "_" << (*i)->id (); + s += "_" + (*i)->id (); } - return s.str (); + return s; } list @@ -515,10 +541,11 @@ FFmpegContent::add_properties (list& p) const _("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") + _("SMPTE ST 428-1"), + _("ARIB STD-B67 ('Hybrid log-gamma')") }; - DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18); + DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19); p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc])); char const * spaces[] = { @@ -539,7 +566,7 @@ FFmpegContent::add_properties (list& p) const p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace])); if (_bits_per_pixel) { - p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), raw_convert (_bits_per_pixel.get ()))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), _bits_per_pixel.get ())); } } @@ -572,3 +599,12 @@ FFmpegContent::ffmpeg_audio_streams () const return fa; } + +void +FFmpegContent::use_template (shared_ptr c) +{ + Content::use_template (c); + + shared_ptr fc = dynamic_pointer_cast (c); + _filters = fc->_filters; +}