loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIDI: Ignore SysEx messages

Browse Source 
ignore SysEx messages instead of choking
This commit is contained in:
Philippe Simons 2023-10-07 12:33:21 +02:00 committed by christosts
parent 105bdf57d8
commit fc2099dede
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/TrackEvent.java
View File

@ -37,6 +37,8 @@ import androidx.media3.common.util.UnstableApi;
public static final int DATA_FIELD_UNSET = Integer.MIN_VALUE; public static final int DATA_FIELD_UNSET = Integer.MIN_VALUE;
private static final int TICKS_UNSET = -1; private static final int TICKS_UNSET = -1;
private static final int SYSEX_BEGIN_STATUS = 0xF0;
private static final int SYSEX_END_STATUS = 0xF7;
private static final int META_EVENT_STATUS = 0xFF; private static final int META_EVENT_STATUS = 0xFF;
private static final int META_END_OF_TRACK = 0x2F; private static final int META_END_OF_TRACK = 0x2F;
private static final int META_TEMPO_CHANGE = 0x51; private static final int META_TEMPO_CHANGE = 0x51;
@ -139,10 +141,17 @@ import androidx.media3.common.util.UnstableApi;
default: // Ignore all other Meta events. default: // Ignore all other Meta events.
parsableTrackEventBytes.skipBytes(eventLength); parsableTrackEventBytes.skipBytes(eventLength);
} }
} else { } else if (firstByte == SYSEX_BEGIN_STATUS) {
// TODO(b/228838584): Handle this gracefully. // TODO(b/228838584): Handle this gracefully.
statusByte = firstByte;
int currentByte;
do { // eat SysEx Message
currentByte = parsableTrackEventBytes.readUnsignedByte();
} while (currentByte != SYSEX_END_STATUS);
} else {
throw ParserException.createForUnsupportedContainerFeature( throw ParserException.createForUnsupportedContainerFeature(
"SysEx track events are not yet supported."); "Unknown track events.");
} }
} }
@ -155,7 +164,7 @@ import androidx.media3.common.util.UnstableApi;
public boolean isMidiEvent() { public boolean isMidiEvent() {
// TODO(b/228838584): Update with SysEx event check when implemented. // TODO(b/228838584): Update with SysEx event check when implemented.
return statusByte != META_EVENT_STATUS; return statusByte != META_EVENT_STATUS && statusByte != SYSEX_BEGIN_STATUS;
} }
public boolean isNoteChannelEvent() { public boolean isNoteChannelEvent() {