X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=fa2671b3697c2663060d7403863421bf72b1f04c;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=a12f45a30f81d20d6af73fb97e0b62f805a54a54;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index a12f45a30..fa2671b36 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 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,11 +17,6 @@ */ -extern "C" { -#include -} -#include -#include #include "ffmpeg_content.h" #include "ffmpeg_examiner.h" #include "ffmpeg_subtitle_stream.h" @@ -34,26 +29,30 @@ extern "C" { #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::dynamic_pointer_cast; -using dcp::raw_convert; 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 = 103; FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path p) : Content (f, p) @@ -81,9 +80,6 @@ FFmpegContent::FFmpegContent (shared_ptr f, cxml::ConstNodePtr node, 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, version))); - if ((*i)->optional_number_child ("Selected")) { - _audio_stream = _audio_streams.back (); - } } c = node->node_children ("Filter"); @@ -106,23 +102,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 (fc->subtitle_use() && *(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; } @@ -146,11 +137,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) { @@ -169,39 +156,32 @@ FFmpegContent::examine (shared_ptr job) Content::examine (job); - 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 (); - shared_ptr film = _film.lock (); - assert (film); - LOG_GENERAL ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ())); + 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 (); + _audio_streams.front()->mapping().make_default (); } _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); } string @@ -214,9 +194,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"; @@ -230,25 +214,10 @@ FFmpegContent::technical_summary () const + VideoContent::technical_summary() + " - " + AudioContent::technical_summary() + " - " + String::compose ( - "ffmpeg: audio %1, subtitle %2, filters %3", as, ss, filt + "ffmpeg: audio %1 subtitle %2 filters %3", as, ss, filt ); } -string -FFmpegContent::information () const -{ - if (video_length() == ContentTime (0) || video_frame_rate() == 0) { - return ""; - } - - stringstream s; - - s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine().frames (video_frame_rate()), video_frame_rate()) << "\n"; - s << VideoContent::information (); - - return s.str (); -} - void FFmpegContent::set_subtitle_stream (shared_ptr s) { @@ -260,51 +229,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 -{ - 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::audio_frame_rate () const -{ - boost::mutex::scoped_lock lm (_mutex); - - if (!_audio_stream) { - return 0; - } - - return _audio_stream->frame_rate; -} - bool operator== (FFmpegStream const & a, FFmpegStream const & b) { @@ -321,20 +245,9 @@ DCPTime FFmpegContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); - return DCPTime (video_length_after_3d_combine(), 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 @@ -348,17 +261,10 @@ FFmpegContent::set_filters (vector const & filters) signal_changed (FFmpegContentProperty::FILTERS); } -void -FFmpegContent::set_audio_mapping (AudioMapping m) -{ - audio_stream()->mapping = m; - AudioContent::set_audio_mapping (m); -} - string FFmpegContent::identifier () const { - stringstream s; + SafeStringStream s; s << VideoContent::identifier(); @@ -375,41 +281,43 @@ FFmpegContent::identifier () const return s.str (); } -boost::filesystem::path -FFmpegContent::audio_analysis_path () const +list +FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const { - shared_ptr film = _film.lock (); - if (!film) { - return boost::filesystem::path (); + shared_ptr stream = subtitle_stream (); + if (!stream) { + return list (); } - /* 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; + return stream->subtitles_during (period, starting); } bool -FFmpegContent::has_subtitle_during (ContentTimePeriod period) const +FFmpegContent::has_subtitles () const { - shared_ptr stream = subtitle_stream (); - if (!stream) { - return false; - } + return !subtitle_streams().empty (); +} - /* XXX: inefficient */ - for (vector::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) { - if (i->from <= period.to && i->to >= period.from) { - return true; - } +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; } +} - return false; +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; }