X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_content.cc;h=90c00283d940fc79c43f1e0cc3131ae92507e01b;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=7a67ee5b8b5475cbb7e19b10baf02a37586b0393;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 7a67ee5b8..90c00283d 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -1,7 +1,5 @@ -/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ - /* - 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 @@ -19,14 +17,19 @@ */ +extern "C" { +#include +} #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 "exceptions.h" #include "i18n.h" @@ -35,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; @@ -48,17 +53,19 @@ FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path : Content (f, p) , VideoContent (f, p) , AudioContent (f, p) + , SubtitleContent (f, p) { } -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, 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 (); @@ -66,29 +73,51 @@ 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 (FFmpegContent const & o) - : Content (o) - , VideoContent (o) - , AudioContent (o) - , _subtitle_streams (o._subtitle_streams) - , _subtitle_stream (o._subtitle_stream) - , _audio_streams (o._audio_streams) - , _audio_stream (o._audio_stream) +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 @@ -98,6 +127,7 @@ FFmpegContent::as_xml (xmlpp::Node* node) const Content::as_xml (node); VideoContent::as_xml (node); AudioContent::as_xml (node); + SubtitleContent::as_xml (node); boost::mutex::scoped_lock lm (_mutex); @@ -120,6 +150,10 @@ FFmpegContent::as_xml (xmlpp::Node* node) const 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().get())); + } } void @@ -129,57 +163,81 @@ FFmpegContent::examine (shared_ptr job) Content::examine (job); - shared_ptr film = _film.lock (); - assert (film); + shared_ptr examiner (new FFmpegExaminer (shared_from_this ())); + take_from_video_examiner (examiner); - shared_ptr decoder (new FFmpegDecoder (film, shared_from_this (), true, false, false)); + ContentTime video_length = examiner->video_length (); - ContentVideoFrame video_length = 0; - video_length = decoder->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", decoder->video_length ())); + shared_ptr film = _film.lock (); + assert (film); + film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ()))); - { - boost::mutex::scoped_lock lm (_mutex); + { + boost::mutex::scoped_lock lm (_mutex); - _video_length = video_length; + _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 (); - } - } + _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 (); + } - take_from_video_decoder (decoder); + _first_video = examiner->first_video (); + } - 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 (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 FFmpegContent::summary () const { - return String::compose (_("Movie: %1"), 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 = _audio_stream->technical_summary (); + } + + string ss = "none"; + if (_subtitle_stream) { + ss = _subtitle_stream->technical_summary (); + } + + 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 FFmpegContent::information () const { - if (video_length() == 0 || video_frame_rate() == 0) { + if (video_length() == ContentTime (0) || video_frame_rate() == 0) { return ""; } 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().frames (video_frame_rate()), video_frame_rate()) << "\n"; s << VideoContent::information (); return s.str (); @@ -188,38 +246,36 @@ FFmpegContent::information () const void 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 (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 +ContentTime FFmpegContent::audio_length () const { - int const cafr = content_audio_frame_rate (); - int const vfr = video_frame_rate (); - ContentVideoFrame const vl = video_length (); + { + boost::mutex::scoped_lock lm (_mutex); + if (!_audio_stream) { + return ContentTime (); + } + } - boost::mutex::scoped_lock lm (_mutex); - if (!_audio_stream) { - return 0; - } - - return video_frames_to_audio_frames (vl, cafr, vfr); + return video_length(); } int @@ -227,11 +283,11 @@ FFmpegContent::audio_channels () const { boost::mutex::scoped_lock lm (_mutex); - if (!_audio_stream) { - return 0; - } + if (!_audio_stream) { + return 0; + } - return _audio_stream->channels; + return _audio_stream->channels; } int @@ -239,11 +295,11 @@ FFmpegContent::content_audio_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); - if (!_audio_stream) { - return 0; - } + if (!_audio_stream) { + return 0; + } - return _audio_stream->frame_rate; + return _audio_stream->frame_rate; } int @@ -255,83 +311,118 @@ 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); } 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; +} + +FFmpegStream::FFmpegStream (shared_ptr node) + : name (node->string_child ("Name")) + , _id (node->number_child ("Id")) +{ + +} + +void +FFmpegStream::as_xml (xmlpp::Node* root) const { - return a.id == b.id; + root->add_child("Name")->add_child_text (name); + root->add_child("Id")->add_child_text (lexical_cast (_id)); } -FFmpegAudioStream::FFmpegAudioStream (shared_ptr node) +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"); - mapping = AudioMapping (node->node_child ("Mapping")); + first_audio = node->optional_number_child ("FirstAudio"); } 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) { + root->add_child("FirstAudio")->add_child_text (lexical_cast (first_audio.get().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)); -} - -shared_ptr -FFmpegContent::clone () const -{ - return shared_ptr (new FFmpegContent (*this)); + 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 (); + return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ())); } AudioMapping @@ -363,3 +454,44 @@ 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->identifier (); + } + + for (vector::const_iterator i = _filters.begin(); i != _filters.end(); ++i) { + s << "_" << (*i)->id (); + } + + 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; +}