X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=487325d71b152245af66534e19537812bae950bd;hb=f09070bbc5e4e46f80f2897c5baf5934b1514b99;hp=719c4cb53ecf03488d8266954b6309205657bb5e;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 719c4cb53..487325d71 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -19,10 +19,12 @@ #include #include "ffmpeg_content.h" -#include "ffmpeg_decoder.h" +#include "ffmpeg_examiner.h" #include "compose.hpp" #include "job.h" #include "util.h" +#include "filter.h" +#include "film.h" #include "log.h" #include "i18n.h" @@ -39,23 +41,26 @@ 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; -FFmpegContent::FFmpegContent (boost::filesystem::path f) - : Content (f) - , VideoContent (f) - , AudioContent (f) +FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path p) + : Content (f, p) + , VideoContent (f, p) + , AudioContent (f, p) + , SubtitleContent (f, p) { } -FFmpegContent::FFmpegContent (shared_ptr node) - : Content (node) - , VideoContent (node) - , AudioContent (node) +FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr node) + : 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 (FFmpegSubtitleStream (*i)); + _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); } @@ -63,17 +68,25 @@ FFmpegContent::FFmpegContent (shared_ptr node) c = node->node_children ("AudioStream"); for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { - _audio_streams.push_back (FFmpegAudioStream (*i)); + _audio_streams.push_back (shared_ptr (new FFmpegAudioStream (*i))); 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 ())); + } + + _first_video = node->optional_number_child ("FirstVideo"); } FFmpegContent::FFmpegContent (FFmpegContent const & o) : Content (o) , VideoContent (o) , AudioContent (o) + , SubtitleContent (o) , _subtitle_streams (o._subtitle_streams) , _subtitle_stream (o._subtitle_stream) , _audio_streams (o._audio_streams) @@ -88,72 +101,78 @@ 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); boost::mutex::scoped_lock lm (_mutex); - for (vector::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) { + for (vector >::const_iterator i = _subtitle_streams.begin(); i != _subtitle_streams.end(); ++i) { xmlpp::Node* t = node->add_child("SubtitleStream"); - if (_subtitle_stream && *i == _subtitle_stream.get()) { + if (_subtitle_stream && *i == _subtitle_stream) { t->add_child("Selected")->add_child_text("1"); } - i->as_xml (t); + (*i)->as_xml (t); } - for (vector::const_iterator i = _audio_streams.begin(); i != _audio_streams.end(); ++i) { + 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.get()) { + if (_audio_stream && *i == _audio_stream) { t->add_child("Selected")->add_child_text("1"); } - i->as_xml (t); + (*i)->as_xml (t); + } + + for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { + node->add_child("Filter")->add_child_text ((*i)->id ()); + } + + if (_first_video) { + node->add_child("FirstVideo")->add_child_text (lexical_cast (_first_video.get ())); } } void -FFmpegContent::examine (shared_ptr film, shared_ptr job, bool quick) +FFmpegContent::examine (shared_ptr job) { job->set_progress_unknown (); - Content::examine (film, job, quick); - - shared_ptr decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false)); - - ContentVideoFrame video_length = 0; - if (quick) { - video_length = decoder->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ())); - } else { - while (!decoder->pass ()) { - /* keep going */ - } - - video_length = decoder->video_frame (); - film->log()->log (String::compose ("Video length examined as %1 frames", decoder->video_frame ())); - } - - { - boost::mutex::scoped_lock lm (_mutex); - - _video_length = video_length; - - _subtitle_streams = decoder->subtitle_streams (); - if (!_subtitle_streams.empty ()) { - _subtitle_stream = _subtitle_streams.front (); - } - - _audio_streams = decoder->audio_streams (); - if (!_audio_streams.empty ()) { - _audio_stream = _audio_streams.front (); - } - } - - take_from_video_decoder (decoder); - - signal_changed (VideoContentProperty::VIDEO_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); + Content::examine (job); + + shared_ptr film = _film.lock (); + assert (film); + + shared_ptr examiner (new FFmpegExaminer (shared_from_this ())); + + 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)); + + { + 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 (); + } + + _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); } string @@ -178,67 +197,100 @@ FFmpegContent::information () const } void -FFmpegContent::set_subtitle_stream (FFmpegSubtitleStream s) +FFmpegContent::set_subtitle_stream (shared_ptr s) { - { - boost::mutex::scoped_lock lm (_mutex); - _subtitle_stream = s; - } + { + boost::mutex::scoped_lock lm (_mutex); + _subtitle_stream = s; + } - signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); + signal_changed (FFmpegContentProperty::SUBTITLE_STREAM); } void -FFmpegContent::set_audio_stream (FFmpegAudioStream s) +FFmpegContent::set_audio_stream (shared_ptr s) { - { - boost::mutex::scoped_lock lm (_mutex); - _audio_stream = s; - } + { + boost::mutex::scoped_lock lm (_mutex); + _audio_stream = s; + } - signal_changed (FFmpegContentProperty::AUDIO_STREAM); + signal_changed (FFmpegContentProperty::AUDIO_STREAM); } -ContentAudioFrame +AudioContent::Frame FFmpegContent::audio_length () const { - if (!_audio_stream) { - return 0; - } - - return video_frames_to_audio_frames (_video_length, audio_frame_rate(), video_frame_rate()); + int const cafr = content_audio_frame_rate (); + int const vfr = video_frame_rate (); + VideoContent::Frame const vl = video_length (); + + boost::mutex::scoped_lock lm (_mutex); + if (!_audio_stream) { + return 0; + } + + return video_frames_to_audio_frames (vl, cafr, vfr); } int FFmpegContent::audio_channels () const { - if (!_audio_stream) { - return 0; - } + boost::mutex::scoped_lock lm (_mutex); + + if (!_audio_stream) { + return 0; + } - return _audio_stream->channels; + return _audio_stream->channels; } int -FFmpegContent::audio_frame_rate () const +FFmpegContent::content_audio_frame_rate () const { - if (!_audio_stream) { - return 0; - } + boost::mutex::scoped_lock lm (_mutex); - return _audio_stream->frame_rate; + 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 ()); + + FrameRateConversion frc (video_frame_rate(), film->dcp_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(); + } + + return rint (t); } bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) { - return a.id == b.id; + return a.id == b.id; } bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b) { - return a.id == b.id; + return a.id == b.id; } FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) @@ -247,6 +299,8 @@ FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) id = node->number_child ("Id"); frame_rate = node->number_child ("FrameRate"); channels = node->number_child ("Channels"); + mapping = AudioMapping (node->node_child ("Mapping")); + first_audio = node->optional_number_child ("FirstAudio"); } void @@ -256,6 +310,10 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const 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)); + if (first_audio) { + root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get ())); + } + mapping.as_xml (root->add_child("Mapping")); } /** Construct a SubtitleStream from a value returned from to_string(). @@ -280,3 +338,63 @@ FFmpegContent::clone () const { return shared_ptr (new FFmpegContent (*this)); } + +Time +FFmpegContent::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 (); +} + +AudioMapping +FFmpegContent::audio_mapping () const +{ + boost::mutex::scoped_lock lm (_mutex); + + if (!_audio_stream) { + return AudioMapping (); + } + + return _audio_stream->mapping; +} + +void +FFmpegContent::set_filters (vector const & filters) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _filters = 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; + + s << VideoContent::identifier(); + + boost::mutex::scoped_lock lm (_mutex); + + if (_subtitle_stream) { + s << "_" << _subtitle_stream->id; + } + + for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { + s << "_" << (*i)->id (); + } + + return s.str (); +}