projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix enabled/disable overlapping video/audio with DCP content (part of #1355)
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.cc
diff --git
a/src/lib/audio_buffers.cc
b/src/lib/audio_buffers.cc
index 8d3a897c42d76eb7ecd7f0474afdba63ba014a27..cfe762659ebdb6d91128557b35cccb3c08c56144 100644
(file)
--- a/
src/lib/audio_buffers.cc
+++ b/
src/lib/audio_buffers.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+#include "util.h"
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include <cassert>
#include "audio_buffers.h"
#include "dcpomatic_assert.h"
#include <cassert>
@@
-52,6
+53,12
@@
AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other)
copy_from (other.get(), other->_frames, 0, 0);
}
copy_from (other.get(), other->_frames, 0, 0);
}
+AudioBuffers::AudioBuffers (boost::shared_ptr<const AudioBuffers> other, int32_t frames_to_copy, int32_t read_offset)
+{
+ allocate (other->_channels, frames_to_copy);
+ copy_from (other.get(), frames_to_copy, read_offset, 0);
+}
+
AudioBuffers &
AudioBuffers::operator= (AudioBuffers const & other)
{
AudioBuffers &
AudioBuffers::operator= (AudioBuffers const & other)
{
@@
-125,7
+132,9
@@
AudioBuffers::set_frames (int32_t f)
{
DCPOMATIC_ASSERT (f <= _allocated_frames);
{
DCPOMATIC_ASSERT (f <= _allocated_frames);
- make_silent (f, _frames - f);
+ if (f < _frames) {
+ make_silent (f, _frames - f);
+ }
_frames = f;
}
_frames = f;
}
@@
-269,8
+278,11
@@
AudioBuffers::ensure_size (int32_t frames)
}
}
}
}
-
make_silent (_allocated_frames, frames - _allocated_frames)
;
+
int32_t const old_allocated = _allocated_frames
;
_allocated_frames = frames;
_allocated_frames = frames;
+ if (old_allocated < _allocated_frames) {
+ make_silent (old_allocated, _allocated_frames - old_allocated);
+ }
}
/** Mix some other buffers with these ones. The AudioBuffers must have the same number of channels.
}
/** Mix some other buffers with these ones. The AudioBuffers must have the same number of channels.
@@
-298,7
+310,7
@@
AudioBuffers::accumulate_frames (AudioBuffers const * from, int32_t frames, int3
void
AudioBuffers::apply_gain (float dB)
{
void
AudioBuffers::apply_gain (float dB)
{
- float const linear =
pow (10, dB / 20
);
+ float const linear =
db_to_linear (dB
);
for (int i = 0; i < _channels; ++i) {
for (int j = 0; j < _frames; ++j) {
for (int i = 0; i < _channels; ++i) {
for (int j = 0; j < _frames; ++j) {