X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=da9f9822ec6644f8a9ae8b034cd6653d90701dee;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=ca175912b31c0b7969933622d2b49751b0b2bece;hpb=615762376308039521e8030797d496ad8d09206e;p=dcpomatic.git diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index ca175912b..da9f9822e 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -1,28 +1,35 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 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 "audio_mapping.h" +#include "audio_processor.h" +#include "digester.h" #include "util.h" -#include "md5_digester.h" -#include "raw_convert.h" +#include "warnings.h" +#include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS +#include +#include using std::list; using std::cout; @@ -32,8 +39,10 @@ using std::string; using std::min; using std::vector; using std::abs; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using boost::optional; +using dcp::raw_convert; AudioMapping::AudioMapping () : _input_channels (0) @@ -56,7 +65,7 @@ AudioMapping::setup (int input_channels, int output_channels) { _input_channels = input_channels; _output_channels = output_channels; - + _gain.resize (_input_channels); for (int i = 0; i < _input_channels; ++i) { _gain[i].resize (_output_channels); @@ -75,6 +84,67 @@ AudioMapping::make_zero () } } +struct ChannelRegex +{ + ChannelRegex (string regex_, int channel_) + : regex (regex_) + , channel (channel_) + {} + + string regex; + int channel; +}; + +void +AudioMapping::make_default (AudioProcessor const * processor, optional filename) +{ + static ChannelRegex const regex[] = { + ChannelRegex(".*[\\._-]L[\\._-].*", 0), + ChannelRegex(".*[\\._-]R[\\._-].*", 1), + ChannelRegex(".*[\\._-]C[\\._-].*", 2), + ChannelRegex(".*[\\._-]Lfe[\\._-].*", 3), + ChannelRegex(".*[\\._-]LFE[\\._-].*", 3), + ChannelRegex(".*[\\._-]Lss[\\._-].*", 4), + ChannelRegex(".*[\\._-]Lsr[\\._-].*", 6), + ChannelRegex(".*[\\._-]Ls[\\._-].*", 4), + ChannelRegex(".*[\\._-]Rss[\\._-].*", 5), + ChannelRegex(".*[\\._-]Rsr[\\._-].*", 7), + ChannelRegex(".*[\\._-]Rs[\\._-].*", 5), + }; + + static int const regexes = sizeof(regex) / sizeof(*regex); + + if (processor) { + processor->make_audio_mapping_default (*this); + } else { + make_zero (); + if (input_channels() == 1) { + bool guessed = false; + + /* See if we can guess where this stream should go */ + if (filename) { + for (int i = 0; i < regexes; ++i) { + boost::regex e (regex[i].regex, boost::regex::icase); + if (boost::regex_match(filename->string(), e) && regex[i].channel < output_channels()) { + set (0, regex[i].channel, 1); + guessed = true; + } + } + } + + if (!guessed) { + /* If we have no idea, just put it on centre */ + set (0, static_cast(dcp::CENTRE), 1); + } + } else { + /* 1:1 mapping */ + for (int i = 0; i < min (input_channels(), output_channels()); ++i) { + set (i, i, 1); + } + } + } +} + AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version) { if (state_version < 32) { @@ -112,12 +182,16 @@ AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version) void AudioMapping::set (int input_channel, int output_channel, float g) { + DCPOMATIC_ASSERT (input_channel < int(_gain.size())); + DCPOMATIC_ASSERT (output_channel < int(_gain[0].size())); _gain[input_channel][output_channel] = g; } float AudioMapping::get (int input_channel, int output_channel) const { + DCPOMATIC_ASSERT (input_channel < int (_gain.size())); + DCPOMATIC_ASSERT (output_channel < int (_gain[0].size())); return _gain[input_channel][output_channel]; } @@ -143,7 +217,7 @@ AudioMapping::as_xml (xmlpp::Node* node) const string AudioMapping::digest () const { - MD5Digester digester; + Digester digester; digester.add (_input_channels); digester.add (_output_channels); for (int i = 0; i < _input_channels; ++i) { @@ -161,9 +235,9 @@ AudioMapping::mapped_output_channels () const static float const minus_96_db = 0.000015849; list mapped; - + for (vector >::const_iterator i = _gain.begin(); i != _gain.end(); ++i) { - for (size_t j = 0; j < i->size(); ++j) { + for (auto j: dcp::used_audio_channels()) { if (abs ((*i)[j]) > minus_96_db) { mapped.push_back (j); } @@ -172,7 +246,7 @@ AudioMapping::mapped_output_channels () const mapped.sort (); mapped.unique (); - + return mapped; }