projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make terminate_threads() less likely to leave _threads containing invalid pointers.
[dcpomatic.git]
/
src
/
lib
/
audio_ring_buffers.cc
diff --git
a/src/lib/audio_ring_buffers.cc
b/src/lib/audio_ring_buffers.cc
index 012ab0718022bab0fcf7ceca540f7d84e7459b43..d1375cb27e2eeeb80d3a2935a06a10cb3aee9b87 100644
(file)
--- a/
src/lib/audio_ring_buffers.cc
+++ b/
src/lib/audio_ring_buffers.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-38,17
+38,19
@@
AudioRingBuffers::AudioRingBuffers ()
}
}
+/** @param frame_rate Frame rate in use; this is only used to check timing consistency of the incoming data */
void
void
-AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
+AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time
, int frame_rate
)
{
boost::mutex::scoped_lock lm (_mutex);
if (!_buffers.empty()) {
DCPOMATIC_ASSERT (_buffers.front().first->channels() == data->channels());
{
boost::mutex::scoped_lock lm (_mutex);
if (!_buffers.empty()) {
DCPOMATIC_ASSERT (_buffers.front().first->channels() == data->channels());
- if ((_buffers.back().second + DCPTime::from_frames(_buffers.back().first->frames(), 48000)) != time) {
+ DCPTime const end = (_buffers.back().second + DCPTime::from_frames(_buffers.back().first->frames(), frame_rate));
+ if (labs(end.get() - time.get()) > 1) {
cout << "bad put " << to_string(_buffers.back().second) << " " << _buffers.back().first->frames() << " " << to_string(time) << "\n";
}
cout << "bad put " << to_string(_buffers.back().second) << " " << _buffers.back().first->frames() << " " << to_string(time) << "\n";
}
- DCPOMATIC_ASSERT (
(_buffers.back().second + DCPTime::from_frames(_buffers.back().first->frames(), 48000)) == time
);
+ DCPOMATIC_ASSERT (
labs(end.get() - time.get()) < 2
);
}
_buffers.push_back(make_pair(data, time));
}
_buffers.push_back(make_pair(data, time));
@@
-101,6
+103,16
@@
AudioRingBuffers::get (float* out, int channels, int frames)
return time;
}
return time;
}
+optional<DCPTime>
+AudioRingBuffers::peek () const
+{
+ boost::mutex::scoped_lock lm (_mutex);
+ if (_buffers.empty()) {
+ return optional<DCPTime>();
+ }
+ return _buffers.front().second;
+}
+
void
AudioRingBuffers::clear ()
{
void
AudioRingBuffers::clear ()
{