X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=5d0a6a309aac4263aa3c6409c5a518065e72f020;hb=71d8cf20889a3c419c9a3e485f461236e5317423;hp=de967c04554cb843c08a8cbb09330078d483e1a6;hpb=c57e92b12c64d4ad1a7f23876a97471565f9a252;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index de967c045..5d0a6a309 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-2014 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,7 +17,11 @@ */ +extern "C" { +#include +} #include +#include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" #include "compose.hpp" @@ -26,9 +30,12 @@ #include "filter.h" #include "film.h" #include "log.h" +#include "exceptions.h" #include "i18n.h" +#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::GENERAL); + using std::string; using std::stringstream; using std::vector; @@ -36,7 +43,8 @@ using std::list; using std::cout; using std::pair; using boost::shared_ptr; -using boost::lexical_cast; +using boost::dynamic_pointer_cast; +using libdcp::raw_convert; int const FFmpegContentProperty::SUBTITLE_STREAMS = 100; int const FFmpegContentProperty::SUBTITLE_STREAM = 101; @@ -53,14 +61,14 @@ 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, list& notes) : Content (f, node) - , VideoContent (f, node) + , VideoContent (f, node, version) , AudioContent (f, node) - , SubtitleContent (f, node) + , SubtitleContent (f, node, version) { - list > c = node->node_children ("SubtitleStream"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++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))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); @@ -68,21 +76,53 @@ 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))); + 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) { - _filters.push_back (Filter::from_id ((*i)->content ())); + for (list::iterator i = c.begin(); i != c.end(); ++i) { + 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"); } +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 { @@ -115,7 +155,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 ())); } } @@ -133,7 +173,7 @@ FFmpegContent::examine (shared_ptr job) VideoContent::Frame video_length = 0; video_length = examiner->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length)); + LOG_GENERAL ("Video length obtained from header as %1 frames", video_length); { boost::mutex::scoped_lock lm (_mutex); @@ -167,7 +207,7 @@ string FFmpegContent::summary () const { /* Get the string() here so that the name does not have quotes around it */ - return String::compose (_("%1 [movie]"), path().filename().string()); + return String::compose (_("%1 [movie]"), path_summary ()); } string @@ -175,21 +215,21 @@ FFmpegContent::technical_summary () const { string as = "none"; if (_audio_stream) { - as = String::compose ("id %1", _audio_stream->id); + as = _audio_stream->technical_summary (); } string ss = "none"; if (_subtitle_stream) { - ss = String::compose ("id %1", _subtitle_stream->id); + 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 ); } @@ -202,7 +242,7 @@ FFmpegContent::information () const stringstream s; - s << String::compose (_("%1 frames; %2 frames per second"), video_length(), video_frame_rate()) << "\n"; + s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine(), video_frame_rate()) << "\n"; s << VideoContent::information (); return s.str (); @@ -234,8 +274,8 @@ AudioContent::Frame FFmpegContent::audio_length () const { int const cafr = content_audio_frame_rate (); - int const vfr = video_frame_rate (); - VideoContent::Frame const vl = video_length (); + float const vfr = video_frame_rate (); + VideoContent::Frame const vl = video_length_after_3d_combine (); boost::mutex::scoped_lock lm (_mutex); if (!_audio_stream) { @@ -294,22 +334,35 @@ FFmpegContent::output_audio_frame_rate () const } bool -operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) +operator== (FFmpegStream const & a, FFmpegStream const & b) { - return a.id == b.id; + return a._id == b._id; } bool -operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b) +operator!= (FFmpegStream const & a, FFmpegStream const & b) { - return a.id == b.id; + return a._id != b._id; } -FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) - : mapping (node->node_child ("Mapping")) +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 (raw_convert (_id)); +} + +FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) + : FFmpegStream (node) + , mapping (node->node_child ("Mapping"), version) { - name = node->string_child ("Name"); - id = node->number_child ("Id"); frame_rate = node->number_child ("FrameRate"); channels = node->number_child ("Channels"); first_audio = node->optional_number_child ("FirstAudio"); @@ -318,31 +371,58 @@ 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)); - root->add_child("FrameRate")->add_child_text (lexical_cast (frame_rate)); - root->add_child("Channels")->add_child_text (lexical_cast (channels)); + FFmpegStream::as_xml (root); + root->add_child("FrameRate")->add_child_text (raw_convert (frame_rate)); + root->add_child("Channels")->add_child_text (raw_convert (channels)); if (first_audio) { - root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get ())); + root->add_child("FirstAudio")->add_child_text (raw_convert (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) { - 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 @@ -352,7 +432,7 @@ FFmpegContent::full_length () const assert (film); FrameRateConversion frc (video_frame_rate (), film->video_frame_rate ()); - return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate (); + return video_length_after_3d_combine() * frc.factor() * TIME_HZ / film->video_frame_rate (); } AudioMapping @@ -395,7 +475,7 @@ FFmpegContent::identifier () const boost::mutex::scoped_lock lm (_mutex); if (_subtitle_stream) { - s << "_" << _subtitle_stream->id; + s << "_" << _subtitle_stream->identifier (); } for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { @@ -405,3 +485,23 @@ FFmpegContent::identifier () const return s.str (); } +boost::filesystem::path +FFmpegContent::audio_analysis_path () const +{ + shared_ptr film = _film.lock (); + if (!film) { + return boost::filesystem::path (); + } + + /* We need to include the stream ID in this path so that we get different + analyses for each stream. + */ + + boost::filesystem::path p = film->audio_analysis_dir (); + string name = digest (); + if (audio_stream ()) { + name += "_" + audio_stream()->identifier (); + } + p /= name; + return p; +}