*/
#include <iostream>
-#include <ardour/midi_buffer.h>
-
-#ifdef __x86_64__
-static const int CPU_CACHE_ALIGN = 64;
-#else
-static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
-#endif
+#include "pbd/malign.h"
+#include "ardour/midi_buffer.h"
using namespace std;
using namespace ARDOUR;
-
// FIXME: mirroring for MIDI buffers?
MidiBuffer::MidiBuffer(size_t capacity)
: Buffer(DataType::MIDI, capacity)
- , _events(0)
, _data(0)
-// , _owns_data(false)
{
if (capacity) {
- resize (_capacity);
+ resize(_capacity);
silence(_capacity);
}
}
MidiBuffer::~MidiBuffer()
{
- if (_events) {
- free(_events);
- }
- if (_data) {
- free(_data);
- }
+ free(_data);
}
void
-MidiBuffer::resize (size_t size)
+MidiBuffer::resize(size_t size)
{
assert(size > 0);
return;
}
- if (_data) {
- free (_data);
- }
-
- if (_events) {
- free (_events);
- }
+ free(_data);
_size = 0;
_capacity = size;
+ cache_aligned_malloc ((void**) &_data, _capacity);
-#ifdef NO_POSIX_MEMALIGN
- _events = (MIDI::Event *) malloc(sizeof(MIDI::Event) * _capacity);
- _data = (Byte *) malloc(sizeof(Byte) * _capacity * MAX_EVENT_SIZE);
-#else
- posix_memalign((void**)&_events, CPU_CACHE_ALIGN, sizeof(MIDI::Event) * _capacity);
- posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Byte) * _capacity * MAX_EVENT_SIZE);
-#endif
assert(_data);
- assert(_events);
}
void
MidiBuffer::copy(const MidiBuffer& copy)
{
- assert(_capacity >= copy._capacity);
- _size = 0;
-
- for (size_t i = 0; i < copy.size(); ++i)
- push_back(copy[i]);
+ assert(_capacity >= copy._size);
+ _size = copy._size;
+ memcpy(_data, copy._data, copy._size);
}
/** Read events from @a src starting at time @a offset into the START of this buffer, for
- * time direction @a nframes. Relative time, where 0 = start of buffer.
+ * time duration @a nframes. Relative time, where 0 = start of buffer.
*
* Note that offset and nframes refer to sample time, NOT buffer offsets or event counts.
*/
void
-MidiBuffer::read_from(const Buffer& src, nframes_t nframes, nframes_t offset)
+MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset, nframes_t src_offset)
{
- assert(src.type() == DataType::MIDI);
- assert(&src != this);
+ assert (src.type() == DataType::MIDI);
+ assert (&src != this);
- const MidiBuffer& msrc = (MidiBuffer&)src;
+ const MidiBuffer& msrc = (MidiBuffer&) src;
- assert(_capacity >= msrc.size());
+ assert (_capacity >= msrc.size());
- clear();
- assert(_size == 0);
+ if (dst_offset == 0) {
+ clear ();
+ assert (_size == 0);
+ }
+
+ /* XXX use dst_offset somehow */
- // FIXME: slow
- for (size_t i=0; i < msrc.size(); ++i) {
- const MIDI::Event& ev = msrc[i];
- if (ev.time() >= offset && ev.time() < offset+nframes) {
- //cout << "MidiBuffer::read_from got event, " << int(ev.type()) << " time: " << ev.time() << " buffer size: " << _size << endl;
- push_back(ev);
- } else {
- cerr << "MidiBuffer event out of range, " << ev.time() << endl;
+ for (MidiBuffer::const_iterator i = msrc.begin(); i != msrc.end(); ++i) {
+ const Evoral::MIDIEvent<TimeType> ev(*i, false);
+ if (ev.time() >= src_offset && ev.time() < (nframes+src_offset)) {
+ push_back (ev);
}
}
_silent = src.silent();
}
+void
+MidiBuffer::merge_from (const Buffer& src, nframes_t /*nframes*/, nframes_t /*dst_offset*/, nframes_t /*src_offset*/)
+{
+ const MidiBuffer* mbuf = dynamic_cast<const MidiBuffer*>(&src);
+ assert (mbuf);
+ assert (mbuf != this);
+
+ /* XXX use nframes, and possible offsets */
+ merge_in_place (*mbuf);
+}
/** Push an event into the buffer.
*
* @return false if operation failed (not enough room)
*/
bool
-MidiBuffer::push_back(const MIDI::Event& ev)
+MidiBuffer::push_back(const Evoral::MIDIEvent<TimeType>& ev)
{
- if (_size == _capacity)
+ const size_t stamp_size = sizeof(TimeType);
+ /*cerr << "MidiBuffer: pushing event @ " << ev.time()
+ << " size = " << ev.size() << endl;*/
+
+ if (_size + stamp_size + ev.size() >= _capacity) {
+ cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
return false;
+ }
- Byte* const write_loc = _data + (_size * MAX_EVENT_SIZE);
+ if (!Evoral::midi_event_is_valid(ev.buffer(), ev.size())) {
+ cerr << "WARNING: MidiBuffer ignoring illegal MIDI event" << endl;
+ return false;
+ }
- memcpy(write_loc, ev.buffer(), ev.size());
- _events[_size] = ev;
- _events[_size].set_buffer(write_loc, false);
- ++_size;
+ push_back(ev.time(), ev.size(), ev.buffer());
+
+ return true;
+}
- //cerr << "MidiBuffer: pushed, size = " << _size << endl;
- _silent = false;
+/** Push an event into the buffer.
+ * @return false if operation failed (not enough room)
+ */
+bool
+MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
+{
+ const size_t stamp_size = sizeof(TimeType);
+ /*cerr << "MidiBuffer: pushing event @ " << ev.time()
+ << " size = " << ev.size() << endl;*/
+
+ if (_size + stamp_size + size >= _capacity) {
+ cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
+ return false;
+ }
+ if (!Evoral::midi_event_is_valid(data, size)) {
+ cerr << "WARNING: MidiBuffer ignoring illegal MIDI event" << endl;
+ return false;
+ }
+
+ uint8_t* const write_loc = _data + _size;
+ *((TimeType*)write_loc) = time;
+ memcpy(write_loc + stamp_size, data, size);
+
+ _size += stamp_size + size;
+ _silent = false;
+
return true;
}
bool
MidiBuffer::push_back(const jack_midi_event_t& ev)
{
- if (_size == _capacity)
+ const size_t stamp_size = sizeof(TimeType);
+ if (_size + stamp_size + ev.size >= _capacity) {
+ cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
return false;
+ }
+
+ if (!Evoral::midi_event_is_valid(ev.buffer, ev.size)) {
+ cerr << "WARNING: MidiBuffer ignoring illegal MIDI event" << endl;
+ return false;
+ }
- Byte* const write_loc = _data + (_size * MAX_EVENT_SIZE);
-
- memcpy(write_loc, ev.buffer, ev.size);
- _events[_size].time() = (double)ev.time;
- _events[_size].size() = ev.size;
- _events[_size].set_buffer(write_loc, false);
- ++_size;
-
- //cerr << "MidiBuffer: pushed, size = " << _size << endl;
+ uint8_t* const write_loc = _data + _size;
+ *((TimeType*)write_loc) = ev.time;
+ memcpy(write_loc + stamp_size, ev.buffer, ev.size);
+ _size += stamp_size + ev.size;
_silent = false;
-
+
return true;
}
* This call MUST be immediately followed by a write to the returned data
* location, or the buffer will be corrupted and very nasty things will happen.
*/
-Byte*
-MidiBuffer::reserve(double time, size_t size)
+uint8_t*
+MidiBuffer::reserve(TimeType time, size_t size)
{
- assert(size <= MAX_EVENT_SIZE);
-
- if (_size == _capacity)
+ const size_t stamp_size = sizeof(TimeType);
+ if (_size + stamp_size + size >= _capacity) {
return 0;
+ }
- Byte* const write_loc = _data + (_size * MAX_EVENT_SIZE);
-
- _events[_size].time() = time;
- _events[_size].size() = size;
- _events[_size].set_buffer(write_loc, false);
- ++_size;
-
- //cerr << "MidiBuffer: reserved, size = " << _size << endl;
+ // write timestamp
+ uint8_t* write_loc = _data + _size;
+ *((TimeType*)write_loc) = time;
+
+ // move write_loc to begin of MIDI buffer data to write to
+ write_loc += stamp_size;
+ _size += stamp_size + size;
_silent = false;
-
+
return write_loc;
}
void
-MidiBuffer::silence(nframes_t dur, nframes_t offset)
+MidiBuffer::silence (nframes_t /*nframes*/, nframes_t /*offset*/)
{
- // FIXME use parameters
- if (offset != 0)
- cerr << "WARNING: MidiBuffer::silence w/ offset != 0 (not implemented)" << endl;
+ /* XXX iterate over existing events, find all in range given by offset & nframes,
+ and delete them.
+ */
- memset(_events, 0, sizeof(MIDI::Event) * _capacity);
- memset(_data, 0, sizeof(Byte) * _capacity * MAX_EVENT_SIZE);
_size = 0;
_silent = true;
}
+/** Merge \a other into this buffer. Realtime safe. */
+bool
+MidiBuffer::merge_in_place(const MidiBuffer &other)
+{
+ if (other.size() == 0) {
+ return true;
+ }
+
+ if (_size == 0) {
+ copy(other);
+ return true;
+ }
+
+ if (_size + other.size() > _capacity) {
+ cerr << "MidiBuffer::merge failed (no space)" << endl;
+ return false;
+ }
+
+ cerr << "FIXME: MIDI BUFFER IN-PLACE MERGE" << endl;
+ return true;
+}
/** Clear, and merge \a a and \a b into this buffer.
- *
- * FIXME: This is slow.
*
* \return true if complete merge was successful
*/
MidiBuffer::merge(const MidiBuffer& a, const MidiBuffer& b)
{
_size = 0;
-
- // Die if a merge isn't necessary as it's expensive
- assert(a.size() > 0 && b.size() > 0);
-
- size_t a_index = 0;
- size_t b_index = 0;
- size_t count = a.size() + b.size();
-
- while (count > 0 && a_index < a.size() && b_index < b.size()) {
-
- if (size() == capacity()) {
- cerr << "WARNING: MIDI buffer overrun, events lost!" << endl;
- return false;
- }
-
- if (a_index == a.size()) {
- push_back(a[a_index]);
- ++a_index;
- } else if (b_index == b.size()) {
- push_back(b[b_index]);
- ++b_index;
- } else {
- const MIDI::Event& a_ev = a[a_index];
- const MIDI::Event& b_ev = b[b_index];
-
- if (a_ev.time() <= b_ev.time()) {
- push_back(a_ev);
- ++a_index;
- } else {
- push_back(b_ev);
- ++b_index;
- }
- }
-
- --count;
+
+ if (this == &a) {
+ merge_in_place(b);
}
+ if (this == &b) {
+ merge_in_place(a);
+ }
+
+ cerr << "FIXME: MIDI BUFFER MERGE" << endl;
return true;
}