/*
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/>.
*/
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);
+ subtitle = SubtitleContent::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) {
FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::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));
+ video.reset (new VideoContent (this, c));
+ audio.reset (new AudioContent (this, c));
+ subtitle.reset (new SubtitleContent (this, c));
shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
DCPOMATIC_ASSERT (ref);
shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
if (examiner->has_video ()) {
- video.reset (new VideoContent (this, film ()));
+ video.reset (new VideoContent (this));
video->take_from_examiner (examiner);
set_default_colour_conversion ();
}
}
if (!examiner->audio_streams().empty ()) {
- audio.reset (new AudioContent (this, film ()));
+ audio.reset (new AudioContent (this));
BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
audio->add_stream (i);
_subtitle_streams = examiner->subtitle_streams ();
if (!_subtitle_streams.empty ()) {
- subtitle.reset (new SubtitleContent (this, film ()));
+ subtitle.reset (new SubtitleContent (this));
_subtitle_stream = _subtitle_streams.front ();
}
_("SMPTE ST 428-1 (CIE 1931 XYZ)")
};
- DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
+ DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
char const * transfers[] = {
_("SMPTE ST 428-1")
};
- DCPOMATIC_ASSERT (AVCOL_TRC_NB == 18);
+ DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
char const * spaces[] = {