X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=647fc9b6241b6324a0d5bc01604c024bb3604a64;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=cad5eb8e73704d2ba15bdf6d2b0a58210c112ade;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index cad5eb8e7..647fc9b62 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -1,59 +1,84 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include #include "sndfile_content.h" #include "sndfile_decoder.h" +#include "sndfile_examiner.h" +#include "audio_content.h" #include "film.h" #include "compose.hpp" #include "job.h" #include "util.h" +#include "safe_stringstream.h" +#include "raw_convert.h" +#include +#include +#include #include "i18n.h" using std::string; -using std::stringstream; using std::cout; +using std::vector; using boost::shared_ptr; -using dcp::raw_convert; - -SndfileContent::SndfileContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) - , AudioContent (f, p) - , _audio_channels (0) - , _audio_length (0) - , _audio_frame_rate (0) + +SndfileContent::SndfileContent (shared_ptr film, boost::filesystem::path p) + : Content (film, p) { + audio.reset (new AudioContent (this)); +} +SndfileContent::SndfileContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) +{ + audio = AudioContent::from_xml (this, node); + + if (audio) { + audio->set_stream ( + AudioStreamPtr ( + new AudioStream ( + node->number_child ("AudioFrameRate"), + node->number_child ("AudioLength"), + AudioMapping (node->node_child ("AudioMapping"), version) + ) + ) + ); + } } -SndfileContent::SndfileContent (shared_ptr f, shared_ptr node, int version) - : Content (f, node) - , AudioContent (f, node) - , _audio_mapping (node->node_child ("AudioMapping"), version) +void +SndfileContent::as_xml (xmlpp::Node* node) const { - _audio_channels = node->number_child ("AudioChannels"); - _audio_length = ContentTime (node->number_child ("AudioLength")); - _audio_frame_rate = node->number_child ("AudioFrameRate"); + node->add_child("Type")->add_child_text ("Sndfile"); + + Content::as_xml (node); + + if (audio) { + audio->as_xml (node); + node->add_child("AudioFrameRate")->add_child_text (raw_convert (audio->stream()->frame_rate ())); + node->add_child("AudioLength")->add_child_text (raw_convert (audio->stream()->length ())); + audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); + } } + string SndfileContent::summary () const { @@ -65,36 +90,17 @@ string SndfileContent::technical_summary () const { return Content::technical_summary() + " - " - + AudioContent::technical_summary () + + audio->technical_summary () + " - sndfile"; } -string -SndfileContent::information () const -{ - if (_audio_frame_rate == 0) { - return ""; - } - - stringstream s; - - s << String::compose ( - _("%1 channels, %2kHz, %3 samples"), - audio_channels(), - audio_frame_rate() / 1000.0, - audio_length().frames (audio_frame_rate ()) - ); - - return s.str (); -} - bool SndfileContent::valid_file (boost::filesystem::path f) { /* XXX: more extensions */ string ext = f.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - return (ext == ".wav" || ext == ".aif" || ext == ".aiff"); + return (ext == ".wav" || ext == ".w64" || ext == ".flac" || ext == ".aif" || ext == ".aiff"); } void @@ -102,59 +108,23 @@ SndfileContent::examine (shared_ptr job) { job->set_progress_unknown (); Content::examine (job); - - SndfileDecoder dec (shared_from_this()); + shared_ptr ex (new SndfileExaminer (shared_from_this ())); { boost::mutex::scoped_lock lm (_mutex); - _audio_channels = dec.audio_channels (); - _audio_length = dec.audio_length (); - _audio_frame_rate = dec.audio_frame_rate (); + AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_length(), ex->audio_channels ())); + audio->set_stream (as); + AudioMapping m = as->mapping (); + film()->make_audio_mapping_default (m); + as->set_mapping (m); } - signal_changed (AudioContentProperty::AUDIO_CHANNELS); - signal_changed (AudioContentProperty::AUDIO_LENGTH); - signal_changed (AudioContentProperty::AUDIO_FRAME_RATE); - - { - boost::mutex::scoped_lock lm (_mutex); - /* XXX: do this in signal_changed...? */ - _audio_mapping = AudioMapping (_audio_channels); - _audio_mapping.make_default (); - } - - signal_changed (AudioContentProperty::AUDIO_MAPPING); -} - -void -SndfileContent::as_xml (xmlpp::Node* node) const -{ - node->add_child("Type")->add_child_text ("Sndfile"); - Content::as_xml (node); - AudioContent::as_xml (node); - - node->add_child("AudioChannels")->add_child_text (raw_convert (audio_channels ())); - node->add_child("AudioLength")->add_child_text (raw_convert (audio_length().get ())); - node->add_child("AudioFrameRate")->add_child_text (raw_convert (audio_frame_rate ())); - _audio_mapping.as_xml (node->add_child("AudioMapping")); + signal_changed (AudioContentProperty::STREAMS); } DCPTime SndfileContent::full_length () const { - shared_ptr film = _film.lock (); - assert (film); - return DCPTime (audio_length(), film->active_frame_rate_change (position ())); -} - -void -SndfileContent::set_audio_mapping (AudioMapping m) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _audio_mapping = m; - } - - AudioContent::set_audio_mapping (m); + FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate()); + return DCPTime::from_frames (audio->stream()->length() / frc.speed_up, audio->stream()->frame_rate ()); } -