projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a log message and actually use device_for_write().
[dcpomatic.git]
/
src
/
lib
/
mid_side_decoder.cc
diff --git
a/src/lib/mid_side_decoder.cc
b/src/lib/mid_side_decoder.cc
index 842d5c8ee56d066b49a2e631cfa73cabd7eb5d88..b9b8dd098c9459e2524de2633c36520632631956 100644
(file)
--- a/
src/lib/mid_side_decoder.cc
+++ b/
src/lib/mid_side_decoder.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 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/>.
*/
*/
@@
-40,12
+41,6
@@
MidSideDecoder::id () const
return N_("mid-side-decoder");
}
return N_("mid-side-decoder");
}
-ChannelCount
-MidSideDecoder::in_channels () const
-{
- return ChannelCount (2);
-}
-
int
MidSideDecoder::out_channels () const
{
int
MidSideDecoder::out_channels () const
{
@@
-59,16
+54,27
@@
MidSideDecoder::clone (int) const
}
shared_ptr<AudioBuffers>
}
shared_ptr<AudioBuffers>
-MidSideDecoder::run (shared_ptr<const AudioBuffers> in)
+MidSideDecoder::run (shared_ptr<const AudioBuffers> in
, int channels
)
{
{
- shared_ptr<AudioBuffers> out (new AudioBuffers (3, in->frames ()));
+ int const N = min (channels, 3);
+ shared_ptr<AudioBuffers> out (new AudioBuffers (channels, in->frames ()));
for (int i = 0; i < in->frames(); ++i) {
float const left = in->data()[0][i];
float const right = in->data()[1][i];
float const mid = (left + right) / 2;
for (int i = 0; i < in->frames(); ++i) {
float const left = in->data()[0][i];
float const right = in->data()[1][i];
float const mid = (left + right) / 2;
- out->data()[0][i] = left - mid;
- out->data()[1][i] = right - mid;
- out->data()[2][i] = mid;
+ if (N > 0) {
+ out->data()[0][i] = left - mid;
+ }
+ if (N > 1) {
+ out->data()[1][i] = right - mid;
+ }
+ if (N > 2) {
+ out->data()[2][i] = mid;
+ }
+ }
+
+ for (int i = N; i < channels; ++i) {
+ out->make_silent (i);
}
return out;
}
return out;