Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 986da92b: Merge "MidiFramer: Add support for SysEx messages" into mnc-dev

Browse Source 
* commit '986da92bdf0d621956d42adc1398c094a034793e':
  MidiFramer: Add support for SysEx messages
This commit is contained in:
Mike Lockwood
2015-04-29 01:41:21 +00:00
committed by Android Git Automerger
parent e56d3cb2b0 986da92bdf
commit 1ac9018ac3
1 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
core/java/com/android/internal/midi/MidiFramer.java
View File

@@ -17,6 +17,7 @@
package com.android.internal.midi; package com.android.internal.midi;
import android.media.midi.MidiReceiver; import android.media.midi.MidiReceiver;
import android.util.Log;
import java.io.IOException; import java.io.IOException;
@@ -38,6 +39,7 @@ public class MidiFramer extends MidiReceiver {
private int mCount; private int mCount;
private int mRunningStatus; private int mRunningStatus;
private int mNeeded; private int mNeeded;
private boolean mInSysEx;
public MidiFramer(MidiReceiver receiver) { public MidiFramer(MidiReceiver receiver) {
mReceiver = receiver; mReceiver = receiver;
@@ -52,12 +54,14 @@ public class MidiFramer extends MidiReceiver {
} }
/* /*
* @see android.midi.MidiReceiver#onPost(byte[], int, int, long) * @see android.midi.MidiReceiver#onReceive(byte[], int, int, long)
*/ */
@Override @Override
public void onReceive(byte[] data, int offset, int count, long timestamp) public void onReceive(byte[] data, int offset, int count, long timestamp)
throws IOException { throws IOException {
// Log.i(TAG, formatMidiData(data, offset, count)); // Log.i(TAG, formatMidiData(data, offset, count));
int sysExStartOffset = (mInSysEx ? offset : -1);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
int b = data[offset] & 0xFF; int b = data[offset] & 0xFF;
if (b >= 0x80) { // status byte? if (b >= 0x80) { // status byte?
@@ -66,27 +70,50 @@ public class MidiFramer extends MidiReceiver {
mCount = 1; mCount = 1;
mNeeded = MidiConstants.getBytesPerMessage(b) - 1; mNeeded = MidiConstants.getBytesPerMessage(b) - 1;
} else if (b < 0xF8) { // system common? } else if (b < 0xF8) { // system common?
mBuffer[0] = (byte) b; if (b == 0xF0 /* SysEx Start */) {
mRunningStatus = 0; // Log.i(TAG, "SysEx Start");
mCount = 1; mInSysEx = true;
mNeeded = MidiConstants.getBytesPerMessage(b) - 1; sysExStartOffset = offset;
} else if (b == 0xF7 /* SysEx End */) {
// Log.i(TAG, "SysEx End");
if (mInSysEx) {
mReceiver.sendWithTimestamp(data, sysExStartOffset,
offset - sysExStartOffset, timestamp);
mInSysEx = false;
sysExStartOffset = -1;
}
} else {
mBuffer[0] = (byte) b;
mRunningStatus = 0;
mCount = 1;
mNeeded = MidiConstants.getBytesPerMessage(b) - 1;
}
} else { // real-time? } else { // real-time?
// Single byte message interleaved with other data. // Single byte message interleaved with other data.
mReceiver.sendWithTimestamp(data, offset, 1, timestamp); mReceiver.sendWithTimestamp(data, offset, 1, timestamp);
} }
} else { // data byte } else { // data byte
mBuffer[mCount++] = (byte) b; // Save SysEx data for SysEx End marker or end of buffer.
if (--mNeeded == 0) { if (!mInSysEx) {
if (mRunningStatus != 0) { mBuffer[mCount++] = (byte) b;
mBuffer[0] = (byte) mRunningStatus; if (--mNeeded == 0) {
if (mRunningStatus != 0) {
mBuffer[0] = (byte) mRunningStatus;
}
mReceiver.sendWithTimestamp(mBuffer, 0, mCount, timestamp);
mNeeded = MidiConstants.getBytesPerMessage(mBuffer[0]) - 1;
mCount = 1;
} }
mReceiver.sendWithTimestamp(mBuffer, 0, mCount, timestamp);
mNeeded = MidiConstants.getBytesPerMessage(mBuffer[0]) - 1;
mCount = 1;
} }
} }
++offset; ++offset;
} }
// send any accumulatedSysEx data
if (sysExStartOffset >= 0) {
mReceiver.sendWithTimestamp(data, sysExStartOffset,
offset - sysExStartOffset, timestamp);
}
} }
} }