AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from lioncash/midi-dec 

MIDIDecoder: Make readContinuedValue internal + other cleanups
This commit is contained in:
Phillip Stephens 2019-08-24 20:45:57 -07:00 committed by GitHub
parent 7c5a9ab4df 068ff29b44
commit b9971502a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boo/audiodev/MIDIDecoder.hpp
View File

@ -9,8 +9,6 @@ class IMIDIReader;
class MIDIDecoder {
IMIDIReader& m_out;
uint8_t m_status = 0;
bool _readContinuedValue(std::vector<uint8_t>::const_iterator& it, std::vector<uint8_t>::const_iterator end,
uint32_t& valOut);
public:
MIDIDecoder(IMIDIReader& out) : m_out(out) {}

42
lib/audiodev/MIDIDecoder.cpp
View File

@ -1,42 +1,46 @@
#include "boo/audiodev/MIDIDecoder.hpp"
#include <algorithm>
#include <optional>
#include "boo/audiodev/IMIDIReader.hpp"
#include "lib/audiodev/MIDICommon.hpp"
namespace boo {
namespace {
constexpr uint8_t clamp7(uint8_t val) { return std::clamp(val, uint8_t{0}, uint8_t{127}); }
constexpr uint8_t clamp7(uint8_t val) { return std::max(0, std::min(127, int(val))); }
bool MIDIDecoder::_readContinuedValue(std::vector<uint8_t>::const_iterator& it,
std::vector<uint8_t>::const_iterator end, uint32_t& valOut) {
std::optional<uint32_t> readContinuedValue(std::vector<uint8_t>::const_iterator& it,
std::vector<uint8_t>::const_iterator end) {
uint8_t a = *it++;
valOut = a & 0x7f;
uint32_t valOut = a & 0x7f;
if (a & 0x80) {
if (it == end)
return false;
if ((a & 0x80) != 0) {
if (it == end) {
return std::nullopt;
}
valOut <<= 7;
a = *it++;
valOut |= a & 0x7f;
if (a & 0x80) {
if (it == end)
return false;
if ((a & 0x80) != 0) {
if (it == end) {
return std::nullopt;
}
valOut <<= 7;
a = *it++;
valOut |= a & 0x7f;
}
}
return true;
return valOut;
}
} // Anonymous namespace
std::vector<uint8_t>::const_iterator MIDIDecoder::receiveBytes(std::vector<uint8_t>::const_iterator begin,
std::vector<uint8_t>::const_iterator end) {
std::vector<uint8_t>::const_iterator it = begin;
auto it = begin;
while (it != end) {
uint8_t a = *it++;
uint8_t b;
@ -51,9 +55,8 @@ std::vector<uint8_t>::const_iterator MIDIDecoder::receiveBytes(std::vector<uint8
return begin;
a = *it++;
uint32_t length;
_readContinuedValue(it, end, length);
it += length;
const auto length = readContinuedValue(it, end);
it += *length;
} else {
uint8_t chan = m_status & 0xf;
switch (Status(m_status & 0xf0)) {
@ -124,10 +127,11 @@ std::vector<uint8_t>::const_iterator MIDIDecoder::receiveBytes(std::vector<uint8
case Status::SysEx: {
switch (Status(m_status & 0xff)) {
case Status::SysEx: {
uint32_t len;
if (!_readContinuedValue(it, end, len) || end - it < len)
const auto len = readContinuedValue(it, end);
if (!len || end - it < *len) {
return begin;
m_out.sysex(&*it, len);
}
m_out.sysex(&*it, *len);
break;
}
case Status::TimecodeQuarterFrame: {