/*
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/>.
*/
using std::cout;
using std::pair;
using std::make_pair;
+using std::max;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
: Content (film, node)
{
video = VideoContent::from_xml (this, node, version);
- audio = AudioContent::from_xml (this, node);
+ audio = AudioContent::from_xml (this, node, version);
subtitle = SubtitleContent::from_xml (this, node, version);
list<cxml::NodePtr> c = node->node_children ("SubtitleStream");
FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > 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));
set_default_colour_conversion ();
}
+ boost::filesystem::path first_path = path (0);
+
{
boost::mutex::scoped_lock lm (_mutex);
AudioStreamPtr as = audio->streams().front();
AudioMapping m = as->mapping ();
- film()->make_audio_mapping_default (m);
+ film()->make_audio_mapping_default (m, first_path);
as->set_mapping (m);
}
}
DCPOMATIC_ASSERT (audio);
- return DCPTime::from_frames (llrint (audio->stream()->length() / frc.speed_up), audio->stream()->frame_rate());
+
+ DCPTime longest;
+ BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+ longest = max (longest, DCPTime::from_frames (llrint (i->length() / frc.speed_up), i->frame_rate()));
+ }
+
+ return longest;
}
void
void
FFmpegContent::set_default_colour_conversion ()
{
+ DCPOMATIC_ASSERT (video);
+
dcp::Size const s = video->size ();
boost::mutex::scoped_lock lm (_mutex);
FFmpegContent::add_properties (list<UserProperty>& p) const
{
Content::add_properties (p);
- video->add_properties (p);
- audio->add_properties (p);
- if (_bits_per_pixel) {
- int const sub = 219 * pow (2, _bits_per_pixel.get() - 8);
- int const total = pow (2, _bits_per_pixel.get());
-
- switch (_color_range) {
- case AVCOL_RANGE_UNSPECIFIED:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is unknown (not specified in the file).
- p.push_back (UserProperty (_("Video"), _("Colour range"), _("Unspecified")));
- break;
- case AVCOL_RANGE_MPEG:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is limited, so that not all possible values are valid.
- p.push_back (
- UserProperty (
- _("Video"), _("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)
- )
- );
- break;
- case AVCOL_RANGE_JPEG:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is full, so that all possible pixel values are valid.
- p.push_back (UserProperty (_("Video"), _("Colour range"), String::compose (_("Full (0-%1)"), total)));
- break;
- default:
- DCPOMATIC_ASSERT (false);
+ if (video) {
+ video->add_properties (p);
+
+ if (_bits_per_pixel) {
+ int const sub = 219 * pow (2, _bits_per_pixel.get() - 8);
+ int const total = pow (2, _bits_per_pixel.get());
+
+ switch (_color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is unknown (not specified in the file).
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour range"), _("Unspecified")));
+ break;
+ case AVCOL_RANGE_MPEG:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is limited, so that not all possible values are valid.
+ p.push_back (
+ UserProperty (
+ UserProperty::VIDEO, _("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)
+ )
+ );
+ break;
+ case AVCOL_RANGE_JPEG:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is full, so that all possible pixel values are valid.
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour range"), String::compose (_("Full (0-%1)"), total)));
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
+ } else {
+ switch (_color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is unknown (not specified in the file).
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour range"), _("Unspecified")));
+ break;
+ case AVCOL_RANGE_MPEG:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is limited, so that not all possible values are valid.
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour range"), _("Limited")));
+ break;
+ case AVCOL_RANGE_JPEG:
+ /// TRANSLATORS: this means that the range of pixel values used in this
+ /// file is full, so that all possible pixel values are valid.
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour range"), _("Full")));
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
}
- } else {
- switch (_color_range) {
- case AVCOL_RANGE_UNSPECIFIED:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is unknown (not specified in the file).
- p.push_back (UserProperty (_("Video"), _("Colour range"), _("Unspecified")));
- break;
- case AVCOL_RANGE_MPEG:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is limited, so that not all possible values are valid.
- p.push_back (UserProperty (_("Video"), _("Colour range"), _("Limited")));
- break;
- case AVCOL_RANGE_JPEG:
- /// TRANSLATORS: this means that the range of pixel values used in this
- /// file is full, so that all possible pixel values are valid.
- p.push_back (UserProperty (_("Video"), _("Colour range"), _("Full")));
- break;
- default:
- DCPOMATIC_ASSERT (false);
+
+ char const * primaries[] = {
+ _("Unspecified"),
+ _("BT709"),
+ _("Unspecified"),
+ _("Unspecified"),
+ _("BT470M"),
+ _("BT470BG"),
+ _("SMPTE 170M (BT601)"),
+ _("SMPTE 240M"),
+ _("Film"),
+ _("BT2020"),
+ _("SMPTE ST 428-1 (CIE 1931 XYZ)")
+ };
+
+ DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries]));
+
+ char const * transfers[] = {
+ _("Unspecified"),
+ _("BT709"),
+ _("Unspecified"),
+ _("Unspecified"),
+ _("Gamma 22 (BT470M)"),
+ _("Gamma 28 (BT470BG)"),
+ _("SMPTE 170M (BT601)"),
+ _("SMPTE 240M"),
+ _("Linear"),
+ _("Logarithmic (100:1 range)"),
+ _("Logarithmic (316:1 range)"),
+ _("IEC61966-2-4"),
+ _("BT1361 extended colour gamut"),
+ _("IEC61966-2-1 (sRGB or sYCC)"),
+ _("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")
+ };
+
+ DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
+
+ char const * spaces[] = {
+ _("RGB / sRGB (IEC61966-2-1)"),
+ _("BT709"),
+ _("Unspecified"),
+ _("Unspecified"),
+ _("FCC"),
+ _("BT470BG (BT601-6)"),
+ _("SMPTE 170M (BT601-6)"),
+ _("SMPTE 240M"),
+ _("YCOCG"),
+ _("BT2020 non-constant luminance"),
+ _("BT2020 constant luminance"),
+ };
+
+ DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace]));
+
+ if (_bits_per_pixel) {
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
}
}
- char const * primaries[] = {
- _("Unspecified"),
- _("BT709"),
- _("Unspecified"),
- _("Unspecified"),
- _("BT470M"),
- _("BT470BG"),
- _("SMPTE 170M (BT601)"),
- _("SMPTE 240M"),
- _("Film"),
- _("BT2020"),
- _("SMPTE ST 428-1 (CIE 1931 XYZ)")
- };
-
- DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
- p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
-
- char const * transfers[] = {
- _("Unspecified"),
- _("BT709"),
- _("Unspecified"),
- _("Unspecified"),
- _("Gamma 22 (BT470M)"),
- _("Gamma 28 (BT470BG)"),
- _("SMPTE 170M (BT601)"),
- _("SMPTE 240M"),
- _("Linear"),
- _("Logarithmic (100:1 range)"),
- _("Logarithmic (316:1 range)"),
- _("IEC61966-2-4"),
- _("BT1361 extended colour gamut"),
- _("IEC61966-2-1 (sRGB or sYCC)"),
- _("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")
- };
-
- DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
- p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
-
- char const * spaces[] = {
- _("RGB / sRGB (IEC61966-2-1)"),
- _("BT709"),
- _("Unspecified"),
- _("Unspecified"),
- _("FCC"),
- _("BT470BG (BT601-6)"),
- _("SMPTE 170M (BT601-6)"),
- _("SMPTE 240M"),
- _("YCOCG"),
- _("BT2020 non-constant luminance"),
- _("BT2020 constant luminance"),
- };
-
- DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
- p.push_back (UserProperty (_("Video"), _("Colourspace"), spaces[_colorspace]));
-
- if (_bits_per_pixel) {
- p.push_back (UserProperty (_("Video"), _("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
+ if (audio) {
+ audio->add_properties (p);
}
}
projects / dcpomatic.git / blobdiff