X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=90c00283d940fc79c43f1e0cc3131ae92507e01b;hb=0d65e6ab06f798ca905c0ae5c1d0203ac254377c;hp=4a6cf9e04ceb5b94f3a490eb43d59a736bff8e26;hpb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 4a6cf9e04..608c8cdb7 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 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 @@ -17,12 +17,10 @@ */ -extern "C" { -#include -} -#include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" +#include "ffmpeg_subtitle_stream.h" +#include "ffmpeg_audio_stream.h" #include "compose.hpp" #include "job.h" #include "util.h" @@ -30,24 +28,30 @@ extern "C" { #include "film.h" #include "log.h" #include "exceptions.h" +#include "frame_rate_change.h" +#include "safe_stringstream.h" +#include "raw_convert.h" +#include +extern "C" { +#include +} +#include #include "i18n.h" +#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); + using std::string; -using std::stringstream; using std::vector; using std::list; using std::cout; using std::pair; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; int const FFmpegContentProperty::SUBTITLE_STREAMS = 100; int const FFmpegContentProperty::SUBTITLE_STREAM = 101; -int const FFmpegContentProperty::AUDIO_STREAMS = 102; -int const FFmpegContentProperty::AUDIO_STREAM = 103; -int const FFmpegContentProperty::FILTERS = 104; +int const FFmpegContentProperty::FILTERS = 102; FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path p) : Content (f, p) @@ -58,9 +62,9 @@ FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path } -FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr node, int version) +FFmpegContent::FFmpegContent (shared_ptr f, cxml::ConstNodePtr node, int version, list& notes) : Content (f, node) - , VideoContent (f, node) + , VideoContent (f, node, version) , AudioContent (f, node) , SubtitleContent (f, node, version) { @@ -75,14 +79,20 @@ FFmpegContent::FFmpegContent (shared_ptr f, shared_ptrnode_children ("AudioStream"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { _audio_streams.push_back (shared_ptr (new FFmpegAudioStream (*i, version))); - if ((*i)->optional_number_child ("Selected")) { - _audio_stream = _audio_streams.back (); + 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)); } } c = node->node_children ("Filter"); for (list::iterator i = c.begin(); i != c.end(); ++i) { - _filters.push_back (Filter::from_id ((*i)->content ())); + 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())); + } } _first_video = node->optional_number_child ("FirstVideo"); @@ -95,23 +105,18 @@ FFmpegContent::FFmpegContent (shared_ptr f, vector ref = dynamic_pointer_cast (c[0]); - assert (ref); + DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr fc = dynamic_pointer_cast (c[i]); - if (f->with_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) { + if (fc->use_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) { throw JoinError (_("Content to be joined must use the same subtitle stream.")); } - - if (*(fc->_audio_stream.get()) != *(ref->_audio_stream.get())) { - throw JoinError (_("Content to be joined must use the same audio stream.")); - } } _subtitle_streams = ref->subtitle_streams (); _subtitle_stream = ref->subtitle_stream (); - _audio_streams = ref->audio_streams (); - _audio_stream = ref->audio_stream (); + _audio_streams = ref->ffmpeg_audio_streams (); _first_video = ref->_first_video; } @@ -135,11 +140,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } for (vector >::const_iterator i = _audio_streams.begin(); i != _audio_streams.end(); ++i) { - xmlpp::Node* t = node->add_child("AudioStream"); - if (_audio_stream && *i == _audio_stream) { - t->add_child("Selected")->add_child_text("1"); - } - (*i)->as_xml (t); + (*i)->as_xml (node->add_child("AudioStream")); } for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { @@ -147,7 +148,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const } if (_first_video) { - node->add_child("FirstVideo")->add_child_text (lexical_cast (_first_video.get ())); + node->add_child("FirstVideo")->add_child_text (raw_convert (_first_video.get().get())); } } @@ -158,40 +159,34 @@ FFmpegContent::examine (shared_ptr job) Content::examine (job); - shared_ptr film = _film.lock (); - assert (film); - - shared_ptr examiner (new FFmpegExaminer (shared_from_this ())); + shared_ptr examiner (new FFmpegExaminer (shared_from_this (), job)); + take_from_video_examiner (examiner); - ContentTime video_length = examiner->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ()))); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); { boost::mutex::scoped_lock lm (_mutex); - _video_length = video_length; - _subtitle_streams = examiner->subtitle_streams (); if (!_subtitle_streams.empty ()) { _subtitle_stream = _subtitle_streams.front (); } _audio_streams = examiner->audio_streams (); + if (!_audio_streams.empty ()) { - _audio_stream = _audio_streams.front (); + AudioMapping m = _audio_streams.front()->mapping (); + film->make_audio_mapping_default (m); + _audio_streams.front()->set_mapping (m); } _first_video = examiner->first_video (); } - take_from_video_examiner (examiner); - - signal_changed (ContentProperty::LENGTH); signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS); signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); - signal_changed (FFmpegContentProperty::AUDIO_STREAMS); - signal_changed (FFmpegContentProperty::AUDIO_STREAM); - signal_changed (AudioContentProperty::AUDIO_CHANNELS); + signal_changed (AudioContentProperty::AUDIO_STREAMS); } string @@ -204,9 +199,13 @@ FFmpegContent::summary () const string FFmpegContent::technical_summary () const { - string as = "none"; - if (_audio_stream) { - as = _audio_stream->technical_summary (); + string as = ""; + BOOST_FOREACH (shared_ptr i, ffmpeg_audio_streams ()) { + as += i->technical_summary () + " " ; + } + + if (as.empty ()) { + as = "none"; } string ss = "none"; @@ -214,31 +213,16 @@ FFmpegContent::technical_summary () const ss = _subtitle_stream->technical_summary (); } - pair filt = Filter::ffmpeg_strings (_filters); + 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 %4", as, ss, filt.first, filt.second + "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt ); } -string -FFmpegContent::information () const -{ - if (video_length() == ContentTime (0) || video_frame_rate() == ContentTime (0)) { - return ""; - } - - stringstream s; - - s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n"; - s << VideoContent::information (); - - return s.str (); -} - void FFmpegContent::set_subtitle_stream (shared_ptr s) { @@ -250,77 +234,6 @@ FFmpegContent::set_subtitle_stream (shared_ptr s) signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); } -void -FFmpegContent::set_audio_stream (shared_ptr s) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _audio_stream = s; - } - - signal_changed (FFmpegContentProperty::AUDIO_STREAM); -} - -ContentTime -FFmpegContent::audio_length () const -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (!_audio_stream) { - return ContentTime (); - } - } - - return video_length(); -} - -int -FFmpegContent::audio_channels () const -{ - boost::mutex::scoped_lock lm (_mutex); - - if (!_audio_stream) { - return 0; - } - - return _audio_stream->channels; -} - -int -FFmpegContent::content_audio_frame_rate () const -{ - boost::mutex::scoped_lock lm (_mutex); - - if (!_audio_stream) { - return 0; - } - - return _audio_stream->frame_rate; -} - -int -FFmpegContent::output_audio_frame_rate () const -{ - shared_ptr film = _film.lock (); - assert (film); - - /* Resample to a DCI-approved sample rate */ - double t = dcp_audio_frame_rate (content_audio_frame_rate ()); - - FrameRateChange frc (video_frame_rate(), film->video_frame_rate()); - - /* Compensate if the DCP is being run at a different frame rate - to the source; that is, if the video is run such that it will - look different in the DCP compared to the source (slower or faster). - */ - - if (frc.change_speed) { - t /= frc.speed_up; - } - - return rint (t); -} - bool operator== (FFmpegStream const & a, FFmpegStream const & b) { @@ -333,104 +246,13 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b) return a._id != b._id; } -FFmpegStream::FFmpegStream (shared_ptr node) - : name (node->string_child ("Name")) - , _id (node->number_child ("Id")) -{ - -} - -void -FFmpegStream::as_xml (xmlpp::Node* root) const -{ - root->add_child("Name")->add_child_text (name); - root->add_child("Id")->add_child_text (lexical_cast (_id)); -} - -FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) - : FFmpegStream (node) - , mapping (node->node_child ("Mapping"), version) -{ - frame_rate = node->number_child ("FrameRate"); - channels = node->number_child ("Channels"); - first_audio = node->optional_number_child ("FirstAudio"); -} - -void -FFmpegAudioStream::as_xml (xmlpp::Node* root) const -{ - FFmpegStream::as_xml (root); - root->add_child("FrameRate")->add_child_text (lexical_cast (frame_rate)); - root->add_child("Channels")->add_child_text (lexical_cast (channels)); - if (first_audio) { - root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get ())); - } - mapping.as_xml (root->add_child("Mapping")); -} - -bool -FFmpegStream::uses_index (AVFormatContext const * fc, int index) const -{ - size_t i = 0; - while (i < fc->nb_streams) { - if (fc->streams[i]->id == _id) { - return int (i) == index; - } - ++i; - } - - return false; -} - -AVStream * -FFmpegStream::stream (AVFormatContext const * fc) const -{ - size_t i = 0; - while (i < fc->nb_streams) { - if (fc->streams[i]->id == _id) { - return fc->streams[i]; - } - ++i; - } - - assert (false); - return 0; -} - -/** Construct a SubtitleStream from a value returned from to_string(). - * @param t String returned from to_string(). - * @param v State file version. - */ -FFmpegSubtitleStream::FFmpegSubtitleStream (shared_ptr node) - : FFmpegStream (node) -{ - -} - -void -FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const -{ - FFmpegStream::as_xml (root); -} - DCPTime FFmpegContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); - return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ())); -} - -AudioMapping -FFmpegContent::audio_mapping () const -{ - boost::mutex::scoped_lock lm (_mutex); - - if (!_audio_stream) { - return AudioMapping (); - } - - return _audio_stream->mapping; + DCPOMATIC_ASSERT (film); + FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ()); + return DCPTime::from_frames (rint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate()); } void @@ -444,17 +266,10 @@ FFmpegContent::set_filters (vector const & filters) signal_changed (FFmpegContentProperty::FILTERS); } -void -FFmpegContent::set_audio_mapping (AudioMapping m) -{ - audio_stream()->mapping = m; - signal_changed (AudioContentProperty::AUDIO_MAPPING); -} - string FFmpegContent::identifier () const { - stringstream s; + SafeStringStream s; s << VideoContent::identifier(); @@ -471,3 +286,43 @@ FFmpegContent::identifier () const return s.str (); } +list +FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const +{ + shared_ptr stream = subtitle_stream (); + if (!stream) { + return list (); + } + + return stream->subtitles_during (period, starting); +} + +bool +FFmpegContent::has_subtitles () const +{ + return !subtitle_streams().empty (); +} + +void +FFmpegContent::set_default_colour_conversion () +{ + dcp::Size const s = video_size (); + + boost::mutex::scoped_lock lm (_mutex); + + if (s.width < 1080) { + _colour_conversion = PresetColourConversion::from_id ("rec601").conversion; + } else { + _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; +}