X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_mapping.cc;h=4e2e29363516f6a8b1bcb52772799de022ee0e32;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=2e807756566ec31a068437b99ec7038117f75880;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 2e8077565..4e2e29363 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.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,115 +17,172 @@ */ -#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; -void -AudioMapping::add (Channel c, libdcp::Channel d) +AudioMapping::AudioMapping () + : _input_channels (0) + , _output_channels (0) { - _content_to_dcp.push_back (make_pair (c, d)); + } -/* XXX: this is grotty */ -int -AudioMapping::dcp_channels () const +/** Create an empty AudioMapping. + * @param input_channels Number of input channels. + * @param output_channels Number of output channels. + */ +AudioMapping::AudioMapping (int input_channels, int output_channels) { - for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { - if (((int) i->second) >= 2) { - return 6; - } - } - - return 2; + setup (input_channels, output_channels); } -list -AudioMapping::dcp_to_content (libdcp::Channel d) const +void +AudioMapping::setup (int input_channels, int output_channels) { - list c; - for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { - if (i->second == d) { - c.push_back (i->first); - } + _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); } - return c; + make_zero (); } -list -AudioMapping::content_channels () const +void +AudioMapping::make_zero () { - list c; - for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { - if (find (c.begin(), c.end(), i->first) == c.end ()) { - c.push_back (i->first); + for (int i = 0; i < _input_channels; ++i) { + for (int j = 0; j < _output_channels; ++j) { + _gain[i][j] = 0; } } - - return c; } -list -AudioMapping::content_to_dcp (Channel c) const +AudioMapping::AudioMapping (cxml::ConstNodePtr node, int state_version) { - list d; - for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { - if (i->first == c) { - d.push_back (i->second); + 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 */ + list const c = node->node_children ("Map"); + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { + set ((*i)->number_child ("ContentIndex"), static_cast ((*i)->number_child ("DCP")), 1); + } + } else { + list const c = node->node_children ("Gain"); + for (list::const_iterator i = c.begin(); i != c.end(); ++i) { + 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 input_channel, int output_channel, float g) +{ + _gain[input_channel][output_channel] = g; +} - return d; +float +AudioMapping::get (int input_channel, int output_channel) const +{ + return _gain[input_channel][output_channel]; } void AudioMapping::as_xml (xmlpp::Node* node) const { - for (list >::const_iterator i = _content_to_dcp.begin(); i != _content_to_dcp.end(); ++i) { - xmlpp::Node* t = node->add_child ("Map"); - shared_ptr c = i->first.content.lock (); - t->add_child ("Content")->add_child_text (c->file().string ()); - t->add_child ("ContentIndex")->add_child_text (lexical_cast (i->first.index)); - t->add_child ("DCP")->add_child_text (lexical_cast (i->second)); + 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 < _input_channels; ++c) { + for (int d = 0; d < _output_channels; ++d) { + xmlpp::Element* t = node->add_child ("Gain"); + t->set_attribute ("Input", raw_convert (c)); + t->set_attribute ("Output", raw_convert (d)); + t->add_child_text (raw_convert (get (c, d))); + } } } -void -AudioMapping::set_from_xml (ContentList const & content, shared_ptr node) +/** @return a string which is unique for a given AudioMapping configuration, for + * differentiation between different AudioMappings. + */ +string +AudioMapping::digest () const { - list > const c = node->node_children ("Map"); - for (list >::const_iterator i = c.begin(); i != c.end(); ++i) { - string const c = (*i)->string_child ("Content"); - ContentList::const_iterator j = content.begin (); - while (j != content.end() && (*j)->file().string() != c) { - ++j; + 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]); } + } - if (j == content.end ()) { - continue; - } + return digester.get (); +} - shared_ptr ac = dynamic_pointer_cast (*j); - assert (ac); +list +AudioMapping::mapped_output_channels () const +{ + static float const minus_96_db = 0.000015849; + + list mapped; - add (AudioMapping::Channel (ac, (*i)->number_child ("ContentIndex")), static_cast ((*i)->number_child ("DCP"))); + 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; } -bool -operator== (AudioMapping::Channel const & a, AudioMapping::Channel const & b) +void +AudioMapping::unmap_all () { - shared_ptr sa = a.content.lock (); - shared_ptr sb = b.content.lock (); - return sa == sb && a.index == b.index; + for (vector >::iterator i = _gain.begin(); i != _gain.end(); ++i) { + for (vector::iterator j = i->begin(); j != i->end(); ++j) { + *j = 0; + } + } }