/*
- Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
You should have received a copy of the GNU General Public License
along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
*/
#include "ffmpeg_content.h"
#include "exceptions.h"
#include "frame_rate_change.h"
#include "text_content.h"
-#include "decrypted_ecinema_kdm.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixdesc.h>
}
#include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
#include <iostream>
#include "i18n.h"
+
using std::string;
using std::vector;
using std::list;
using std::pair;
using std::make_pair;
using std::max;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
using dcp::raw_convert;
using namespace dcpomatic;
+
int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
int const FFmpegContentProperty::FILTERS = 102;
int const FFmpegContentProperty::KDM = 103;
+
FFmpegContent::FFmpegContent (boost::filesystem::path p)
: Content (p)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- , _encrypted (false)
-#endif
{
}
+
template <class T>
optional<T>
get_optional_enum (cxml::ConstNodePtr node, string name)
{
- optional<int> const v = node->optional_number_child<int>(name);
+ auto const v = node->optional_number_child<int>(name);
if (!v) {
return optional<T>();
}
return static_cast<T>(*v);
}
+
FFmpegContent::FFmpegContent (cxml::ConstNodePtr node, int version, list<string>& notes)
: Content (node)
{
audio = AudioContent::from_xml (this, node, version);
text = 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) {
- _subtitle_streams.push_back (shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (*i, version)));
- if ((*i)->optional_number_child<int> ("Selected")) {
+ for (auto i: node->node_children("SubtitleStream")) {
+ _subtitle_streams.push_back (make_shared<FFmpegSubtitleStream>(i, version));
+ if (i->optional_number_child<int>("Selected")) {
_subtitle_stream = _subtitle_streams.back ();
}
}
- c = node->node_children ("AudioStream");
- for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) {
- shared_ptr<FFmpegAudioStream> as (new FFmpegAudioStream (*i, version));
+ for (auto i: node->node_children("AudioStream")) {
+ auto as = make_shared<FFmpegAudioStream>(i, version);
audio->add_stream (as);
- if (version < 11 && !(*i)->optional_node_child ("Selected")) {
+ if (version < 11 && !i->optional_node_child ("Selected")) {
/* This is an old file and this stream is not selected, so un-map it */
as->set_mapping (AudioMapping (as->channels (), MAX_DCP_AUDIO_CHANNELS));
}
}
- c = node->node_children ("Filter");
- for (list<cxml::NodePtr>::iterator i = c.begin(); i != c.end(); ++i) {
- Filter const * f = Filter::from_id ((*i)->content ());
+ for (auto i: node->node_children("Filter")) {
+ Filter const * f = Filter::from_id(i->content());
if (f) {
_filters.push_back (f);
} else {
- notes.push_back (String::compose (_("DCP-o-matic no longer supports the `%1' filter, so it has been turned off."), (*i)->content()));
+ notes.push_back (String::compose (_("DCP-o-matic no longer supports the `%1' filter, so it has been turned off."), i->content()));
}
}
- optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstVideo");
+ auto const f = node->optional_number_child<ContentTime::Type> ("FirstVideo");
if (f) {
_first_video = ContentTime (f.get ());
}
_color_trc = get_optional_enum<AVColorTransferCharacteristic>(node, "ColorTransferCharacteristic");
_colorspace = get_optional_enum<AVColorSpace>(node, "Colorspace");
_bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _encrypted = node->optional_bool_child("Encrypted").get_value_or(false);
-#endif
}
-FFmpegContent::FFmpegContent (vector<shared_ptr<Content> > c)
+
+FFmpegContent::FFmpegContent (vector<shared_ptr<Content>> c)
: Content (c)
{
- vector<shared_ptr<Content> >::const_iterator i = c.begin ();
+ auto i = c.begin ();
bool need_video = false;
bool need_audio = false;
}
if (need_video) {
- video.reset (new VideoContent (this, c));
+ video = make_shared<VideoContent>(this, c);
}
if (need_audio) {
- audio.reset (new AudioContent (this, c));
+ audio = make_shared<AudioContent>(this, c);
}
if (need_text) {
- text.push_back (shared_ptr<TextContent> (new TextContent (this, c)));
+ text.push_back (make_shared<TextContent>(this, c));
}
- shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
+ auto 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]);
+ auto fc = dynamic_pointer_cast<FFmpegContent>(c[i]);
if (fc->only_text() && fc->only_text()->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
throw JoinError (_("Content to be joined must use the same subtitle stream."));
}
_color_trc = ref->_color_trc;
_colorspace = ref->_colorspace;
_bits_per_pixel = ref->_bits_per_pixel;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _encrypted = ref->_encrypted;
-#endif
}
+
void
FFmpegContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
- node->add_child("Type")->add_child_text ("FFmpeg");
+ node->add_child("Type")->add_child_text("FFmpeg");
Content::as_xml (node, with_paths);
if (video) {
if (audio) {
audio->as_xml (node);
- BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
- shared_ptr<FFmpegAudioStream> f = dynamic_pointer_cast<FFmpegAudioStream> (i);
+ for (auto i: audio->streams()) {
+ auto f = dynamic_pointer_cast<FFmpegAudioStream> (i);
DCPOMATIC_ASSERT (f);
f->as_xml (node->add_child("AudioStream"));
}
boost::mutex::scoped_lock lm (_mutex);
- for (vector<shared_ptr<FFmpegSubtitleStream> >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) {
- xmlpp::Node* t = node->add_child("SubtitleStream");
- if (_subtitle_stream && *i == _subtitle_stream) {
+ for (auto i: _subtitle_streams) {
+ auto t = node->add_child("SubtitleStream");
+ if (_subtitle_stream && i == _subtitle_stream) {
t->add_child("Selected")->add_child_text("1");
}
- (*i)->as_xml (t);
+ i->as_xml (t);
}
- for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- node->add_child("Filter")->add_child_text ((*i)->id ());
+ for (auto i: _filters) {
+ node->add_child("Filter")->add_child_text(i->id());
}
if (_first_video) {
- node->add_child("FirstVideo")->add_child_text (raw_convert<string> (_first_video.get().get()));
+ node->add_child("FirstVideo")->add_child_text(raw_convert<string>(_first_video.get().get()));
}
if (_color_range) {
- node->add_child("ColorRange")->add_child_text (raw_convert<string> (static_cast<int> (*_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)));
+ 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)));
+ 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)));
+ 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));
+ node->add_child("BitsPerPixel")->add_child_text(raw_convert<string>(*_bits_per_pixel));
}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- if (_encrypted) {
- node->add_child("Encypted")->add_child_text ("1");
- }
-#endif
}
+
void
FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
- ChangeSignaller<Content> cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
- ChangeSignaller<Content> cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc1 (this, FFmpegContentProperty::SUBTITLE_STREAMS);
+ ContentChangeSignaller cc2 (this, FFmpegContentProperty::SUBTITLE_STREAM);
if (job) {
job->set_progress_unknown ();
Content::examine (film, job);
- shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
+ auto examiner = make_shared<FFmpegExaminer>(shared_from_this (), job);
if (examiner->has_video ()) {
video.reset (new VideoContent (this));
video->take_from_examiner (examiner);
}
- boost::filesystem::path first_path = path (0);
+ auto first_path = path (0);
{
boost::mutex::scoped_lock lm (_mutex);
_bits_per_pixel = examiner->bits_per_pixel ();
if (examiner->rotation()) {
- double rot = *examiner->rotation ();
+ auto rot = *examiner->rotation ();
if (fabs (rot - 180) < 1.0) {
_filters.push_back (Filter::from_id ("vflip"));
_filters.push_back (Filter::from_id ("hflip"));
}
}
- if (!examiner->audio_streams().empty ()) {
- audio.reset (new AudioContent (this));
+ if (!examiner->audio_streams().empty()) {
+ audio = make_shared<AudioContent>(this);
- BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
+ for (auto i: examiner->audio_streams()) {
audio->add_stream (i);
}
- AudioStreamPtr as = audio->streams().front();
- AudioMapping m = as->mapping ();
+ auto as = audio->streams().front();
+ auto m = as->mapping ();
m.make_default (film ? film->audio_processor() : 0, first_path);
as->set_mapping (m);
}
_subtitle_streams = examiner->subtitle_streams ();
if (!_subtitle_streams.empty ()) {
text.clear ();
- text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN)));
+ text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::UNKNOWN));
_subtitle_stream = _subtitle_streams.front ();
}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _encrypted = first_path.extension() == ".ecinema";
-#endif
}
if (examiner->has_video ()) {
set_video_frame_rate (24000.0 / 1001);
video->set_length (video->length() * 24.0 / 30);
}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- _id = examiner->id ();
-#endif
}
+
string
FFmpegContent::summary () const
{
if (video && audio) {
- return String::compose (_("%1 [movie]"), path_summary ());
+ return String::compose (_("%1 [movie]"), path_summary());
} else if (video) {
- return String::compose (_("%1 [video]"), path_summary ());
+ return String::compose (_("%1 [video]"), path_summary());
} else if (audio) {
- return String::compose (_("%1 [audio]"), path_summary ());
+ return String::compose (_("%1 [audio]"), path_summary());
}
return path_summary ();
}
+
string
FFmpegContent::technical_summary () const
{
string as = "";
- BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, ffmpeg_audio_streams ()) {
+ for (auto i: ffmpeg_audio_streams ()) {
as += i->technical_summary () + " " ;
}
ss = _subtitle_stream->technical_summary ();
}
- string filt = Filter::ffmpeg_string (_filters);
+ auto filt = Filter::ffmpeg_string (_filters);
- string s = Content::technical_summary ();
+ auto s = Content::technical_summary ();
if (video) {
s += " - " + video->technical_summary ();
);
}
+
void
FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
{
- ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
{
boost::mutex::scoped_lock lm (_mutex);
}
}
+
bool
operator== (FFmpegStream const & a, FFmpegStream const & b)
{
return a._id == b._id;
}
+
bool
operator!= (FFmpegStream const & a, FFmpegStream const & b)
{
return a._id != b._id;
}
+
DCPTime
FFmpegContent::full_length (shared_ptr<const Film> film) const
{
if (audio) {
DCPTime longest;
- BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
+ for (auto i: audio->streams()) {
longest = max (longest, DCPTime::from_frames(llrint(i->length() / frc.speed_up), i->frame_rate()));
}
return longest;
/* XXX: subtitle content? */
- return DCPTime();
+ return {};
}
+
DCPTime
FFmpegContent::approximate_length () const
{
DCPOMATIC_ASSERT (audio);
Frame longest = 0;
- BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+ for (auto i: audio->streams()) {
longest = max (longest, Frame(llrint(i->length())));
}
return DCPTime::from_frames (longest, 24);
}
+
void
FFmpegContent::set_filters (vector<Filter const *> const & filters)
{
- ChangeSignaller<Content> cc (this, FFmpegContentProperty::FILTERS);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::FILTERS);
{
boost::mutex::scoped_lock lm (_mutex);
}
}
+
string
FFmpegContent::identifier () const
{
s += "_" + _subtitle_stream->identifier ();
}
- for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
- s += "_" + (*i)->id ();
+ for (auto i: _filters) {
+ s += "_" + i->id();
}
return s;
}
+
void
FFmpegContent::set_default_colour_conversion ()
{
DCPOMATIC_ASSERT (video);
- dcp::Size const s = video->size ();
+ auto const s = video->size ();
boost::mutex::scoped_lock lm (_mutex);
}
}
+
void
FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
}
}
+
/** 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
FFmpegContent::signal_subtitle_stream_changed ()
{
/* XXX: this is too late; really it should be before the change */
- ChangeSignaller<Content> cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
+ ContentChangeSignaller cc (this, FFmpegContentProperty::SUBTITLE_STREAM);
}
-vector<shared_ptr<FFmpegAudioStream> >
+
+vector<shared_ptr<FFmpegAudioStream>>
FFmpegContent::ffmpeg_audio_streams () const
{
- vector<shared_ptr<FFmpegAudioStream> > fa;
+ vector<shared_ptr<FFmpegAudioStream>> fa;
if (audio) {
- BOOST_FOREACH (AudioStreamPtr i, audio->streams()) {
- fa.push_back (dynamic_pointer_cast<FFmpegAudioStream> (i));
+ for (auto 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);
+ auto fc = dynamic_pointer_cast<const FFmpegContent> (c);
if (!fc) {
return;
}
_filters = fc->_filters;
}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-FFmpegContent::add_kdm (EncryptedECinemaKDM kdm)
-{
- ChangeSignaller<Content> cc (this, FFmpegContentProperty::KDM);
- boost::mutex::scoped_lock lm (_mutex);
- _kdm = kdm;
-
-}
-
-bool
-FFmpegContent::kdm_timing_window_valid () const
-{
- if (!_kdm) {
- return true;
- }
-
- DCPOMATIC_ASSERT (Config::instance()->decryption_chain()->key());
-
- DecryptedECinemaKDM decrypted (*_kdm, *Config::instance()->decryption_chain()->key());
-
- dcp::LocalTime now;
- return (!decrypted.not_valid_before() || *decrypted.not_valid_before() < now) &&
- (!decrypted.not_valid_after() || now < *decrypted.not_valid_after());
-}
-
-#endif
projects / dcpomatic.git / blobdiff