X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=dc26a1a7e17655f6f91521862a86cd8f6ac67bc7;hb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c;hp=98171a8433ec768fda8ce9bd6bed99ebd8fe9d9f;hpb=a2e3a20a441e604550f0036ca198d5d2122e16a7;p=dcpomatic.git diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 98171a843..dc26a1a7e 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 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,42 +17,50 @@ */ -#include #include "sndfile_content.h" #include "sndfile_decoder.h" +#include "sndfile_examiner.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 boost::shared_ptr; -using boost::lexical_cast; - -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) + , SingleStreamAudioContent (film, p) { } -SndfileContent::SndfileContent (shared_ptr f, shared_ptr node, int version) - : Content (f, node) - , AudioContent (f, node) - , _audio_mapping (node->node_child ("AudioMapping"), version) +SndfileContent::SndfileContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) + , SingleStreamAudioContent (film, node, version) + , _audio_length (node->number_child ("AudioLength")) { - _audio_channels = node->number_child ("AudioChannels"); - _audio_length = node->number_child ("AudioLength"); - _audio_frame_rate = node->number_child ("AudioFrameRate"); + } +void +SndfileContent::as_xml (xmlpp::Node* node) const +{ + node->add_child("Type")->add_child_text ("Sndfile"); + Content::as_xml (node); + SingleStreamAudioContent::as_xml (node); + node->add_child("AudioLength")->add_child_text (raw_convert (audio_length ())); +} + + string SndfileContent::summary () const { @@ -68,32 +76,13 @@ SndfileContent::technical_summary () const + " - sndfile"; } -string -SndfileContent::information () const -{ - if (_audio_frame_rate == 0) { - return ""; - } - - stringstream s; - - s << String::compose ( - _("%1 channels, %2kHz, %3 samples"), - audio_channels(), - content_audio_frame_rate() / 1000.0, - audio_length() - ); - - 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 @@ -101,79 +90,24 @@ SndfileContent::examine (shared_ptr job) { job->set_progress_unknown (); Content::examine (job); - - shared_ptr film = _film.lock (); - assert (film); - - SndfileDecoder dec (film, 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 (); - } - - 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); + shared_ptr dec (new SndfileExaminer (shared_from_this ())); + take_from_audio_examiner (dec); } void -SndfileContent::as_xml (xmlpp::Node* node) const +SndfileContent::take_from_audio_examiner (shared_ptr examiner) { - node->add_child("Type")->add_child_text ("Sndfile"); - Content::as_xml (node); - AudioContent::as_xml (node); + SingleStreamAudioContent::take_from_audio_examiner (examiner); - node->add_child("AudioChannels")->add_child_text (lexical_cast (audio_channels ())); - node->add_child("AudioLength")->add_child_text (lexical_cast (audio_length ())); - node->add_child("AudioFrameRate")->add_child_text (lexical_cast (content_audio_frame_rate ())); - _audio_mapping.as_xml (node->add_child("AudioMapping")); + boost::mutex::scoped_lock lm (_mutex); + _audio_length = examiner->audio_length (); } -Time +DCPTime SndfileContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); - - OutputAudioFrame const len = divide_with_round (audio_length() * output_audio_frame_rate(), content_audio_frame_rate ()); - - /* XXX: this depends on whether, alongside this audio, we are running video slower or faster than - it should be. The calculation above works out the output audio frames assuming that we are just - resampling the audio: it would be incomplete if, for example, we were running this audio alongside - 25fps video that was being run at 24fps. - */ - - return film->audio_frames_to_time (len); -} - -int -SndfileContent::output_audio_frame_rate () const -{ - shared_ptr film = _film.lock (); - assert (film); - - return film->audio_frame_rate (); -} - -void -SndfileContent::set_audio_mapping (AudioMapping m) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _audio_mapping = m; - } - - signal_changed (AudioContentProperty::AUDIO_MAPPING); + DCPOMATIC_ASSERT (film); + FrameRateChange const frc = film->active_frame_rate_change (position ()); + return DCPTime::from_frames (audio_length() / frc.speed_up, audio_stream()->frame_rate ()); }