projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://main.carlh.net/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
test
/
resampler_test.cc
diff --git
a/test/resampler_test.cc
b/test/resampler_test.cc
index d633f75c192f31a4cd3110688bcadc27d8b5304d..893fad3b59d9d6110cb7372b1df086816c490509 100644
(file)
--- a/
test/resampler_test.cc
+++ b/
test/resampler_test.cc
@@
-1,30
+1,33
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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/>.
*/
/** @file test/resampler_test.cc
*/
/** @file test/resampler_test.cc
- * @brief Check that the timings that come back from
the r
esampler correspond
+ * @brief Check that the timings that come back from
R
esampler correspond
* to the number of samples it generates.
* to the number of samples it generates.
+ * @ingroup selfcontained
*/
#include <boost/test/unit_test.hpp>
#include "lib/audio_buffers.h"
#include "lib/resampler.h"
*/
#include <boost/test/unit_test.hpp>
#include "lib/audio_buffers.h"
#include "lib/resampler.h"
+#include <iostream>
using std::pair;
using std::cout;
using std::pair;
using std::cout;
@@
-42,7
+45,7
@@
resampler_test_one (int from, int to)
for (int64_t i = 0; i < N; i += 1000) {
shared_ptr<AudioBuffers> a (new AudioBuffers (1, 1000));
a->make_silent ();
for (int64_t i = 0; i < N; i += 1000) {
shared_ptr<AudioBuffers> a (new AudioBuffers (1, 1000));
a->make_silent ();
-
shared_ptr<const AudioBuffers> r = resamp.run (a
);
+
pair<shared_ptr<const AudioBuffers>, Frame> r = resamp.run (a, 0
);
}
}
}
}