X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=394c16aa53568c4b55fe4e13be3bf0818bb28504;hb=b299c1873bf23414061d551843275c77a9256a05;hp=8419fd31fe379bcae72c213a176f5dae6a678e12;hpb=7370f2b159a539d4a7721a50d0f3dc56ba14c678;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 8419fd31f..394c16aa5 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -17,6 +17,9 @@ */ +extern "C" { +#include +} #include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" @@ -26,6 +29,7 @@ #include "filter.h" #include "film.h" #include "log.h" +#include "exceptions.h" #include "i18n.h" @@ -34,8 +38,10 @@ 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; @@ -52,36 +58,63 @@ FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path } -FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr node) +FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr node, int version) : Content (f, node) , VideoContent (f, node) , AudioContent (f, node) , SubtitleContent (f, node) { - 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))); + 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))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); } } 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))); + 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 (); } } c = node->node_children ("Filter"); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { + for (list::iterator i = c.begin(); i != c.end(); ++i) { _filters.push_back (Filter::from_id ((*i)->content ())); } _first_video = node->optional_number_child ("FirstVideo"); } +FFmpegContent::FFmpegContent (shared_ptr f, vector > c) + : Content (f, c) + , VideoContent (f, c) + , AudioContent (f, c) + , SubtitleContent (f, c) +{ + shared_ptr ref = dynamic_pointer_cast (c[0]); + 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())) { + 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 (); + _first_video = ref->_first_video; +} + void FFmpegContent::as_xml (xmlpp::Node* node) const { @@ -130,7 +163,7 @@ FFmpegContent::examine (shared_ptr job) shared_ptr examiner (new FFmpegExaminer (shared_from_this ())); - VideoContent::Frame video_length = 0; + VideoFrame video_length = 0; video_length = examiner->video_length (); film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length)); @@ -165,7 +198,31 @@ FFmpegContent::examine (shared_ptr job) string FFmpegContent::summary () const { - return String::compose (_("%1 [movie]"), file().filename().string()); + /* Get the string() here so that the name does not have quotes around it */ + return String::compose (_("%1 [movie]"), path_summary ()); +} + +string +FFmpegContent::technical_summary () const +{ + string as = "none"; + if (_audio_stream) { + as = String::compose ("id %1", _audio_stream->id); + } + + string ss = "none"; + if (_subtitle_stream) { + ss = String::compose ("id %1", _subtitle_stream->id); + } + + pair filt = Filter::ffmpeg_strings (_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 + ); } string @@ -205,12 +262,12 @@ FFmpegContent::set_audio_stream (shared_ptr s) signal_changed (FFmpegContentProperty::AUDIO_STREAM); } -AudioContent::Frame +AudioFrame FFmpegContent::audio_length () const { int const cafr = content_audio_frame_rate (); int const vfr = video_frame_rate (); - VideoContent::Frame const vl = video_length (); + VideoFrame const vl = video_length (); boost::mutex::scoped_lock lm (_mutex); if (!_audio_stream) { @@ -253,16 +310,15 @@ FFmpegContent::output_audio_frame_rate () const /* Resample to a DCI-approved sample rate */ double t = dcp_audio_frame_rate (content_audio_frame_rate ()); - FrameRateConversion frc (video_frame_rate(), film->dcp_video_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). - skip/repeat doesn't come into effect here. */ if (frc.change_speed) { - t *= video_frame_rate() * frc.factor() / film->dcp_video_frame_rate(); + t /= frc.speed_up; } return rint (t); @@ -274,17 +330,51 @@ operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) return a.id == b.id; } +bool +operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) +{ + return a.id != b.id; +} + bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b) { return a.id == b.id; } -FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) - : mapping (node->node_child ("Mapping")) +bool +operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b) +{ + return a.id != b.id; +} + +FFmpegStream::FFmpegStream (shared_ptr node, int version) + : _legacy_id (false) { name = node->string_child ("Name"); id = node->number_child ("Id"); + if (version == 4 || node->optional_bool_child ("LegacyId")) { + _legacy_id = true; + } +} + +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)); + if (_legacy_id) { + /* Write this so that version > 4 files are read in correctly + if the Id came originally from a version <= 4 file. + */ + root->add_child("LegacyId")->add_child_text ("1"); + } +} + +FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) + : FFmpegStream (node, version) + , mapping (node->node_child ("Mapping"), version) +{ frame_rate = node->number_child ("FrameRate"); channels = node->number_child ("Channels"); first_audio = node->optional_number_child ("FirstAudio"); @@ -293,8 +383,7 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) void FFmpegAudioStream::as_xml (xmlpp::Node* root) const { - root->add_child("Name")->add_child_text (name); - root->add_child("Id")->add_child_text (lexical_cast (id)); + 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) { @@ -303,31 +392,67 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const mapping.as_xml (root->add_child("Mapping")); } +int +FFmpegStream::index (AVFormatContext const * fc) const +{ + if (_legacy_id) { + return id; + } + + size_t i = 0; + while (i < fc->nb_streams) { + if (fc->streams[i]->id == id) { + return i; + } + ++i; + } + + assert (false); +} + +AVStream * +FFmpegStream::stream (AVFormatContext const * fc) const +{ + if (_legacy_id) { + return fc->streams[id]; + } + + 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) +FFmpegSubtitleStream::FFmpegSubtitleStream (shared_ptr node, int version) + : FFmpegStream (node, version) { - name = node->string_child ("Name"); - id = node->number_child ("Id"); + } void FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const { - root->add_child("Name")->add_child_text (name); - root->add_child("Id")->add_child_text (lexical_cast (id)); + FFmpegStream::as_xml (root); } -Time -FFmpegContent::length () const +DCPTime +FFmpegContent::full_length () const { shared_ptr film = _film.lock (); assert (film); - FrameRateConversion frc (video_frame_rate (), film->dcp_video_frame_rate ()); - return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate (); + FrameRateChange frc (video_frame_rate (), film->video_frame_rate ()); + return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate (); } AudioMapping @@ -379,3 +504,4 @@ FFmpegContent::identifier () const return s.str (); } +