projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
audio_filter_test.cc
diff --git
a/test/audio_filter_test.cc
b/test/audio_filter_test.cc
index bcd16fd4e607c7974dcadfe6023a007d544cef85..0ad91dddeab9bf5ff28fe495f647561f197adbfe 100644
(file)
--- a/
test/audio_filter_test.cc
+++ b/
test/audio_filter_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
@@
-21,11
+22,13
@@
* @brief Basic tests of audio filters.
*/
* @brief Basic tests of audio filters.
*/
-#include <boost/test/unit_test.hpp>
#include "lib/audio_filter.h"
#include "lib/audio_buffers.h"
#include "lib/audio_filter.h"
#include "lib/audio_buffers.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
using boost::shared_ptr;
using boost::shared_ptr;
+using boost::make_shared;
static void
audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks)
static void
audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks)
@@
-34,13
+37,13
@@
audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks)
for (int i = 0; i < num_blocks; ++i) {
for (int i = 0; i < num_blocks; ++i) {
- shared_ptr<AudioBuffers> in
(new AudioBuffers (1, block_size)
);
+ shared_ptr<AudioBuffers> in
= make_shared<AudioBuffers> (1, block_size
);
for (int j = 0; j < block_size; ++j) {
in->data()[0][j] = c + j;
}
shared_ptr<AudioBuffers> out = f.run (in);
for (int j = 0; j < block_size; ++j) {
in->data()[0][j] = c + j;
}
shared_ptr<AudioBuffers> out = f.run (in);
-
+
for (int j = 0; j < out->frames(); ++j) {
BOOST_CHECK_EQUAL (out->data()[0][j], c + j);
}
for (int j = 0; j < out->frames(); ++j) {
BOOST_CHECK_EQUAL (out->data()[0][j], c + j);
}
@@
-55,7
+58,8
@@
audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks)
BOOST_AUTO_TEST_CASE (audio_filter_impulse_kernel_test)
{
AudioFilter f (0.02);
BOOST_AUTO_TEST_CASE (audio_filter_impulse_kernel_test)
{
AudioFilter f (0.02);
- f._ir.resize (f._M + 1);
+ delete[] f._ir;
+ f._ir = new float[f._M + 1];
f._ir[0] = 1;
for (int i = 1; i <= f._M; ++i) {
f._ir[0] = 1;
for (int i = 1; i <= f._M; ++i) {
@@
-74,10
+78,10
@@
BOOST_AUTO_TEST_CASE (audio_filter_impulse_input_test)
{
LowPassAudioFilter lpf (0.02, 0.3);
{
LowPassAudioFilter lpf (0.02, 0.3);
- shared_ptr<AudioBuffers> in
(new AudioBuffers (1, 1751)
);
+ shared_ptr<AudioBuffers> in
= make_shared<AudioBuffers> (1, 1751
);
in->make_silent ();
in->data(0)[0] = 1;
in->make_silent ();
in->data(0)[0] = 1;
-
+
shared_ptr<AudioBuffers> out = lpf.run (in);
for (int j = 0; j < out->frames(); ++j) {
if (j <= lpf._M) {
shared_ptr<AudioBuffers> out = lpf.run (in);
for (int j = 0; j < out->frames(); ++j) {
if (j <= lpf._M) {
@@
-92,7
+96,7
@@
BOOST_AUTO_TEST_CASE (audio_filter_impulse_input_test)
in.reset (new AudioBuffers (1, 9133));
in->make_silent ();
in->data(0)[0] = 1;
in.reset (new AudioBuffers (1, 9133));
in->make_silent ();
in->data(0)[0] = 1;
-
+
out = hpf.run (in);
for (int j = 0; j < out->frames(); ++j) {
if (j <= hpf._M) {
out = hpf.run (in);
for (int j = 0; j < out->frames(); ++j) {
if (j <= hpf._M) {