X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=3a402a11de507a3815b5fba438b2b7196ec9045a;hp=1db827046946a8008d54bff21597d4fd1d201bff;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=1629bd7df2150156109afbc7a16677cb29e82adf diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 1db827046..3a402a11d 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -1,85 +1,89 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 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 #include "audio_mapping.h" #include "util.h" +#include "md5_digester.h" +#include "raw_convert.h" +#include +#include +#include using std::list; using std::cout; using std::make_pair; using std::pair; using std::string; +using std::min; +using std::vector; +using std::abs; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; AudioMapping::AudioMapping () - : _content_channels (0) + : _input_channels (0) + , _output_channels (0) { } -/** Create a default AudioMapping for a given channel count. - * @param c Number of channels. +/** Create an empty AudioMapping. + * @param input_channels Number of input channels. + * @param output_channels Number of output channels. */ -AudioMapping::AudioMapping (int c) +AudioMapping::AudioMapping (int input_channels, int output_channels) { - setup (c); + setup (input_channels, output_channels); } void -AudioMapping::setup (int c) +AudioMapping::setup (int input_channels, int output_channels) { - _content_channels = c; - - _gain.resize (_content_channels); - for (int i = 0; i < _content_channels; ++i) { - _gain[i].resize (MAX_AUDIO_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); } + + make_zero (); } void -AudioMapping::make_default () +AudioMapping::make_zero () { - for (int i = 0; i < _content_channels; ++i) { - for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) { + for (int i = 0; i < _input_channels; ++i) { + for (int j = 0; j < _output_channels; ++j) { _gain[i][j] = 0; } } - - if (_content_channels == 1) { - /* Mono -> Centre */ - set (0, dcp::CENTRE, 1); - } else { - /* 1:1 mapping */ - for (int i = 0; i < _content_channels; ++i) { - set (i, static_cast (i), 1); - } - } } -AudioMapping::AudioMapping (shared_ptr node, int state_version) +AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version) { - setup (node->number_child ("ContentChannels")); + if (state_version < 32) { + setup (node->number_child ("ContentChannels"), MAX_DCP_AUDIO_CHANNELS); + } else { + setup (node->number_child ("InputChannels"), node->number_child ("OutputChannels")); + } if (state_version <= 5) { /* Old-style: on/off mapping */ @@ -90,38 +94,98 @@ AudioMapping::AudioMapping (shared_ptr node, int state_version } else { list const c = node->node_children ("Gain"); for (list::const_iterator i = c.begin(); i != c.end(); ++i) { - set ( - (*i)->number_attribute ("Content"), - static_cast ((*i)->number_attribute ("DCP")), - lexical_cast ((*i)->content ()) - ); + if (state_version < 32) { + set ( + (*i)->number_attribute ("Content"), + static_cast ((*i)->number_attribute ("DCP")), + raw_convert ((*i)->content ()) + ); + } else { + set ( + (*i)->number_attribute ("Input"), + (*i)->number_attribute ("Output"), + raw_convert ((*i)->content ()) + ); + } } } } void -AudioMapping::set (int c, dcp::Channel d, float g) +AudioMapping::set (int input_channel, int output_channel, float g) { - _gain[c][d] = g; + _gain[input_channel][output_channel] = g; } float -AudioMapping::get (int c, dcp::Channel d) const +AudioMapping::get (int input_channel, int output_channel) const { - return _gain[c][d]; + DCPOMATIC_ASSERT (input_channel < int (_gain.size())); + DCPOMATIC_ASSERT (output_channel < int (_gain[0].size())); + return _gain[input_channel][output_channel]; } void AudioMapping::as_xml (xmlpp::Node* node) const { - node->add_child ("ContentChannels")->add_child_text (lexical_cast (_content_channels)); + node->add_child ("InputChannels")->add_child_text (raw_convert (_input_channels)); + node->add_child ("OutputChannels")->add_child_text (raw_convert (_output_channels)); - for (int c = 0; c < _content_channels; ++c) { - for (int d = 0; d < MAX_AUDIO_CHANNELS; ++d) { + for (int c = 0; c < _input_channels; ++c) { + for (int d = 0; d < _output_channels; ++d) { xmlpp::Element* t = node->add_child ("Gain"); - t->set_attribute ("Content", lexical_cast (c)); - t->set_attribute ("DCP", lexical_cast (d)); - t->add_child_text (lexical_cast (get (c, static_cast (d)))); + t->set_attribute ("Input", raw_convert (c)); + t->set_attribute ("Output", raw_convert (d)); + t->add_child_text (raw_convert (get (c, d))); + } + } +} + +/** @return a string which is unique for a given AudioMapping configuration, for + * differentiation between different AudioMappings. + */ +string +AudioMapping::digest () const +{ + MD5Digester digester; + digester.add (_input_channels); + digester.add (_output_channels); + for (int i = 0; i < _input_channels; ++i) { + for (int j = 0; j < _output_channels; ++j) { + digester.add (_gain[i][j]); + } + } + + return digester.get (); +} + +list +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) { + if (abs ((*i)[j]) > minus_96_db) { + mapped.push_back (j); + } + } + } + + mapped.sort (); + mapped.unique (); + + return mapped; +} + +void +AudioMapping::unmap_all () +{ + for (vector >::iterator i = _gain.begin(); i != _gain.end(); ++i) { + for (vector::iterator j = i->begin(); j != i->end(); ++j) { + *j = 0; } } }