projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[dcpomatic.git]
/
src
/
lib
/
audio_buffers.h
diff --git
a/src/lib/audio_buffers.h
b/src/lib/audio_buffers.h
index 8cd67aaa729d52afc42a8ff5b11f3d42327de414..09faf9ee192cc7cc2ee086267102c22133b2c079 100644
(file)
--- a/
src/lib/audio_buffers.h
+++ b/
src/lib/audio_buffers.h
@@
-25,14
+25,19
@@
#define DCPOMATIC_AUDIO_BUFFERS_H
#include <boost/shared_ptr.hpp>
#define DCPOMATIC_AUDIO_BUFFERS_H
#include <boost/shared_ptr.hpp>
+#include <stdint.h>
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
/** @class AudioBuffers
* @brief A class to hold multi-channel audio data in float format.
+ *
+ * The use of int32_t for frame counts in this class is due to the
+ * round-up to the next power-of-2 code in ::ensure_size; if that
+ * were changed the frame count could use any integer type.
*/
class AudioBuffers
{
public:
*/
class AudioBuffers
{
public:
- AudioBuffers (int channels, int frames);
+ AudioBuffers (int channels, int
32_t
frames);
AudioBuffers (AudioBuffers const &);
AudioBuffers (boost::shared_ptr<const AudioBuffers>);
~AudioBuffers ();
AudioBuffers (AudioBuffers const &);
AudioBuffers (boost::shared_ptr<const AudioBuffers>);
~AudioBuffers ();
@@
-42,12
+47,12
@@
public:
boost::shared_ptr<AudioBuffers> clone () const;
boost::shared_ptr<AudioBuffers> channel (int) const;
boost::shared_ptr<AudioBuffers> clone () const;
boost::shared_ptr<AudioBuffers> channel (int) const;
- void ensure_size (int);
+ void ensure_size (int
32_t
);
float** data () const {
return _data;
}
float** data () const {
return _data;
}
-
+
float* data (int) const;
int channels () const {
float* data (int) const;
int channels () const {
@@
-58,30
+63,30
@@
public:
return _frames;
}
return _frames;
}
- void set_frames (int f);
+ void set_frames (int
32_t
f);
void make_silent ();
void make_silent (int c);
void make_silent ();
void make_silent (int c);
- void make_silent (int
from, in
t frames);
+ void make_silent (int
32_t from, int32_
t frames);
void apply_gain (float);
void apply_gain (float);
- void copy_from (AudioBuffers const * from, int
frames_to_copy, int read_offset, in
t write_offset);
+ void copy_from (AudioBuffers const * from, int
32_t frames_to_copy, int32_t read_offset, int32_
t write_offset);
void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
void copy_channel_from (AudioBuffers const * from, int from_channel, int to_channel);
- void move (int
from, int to, in
t frames);
+ void move (int
32_t from, int32_t to, int32_
t frames);
void accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain = 1);
void accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain = 1);
- void accumulate_frames (AudioBuffers const *, int
read_offset, int write_offset, in
t frames);
+ void accumulate_frames (AudioBuffers const *, int
32_t read_offset, int32_t write_offset, int32_
t frames);
private:
private:
- void allocate (int
, int
);
+ void allocate (int
channels, int32_t frames
);
void deallocate ();
void deallocate ();
-
+
/** Number of channels */
int _channels;
/** Number of frames (where a frame is one sample across all channels) */
/** Number of channels */
int _channels;
/** Number of frames (where a frame is one sample across all channels) */
- int _frames;
+ int
32_t
_frames;
/** Number of frames that _data can hold */
/** Number of frames that _data can hold */
- int _allocated_frames;
+ int
32_t
_allocated_frames;
/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
float** _data;
};
/** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */
float** _data;
};