X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=7a1585ca21ba1bad370c525661c487f5b5966583;hb=4f82cf8273f92719465ff3faec50c8e3a84561b3;hp=ba799be72f0aad6f84c852481da897a7c1104a76;hpb=22873931f874a87fcf6a0077eddbec0f97eb3423;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index ba799be72..7a1585ca2 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,8 @@ */ #include "ffmpeg_content.h" +#include "video_content.h" +#include "audio_content.h" #include "ffmpeg_examiner.h" #include "ffmpeg_subtitle_stream.h" #include "ffmpeg_audio_stream.h" @@ -31,6 +33,7 @@ #include "frame_rate_change.h" #include "safe_stringstream.h" #include "raw_convert.h" +#include "subtitle_content.h" #include extern "C" { #include @@ -60,19 +63,17 @@ int const FFmpegContentProperty::FILTERS = 102; FFmpegContent::FFmpegContent (shared_ptr film, boost::filesystem::path p) : Content (film, p) - , VideoContent (film, p) - , AudioContent (film, p) - , SubtitleContent (film, p) { } FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr node, int version, list& notes) : Content (film, node) - , VideoContent (film, node, version) - , AudioContent (film, node) - , SubtitleContent (film, node, version) { + video = VideoContent::from_xml (this, node, version); + audio = AudioContent::from_xml (this, node); + subtitle = SubtitleContent::from_xml (this, node, version); + list c = node->node_children ("SubtitleStream"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i, version))); @@ -83,10 +84,11 @@ FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr no c = node->node_children ("AudioStream"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { - _audio_streams.push_back (shared_ptr (new FFmpegAudioStream (*i, version))); + shared_ptr as (new FFmpegAudioStream (*i, version)); + audio->add_stream (as); if (version < 11 && !(*i)->optional_node_child ("Selected")) { /* This is an old file and this stream is not selected, so un-map it */ - _audio_streams.back()->set_mapping (AudioMapping (_audio_streams.back()->channels (), MAX_DCP_AUDIO_CHANNELS)); + as->set_mapping (AudioMapping (as->channels (), MAX_DCP_AUDIO_CHANNELS)); } } @@ -117,24 +119,32 @@ FFmpegContent::FFmpegContent (shared_ptr film, cxml::ConstNodePtr no FFmpegContent::FFmpegContent (shared_ptr film, vector > c) : Content (film, c) - , VideoContent (film, c) - , AudioContent (film, c) - , SubtitleContent (film, c) { + video.reset (new VideoContent (this, c)); + audio.reset (new AudioContent (this, c)); + 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->use_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) { + if (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 (); - _audio_streams = ref->ffmpeg_audio_streams (); _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 @@ -142,9 +152,24 @@ FFmpegContent::as_xml (xmlpp::Node* node) const { node->add_child("Type")->add_child_text ("FFmpeg"); Content::as_xml (node); - VideoContent::as_xml (node); - AudioContent::as_xml (node); - SubtitleContent::as_xml (node); + + if (video) { + video->as_xml (node); + } + + if (audio) { + audio->as_xml (node); + + BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) { + shared_ptr f = dynamic_pointer_cast (i); + DCPOMATIC_ASSERT (f); + f->as_xml (node->add_child("AudioStream")); + } + } + + if (subtitle) { + subtitle->as_xml (node); + } boost::mutex::scoped_lock lm (_mutex); @@ -156,10 +181,6 @@ FFmpegContent::as_xml (xmlpp::Node* node) const (*i)->as_xml (t); } - for (vector >::const_iterator i = _audio_streams.begin(); i != _audio_streams.end(); ++i) { - (*i)->as_xml (node->add_child("AudioStream")); - } - for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { node->add_child("Filter")->add_child_text ((*i)->id ()); } @@ -185,43 +206,62 @@ FFmpegContent::examine (shared_ptr job) Content::examine (job); shared_ptr examiner (new FFmpegExaminer (shared_from_this (), job)); - take_from_video_examiner (examiner); + + if (examiner->has_video ()) { + video.reset (new VideoContent (this)); + video->take_from_examiner (examiner); + set_default_colour_conversion (); + } { boost::mutex::scoped_lock lm (_mutex); - _subtitle_streams = examiner->subtitle_streams (); - if (!_subtitle_streams.empty ()) { - _subtitle_stream = _subtitle_streams.front (); + if (examiner->has_video ()) { + _first_video = examiner->first_video (); + _color_range = examiner->color_range (); + _color_primaries = examiner->color_primaries (); + _color_trc = examiner->color_trc (); + _colorspace = examiner->colorspace (); + _bits_per_pixel = examiner->bits_per_pixel (); } - _audio_streams = examiner->audio_streams (); + if (!examiner->audio_streams().empty ()) { + audio.reset (new AudioContent (this)); - if (!_audio_streams.empty ()) { - AudioMapping m = _audio_streams.front()->mapping (); + BOOST_FOREACH (shared_ptr i, examiner->audio_streams ()) { + audio->add_stream (i); + } + + AudioStreamPtr as = audio->streams().front(); + AudioMapping m = as->mapping (); film()->make_audio_mapping_default (m); - _audio_streams.front()->set_mapping (m); + as->set_mapping (m); } - _first_video = examiner->first_video (); + _subtitle_streams = examiner->subtitle_streams (); + if (!_subtitle_streams.empty ()) { + subtitle.reset (new SubtitleContent (this)); + _subtitle_stream = _subtitle_streams.front (); + } - _color_range = examiner->color_range (); - _color_primaries = examiner->color_primaries (); - _color_trc = examiner->color_trc (); - _colorspace = examiner->colorspace (); - _bits_per_pixel = examiner->bits_per_pixel (); } signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS); signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); - signal_changed (AudioContentProperty::AUDIO_STREAMS); } string FFmpegContent::summary () const { - /* Get the string() here so that the name does not have quotes around it */ - return String::compose (_("%1 [movie]"), path_summary ()); + if (video && audio) { + return String::compose (_("%1 [movie]"), path_summary ()); + } else if (video) { + return String::compose (_("%1 [video]"), path_summary ()); + } else if (audio) { + return String::compose (_("%1 [audio]"), path_summary ()); + } + + return path_summary (); } string @@ -243,12 +283,19 @@ FFmpegContent::technical_summary () const string filt = Filter::ffmpeg_string (_filters); - return Content::technical_summary() + " - " - + VideoContent::technical_summary() + " - " - + AudioContent::technical_summary() + " - " - + String::compose ( - "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt - ); + string s = Content::technical_summary (); + + if (video) { + s += " - " + video->technical_summary (); + } + + if (audio) { + s += " - " + audio->technical_summary (); + } + + return s + String::compose ( + "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt + ); } void @@ -277,8 +324,13 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b) DCPTime FFmpegContent::full_length () const { - FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ()); - return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); + FrameRateChange const frc (active_video_frame_rate (), film()->video_frame_rate ()); + if (video) { + return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); + } + + DCPOMATIC_ASSERT (audio); + return DCPTime::from_frames (llrint (audio->stream()->length() / frc.speed_up), audio->stream()->frame_rate()); } void @@ -297,8 +349,15 @@ FFmpegContent::identifier () const { SafeStringStream s; - s << VideoContent::identifier() << "_" - << SubtitleContent::identifier(); + s << Content::identifier(); + + if (video) { + s << "_" << video->identifier(); + } + + if (subtitle) { + s << "_" << subtitle->identifier(); + } boost::mutex::scoped_lock lm (_mutex); @@ -314,56 +373,47 @@ FFmpegContent::identifier () const } list -FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const +FFmpegContent::image_subtitles_during (ContentTimePeriod period, bool starting) const { shared_ptr stream = subtitle_stream (); if (!stream) { return list (); } - return stream->subtitles_during (period, starting); + return stream->image_subtitles_during (period, starting); } -bool -FFmpegContent::has_text_subtitles () const +list +FFmpegContent::text_subtitles_during (ContentTimePeriod period, bool starting) const { - return false; -} + shared_ptr stream = subtitle_stream (); + if (!stream) { + return list (); + } -bool -FFmpegContent::has_image_subtitles () const -{ - return !subtitle_streams().empty (); + return stream->text_subtitles_during (period, starting); } void FFmpegContent::set_default_colour_conversion () { - dcp::Size const s = video_size (); + dcp::Size const s = video->size (); boost::mutex::scoped_lock lm (_mutex); if (s.width < 1080) { - _colour_conversion = PresetColourConversion::from_id ("rec601").conversion; + video->set_colour_conversion (PresetColourConversion::from_id ("rec601").conversion); } else { - _colour_conversion = PresetColourConversion::from_id ("rec709").conversion; + video->set_colour_conversion (PresetColourConversion::from_id ("rec709").conversion); } } -vector -FFmpegContent::audio_streams () const -{ - boost::mutex::scoped_lock lm (_mutex); - - vector s; - copy (_audio_streams.begin(), _audio_streams.end(), back_inserter (s)); - return s; -} - void -FFmpegContent::add_properties (list >& p) const +FFmpegContent::add_properties (list& p) const { - VideoContent::add_properties (p); + 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); @@ -373,17 +423,21 @@ FFmpegContent::add_properties (list >& p) const 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 (make_pair (_("Colour range"), _("Unspecified"))); + 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 (make_pair (_("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2))); + 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 (make_pair (_("Colour range"), String::compose (_("Full (0-%1)"), total))); + p.push_back (UserProperty (_("Video"), _("Colour range"), String::compose (_("Full (0-%1)"), total))); break; default: DCPOMATIC_ASSERT (false); @@ -393,17 +447,17 @@ FFmpegContent::add_properties (list >& p) const 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 (make_pair (_("Colour range"), _("Unspecified"))); + 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 (make_pair (_("Colour range"), _("Limited"))); + 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 (make_pair (_("Colour range"), _("Full"))); + p.push_back (UserProperty (_("Video"), _("Colour range"), _("Full"))); break; default: DCPOMATIC_ASSERT (false); @@ -420,11 +474,12 @@ FFmpegContent::add_properties (list >& p) const _("SMPTE 170M (BT601)"), _("SMPTE 240M"), _("Film"), - _("BT2020") + _("BT2020"), + _("SMPTE ST 428-1 (CIE 1931 XYZ)") }; - DCPOMATIC_ASSERT (AVCOL_PRI_NB == 10); - p.push_back (make_pair (_("Colour primaries"), primaries[_color_primaries])); + DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11); + p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries])); char const * transfers[] = { _("Unspecified"), @@ -442,11 +497,13 @@ FFmpegContent::add_properties (list >& p) const _("BT1361 extended colour gamut"), _("IEC61966-2-1 (sRGB or sYCC)"), _("BT2020 for a 10-bit system"), - _("BT2020 for a 12-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 == 16); - p.push_back (make_pair (_("Colour transfer characteristic"), transfers[_color_trc])); + 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)"), @@ -463,9 +520,34 @@ FFmpegContent::add_properties (list >& p) const }; DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11); - p.push_back (make_pair (_("Colourspace"), spaces[_colorspace])); + p.push_back (UserProperty (_("Video"), _("Colourspace"), spaces[_colorspace])); if (_bits_per_pixel) { - p.push_back (make_pair (_("Bits per pixel"), raw_convert (_bits_per_pixel.get ()))); + p.push_back (UserProperty (_("Video"), _("Bits per pixel"), raw_convert (_bits_per_pixel.get ()))); } } + +/** 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 + * streams. + */ +void +FFmpegContent::signal_subtitle_stream_changed () +{ + signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); +} + +vector > +FFmpegContent::ffmpeg_audio_streams () const +{ + vector > fa; + + if (audio) { + BOOST_FOREACH (AudioStreamPtr i, audio->streams()) { + fa.push_back (dynamic_pointer_cast (i)); + } + } + + return fa; +}