From b308b9788043d80a6e6ab5a130e1ee1dd13bb723 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Thu, 3 Aug 2017 20:28:16 +0200 Subject: [PATCH] pick up ADTS files --- src/ch/blinkenlights/bastp/Bastp.java | 6 +++++- src/ch/blinkenlights/bastp/{MidiFile.java => RawFile.java} | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename src/ch/blinkenlights/bastp/{MidiFile.java => RawFile.java} (84%) diff --git a/src/ch/blinkenlights/bastp/Bastp.java b/src/ch/blinkenlights/bastp/Bastp.java index e506c3f1..a3c63e9f 100644 --- a/src/ch/blinkenlights/bastp/Bastp.java +++ b/src/ch/blinkenlights/bastp/Bastp.java @@ -94,9 +94,13 @@ public class Bastp { tags.put("type", "MP4"); } else if(magic.substring(0,4).equals("MThd")) { - tags = (new MidiFile()).getTags(s); + tags = (new RawFile()).getTags(s); tags.put("type", "MIDI"); } + else if(file_ff[0] == -1 && (file_ff[1]&0xF0) == 0xF0) { /* aka 0xfff? */ + tags = (new RawFile()).getTags(s); + tags.put("type", "ADTS"); + } } catch (IOException e) { diff --git a/src/ch/blinkenlights/bastp/MidiFile.java b/src/ch/blinkenlights/bastp/RawFile.java similarity index 84% rename from src/ch/blinkenlights/bastp/MidiFile.java rename to src/ch/blinkenlights/bastp/RawFile.java index 8a1b3d01..fc0df402 100644 --- a/src/ch/blinkenlights/bastp/MidiFile.java +++ b/src/ch/blinkenlights/bastp/RawFile.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.util.HashMap; -public class MidiFile extends Common { +public class RawFile extends Common { /** - * Returns the tags of a Midi File which is just an empty HashMap - * as there seems to be no midi-tag standard (?) + * Returns the tags of a Raw File which is just an empty HashMap. + * This shall be used for raw streams with no (supported) tags. */ public HashMap getTags(RandomAccessFile s) throws IOException { HashMap tags = new HashMap();