projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use boost::random for make_random_file to make it repeatable across platforms.
[dcpomatic.git]
/
test
/
audio_ring_buffers_test.cc
diff --git
a/test/audio_ring_buffers_test.cc
b/test/audio_ring_buffers_test.cc
index 506a6350ecf5a1c2d456766d4155d7fab7551e71..6efd8fbf8e58c9ba34def776881b0a75d4fedc22 100644
(file)
--- a/
test/audio_ring_buffers_test.cc
+++ b/
test/audio_ring_buffers_test.cc
@@
-23,7
+23,9
@@
#include <iostream>
using std::cout;
#include <iostream>
using std::cout;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using namespace dcpomatic;
#define CANARY 9999
#define CANARY 9999
@@
-57,14
+59,14
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1)
BOOST_CHECK_EQUAL (buffer[240 * 6], CANARY);
/* Put some data in */
BOOST_CHECK_EQUAL (buffer[240 * 6], CANARY);
/* Put some data in */
-
shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91)
);
+
auto data = make_shared<AudioBuffers>(6, 91
);
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 6; ++j) {
data->data(j)[i] = value++;
}
}
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 6; ++j) {
data->data(j)[i] = value++;
}
}
- rb.put (data, DCPTime());
+ rb.put (data, DCPTime()
, 48000
);
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
@@
-79,7
+81,7
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test1)
/* Get the rest */
buffer[51 * 6] = CANARY;
/* Get the rest */
buffer[51 * 6] = CANARY;
- BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime
(
));
+ BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime
::from_frames(40, 48000
));
for (int i = 0; i < 51 * 6; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i], check++);
}
for (int i = 0; i < 51 * 6; ++i) {
BOOST_REQUIRE_EQUAL (buffer[i], check++);
}
@@
-98,14
+100,14
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2)
AudioRingBuffers rb;
/* Put some data in */
AudioRingBuffers rb;
/* Put some data in */
-
shared_ptr<AudioBuffers> data (new AudioBuffers (2, 91)
);
+
auto data = make_shared<AudioBuffers>(2, 91
);
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 2; ++j) {
data->data(j)[i] = value++;
}
}
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 2; ++j) {
data->data(j)[i] = value++;
}
}
- rb.put (data, DCPTime());
+ rb.put (data, DCPTime()
, 48000
);
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
@@
-126,7
+128,7
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test2)
/* Get the rest */
buffer[51 * 6] = CANARY;
/* Get the rest */
buffer[51 * 6] = CANARY;
- BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime
(
));
+ BOOST_CHECK (*rb.get(buffer, 6, 51) == DCPTime
::from_frames(40, 48000
));
for (int i = 0; i < 51; ++i) {
for (int j = 0; j < 2; ++j) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + j], check++);
for (int i = 0; i < 51; ++i) {
for (int j = 0; j < 2; ++j) {
BOOST_REQUIRE_EQUAL (buffer[i * 6 + j], check++);
@@
-150,14
+152,14
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3)
AudioRingBuffers rb;
/* Put some data in */
AudioRingBuffers rb;
/* Put some data in */
-
shared_ptr<AudioBuffers> data (new AudioBuffers (6, 91)
);
+
auto data = make_shared<AudioBuffers>(6, 91
);
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 6; ++j) {
data->data(j)[i] = value++;
}
}
int value = 0;
for (int i = 0; i < 91; ++i) {
for (int j = 0; j < 6; ++j) {
data->data(j)[i] = value++;
}
}
- rb.put (data, DCPTime
()
);
+ rb.put (data, DCPTime
(), 48000
);
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
BOOST_CHECK_EQUAL (rb.size(), 91);
/* Get part of it out */
@@
-176,7
+178,7
@@
BOOST_AUTO_TEST_CASE (audio_ring_buffers_test3)
/* Get the rest */
buffer[51 * 2] = CANARY;
/* Get the rest */
buffer[51 * 2] = CANARY;
- BOOST_CHECK (*rb.get(buffer, 2, 51) == DCPTime
(
));
+ BOOST_CHECK (*rb.get(buffer, 2, 51) == DCPTime
::from_frames(40, 48000
));
for (int i = 0; i < 51; ++i) {
for (int j = 0; j < 2; ++j) {
BOOST_REQUIRE_EQUAL (buffer[i * 2 + j], check++);
for (int i = 0; i < 51; ++i) {
for (int j = 0; j < 2; ++j) {
BOOST_REQUIRE_EQUAL (buffer[i * 2 + j], check++);