X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=bd5648ecbc2a6d4166096c289d135562b87ca126;hb=79ce26d031d109177ba4b0f637fa2960345a37a3;hp=3bee49146a5304024d083c6138b00e8332012390;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 3bee49146..bd5648ecb 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 @@ -60,13 +60,13 @@ FFmpegContent::FFmpegContent (shared_ptr f, boost::filesystem::path FFmpegContent::FFmpegContent (shared_ptr f, shared_ptr node, int version) : 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) { - _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i, version))); + _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (*i))); if ((*i)->optional_number_child ("Selected")) { _subtitle_stream = _subtitle_streams.back (); } @@ -163,9 +163,8 @@ FFmpegContent::examine (shared_ptr job) shared_ptr examiner (new FFmpegExaminer (shared_from_this ())); - VideoFrame video_length = 0; - video_length = examiner->video_length (); - film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length)); + ContentTime video_length = examiner->video_length (); + 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); @@ -207,12 +206,12 @@ 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); @@ -228,7 +227,7 @@ FFmpegContent::technical_summary () const string FFmpegContent::information () const { - if (video_length() == 0 || video_frame_rate() == 0) { + if (video_length() == ContentTime (0) || video_frame_rate() == ContentTime (0)) { return ""; } @@ -262,19 +261,17 @@ FFmpegContent::set_audio_stream (shared_ptr s) signal_changed (FFmpegContentProperty::AUDIO_STREAM); } -AudioFrame +ContentTime FFmpegContent::audio_length () const { - int const cafr = content_audio_frame_rate (); - int const vfr = video_frame_rate (); - VideoFrame const vl = video_length (); - - boost::mutex::scoped_lock lm (_mutex); - if (!_audio_stream) { - return 0; + { + boost::mutex::scoped_lock lm (_mutex); + if (!_audio_stream) { + return ContentTime (); + } } - - return video_frames_to_audio_frames (vl, cafr, vfr); + + return video_length(); } int @@ -325,54 +322,33 @@ FFmpegContent::output_audio_frame_rate () const } bool -operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b) -{ - return a.id == b.id; -} - -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; } -bool -operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b) +FFmpegStream::FFmpegStream (shared_ptr node) + : name (node->string_child ("Name")) + , _id (node->number_child ("Id")) { - 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"); - } + root->add_child("Id")->add_child_text (lexical_cast (_id)); } FFmpegAudioStream::FFmpegAudioStream (shared_ptr node, int version) - : FFmpegStream (node, version) + : FFmpegStream (node) , mapping (node->node_child ("Mapping"), version) { frame_rate = node->number_child ("FrameRate"); @@ -392,34 +368,26 @@ FFmpegAudioStream::as_xml (xmlpp::Node* root) const mapping.as_xml (root->add_child("Mapping")); } -int -FFmpegStream::index (AVFormatContext const * fc) const +bool +FFmpegStream::uses_index (AVFormatContext const * fc, int index) const { - if (_legacy_id) { - return id; - } - size_t i = 0; while (i < fc->nb_streams) { - if (fc->streams[i]->id == id) { - return i; + if (fc->streams[i]->id == _id) { + return int (i) == index; } ++i; } - assert (false); + return 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) { + if (fc->streams[i]->id == _id) { return fc->streams[i]; } ++i; @@ -433,8 +401,8 @@ FFmpegStream::stream (AVFormatContext const * fc) const * @param t String returned from to_string(). * @param v State file version. */ -FFmpegSubtitleStream::FFmpegSubtitleStream (shared_ptr node, int version) - : FFmpegStream (node, version) +FFmpegSubtitleStream::FFmpegSubtitleStream (shared_ptr node) + : FFmpegStream (node) { } @@ -450,9 +418,7 @@ FFmpegContent::full_length () const { shared_ptr film = _film.lock (); assert (film); - - FrameRateChange frc (video_frame_rate (), film->video_frame_rate ()); - return video_length() * frc.factor() * TIME_HZ / film->video_frame_rate (); + return DCPTime (video_length(), FrameRateChange (video_frame_rate (), film->video_frame_rate ())); } AudioMapping @@ -495,7 +461,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) {