projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop using static initialisation so that dcpomatic::write() can be called more than...
[dcpomatic.git]
/
src
/
lib
/
upmixer_b.cc
diff --git
a/src/lib/upmixer_b.cc
b/src/lib/upmixer_b.cc
index 19f0dfed143ed5f1acd47e8589e61ad58b9dbe06..3b0c2d94f8c7e55ce2196a61e31e6c1f7f9290ee 100644
(file)
--- a/
src/lib/upmixer_b.cc
+++ b/
src/lib/upmixer_b.cc
@@
-1,40
+1,46
@@
/*
/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015
-2021
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
+
#include "upmixer_b.h"
#include "audio_buffers.h"
#include "audio_mapping.h"
#include "i18n.h"
#include "upmixer_b.h"
#include "audio_buffers.h"
#include "audio_mapping.h"
#include "i18n.h"
+
using std::string;
using std::string;
+using std::make_shared;
using std::min;
using std::vector;
using std::min;
using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
+
UpmixerB::UpmixerB (int sampling_rate)
UpmixerB::UpmixerB (int sampling_rate)
- : _lfe (0.0
02
, 150.0 / sampling_rate)
+ : _lfe (0.0
1
, 150.0 / sampling_rate)
, _delay (0.02 * sampling_rate)
{
}
, _delay (0.02 * sampling_rate)
{
}
+
string
UpmixerB::name () const
{
string
UpmixerB::name () const
{
@@
-48,26
+54,29
@@
UpmixerB::id () const
return N_("stereo-5.1-upmix-b");
}
return N_("stereo-5.1-upmix-b");
}
+
int
UpmixerB::out_channels () const
{
return 6;
}
int
UpmixerB::out_channels () const
{
return 6;
}
+
shared_ptr<AudioProcessor>
UpmixerB::clone (int sampling_rate) const
{
shared_ptr<AudioProcessor>
UpmixerB::clone (int sampling_rate) const
{
- return
shared_ptr<AudioProcessor> (new UpmixerB (sampling_rate)
);
+ return
make_shared<UpmixerB>(sampling_rate
);
}
}
+
shared_ptr<AudioBuffers>
UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
{
shared_ptr<AudioBuffers>
UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
{
-
shared_ptr<AudioBuffers> out (new AudioBuffers (channels, in->frames()
));
+
auto out = make_shared<AudioBuffers>(channels, in->frames(
));
/* L + R minus 6dB (in terms of amplitude) */
/* L + R minus 6dB (in terms of amplitude) */
-
shared_ptr<AudioBuffers>
in_LR = in->channel(0);
- in_LR->accumulate_frames (in->channel(1).get(),
0, 0, in->frames()
);
+
auto
in_LR = in->channel(0);
+ in_LR->accumulate_frames (in->channel(1).get(),
in->frames(), 0, 0
);
in_LR->apply_gain (-6);
if (channels > 0) {
in_LR->apply_gain (-6);
if (channels > 0) {
@@
-93,7
+102,7
@@
UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
shared_ptr<AudioBuffers> S;
if (channels > 4) {
/* Ls is L - R with some delay */
shared_ptr<AudioBuffers> S;
if (channels > 4) {
/* Ls is L - R with some delay */
-
shared_ptr<AudioBuffers> sub (new AudioBuffers (1, in->frames()
));
+
auto sub = make_shared<AudioBuffers>(1, in->frames(
));
sub->copy_channel_from (in.get(), 0, 0);
float* p = sub->data (0);
float const * q = in->data (1);
sub->copy_channel_from (in.get(), 0, 0);
float* p = sub->data (0);
float const * q = in->data (1);
@@
-112,6
+121,7
@@
UpmixerB::run (shared_ptr<const AudioBuffers> in, int channels)
return out;
}
return out;
}
+
void
UpmixerB::flush ()
{
void
UpmixerB::flush ()
{
@@
-119,6
+129,7
@@
UpmixerB::flush ()
_delay.flush ();
}
_delay.flush ();
}
+
void
UpmixerB::make_audio_mapping_default (AudioMapping& mapping) const
{
void
UpmixerB::make_audio_mapping_default (AudioMapping& mapping) const
{
@@
-129,11
+140,12
@@
UpmixerB::make_audio_mapping_default (AudioMapping& mapping) const
}
}
}
}
-vector<string>
+
+vector<NamedChannel>
UpmixerB::input_names () const
{
UpmixerB::input_names () const
{
- vector<string> n;
- n.push_back (_("Upmix L"));
- n.push_back (_("Upmix R"));
-
return n
;
+ return {
+ NamedChannel(_("Upmix L"), 0),
+ NamedChannel(_("Upmix R"), 1)
+
}
;
}
}