Changeset 6701

Timestamp:

06/30/09 18:04:10 (9 months ago)

Author:

smimram

Message:

MIDI files support is starting to work.

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (2 diffs)
• formats/midiformat.ml (modified) (8 diffs)
• stream/mFrame.mli (modified) (1 diff)
• synth/keyboard_sdl.ml (modified) (1 diff)
• synth/synth.ml (modified) (6 diffs)
• synth/synth_op.ml (modified) (2 diffs)
• visualization/midimeter.ml (copied) (copied from trunk/liquidsoap/src/visualization/vumeter.ml) (2 diffs)

trunk/liquidsoap/src/Makefile

@@ -35 +35 @@
         $(if $(W_NSV),formats/nattyformat_mp3.ml) \
         $(if $(W_NATTY),formats/nattyformat.ml) \
-        $(if $(W_MP3),formats/mp3.ml)
-#       formats/midiformat.ml
+        $(if $(W_MP3),formats/mp3.ml) \
+        formats/midiformat.ml
 
 playlists = \
@@ -144 +144 @@
         $(if $(W_GL),visualization/GLvisualizer.ml) \
         $(if $(W_GL),visualization/vis_glvolume.ml) \
-        visualization/video_volume.ml
+        visualization/video_volume.ml \
+        visualization/midimeter.ml
 
 synth = synth/synth.ml synth/synth_op.ml \

trunk/liquidsoap/src/formats/midiformat.ml

@@ -53 +53 @@
     if division land 0x8000 = 0 then
       (
+        (* Delta-time ticks per quarter *)
         log#f 5 "Ticks per quarter: %d" division;
         Midi.Ticks_per_quarter division
@@ -59 +60 @@
       let frames = (division lsr 8) land 0x7f in
       let ticks = division land 0xff in
+        log#f 5 "SMPTE: %d * %d" frames ticks;
         Midi.SMPTE (frames, ticks)
   in
@@ -66 +68 @@
         raise Invalid_header;
       );
-    log#f 5 "Tracks: %d" tracks;
+    log#f 5 "Format: %d (%d tracks)" fmt tracks;
     tracks, division
 
@@ -90 +92 @@
       !ans
   in
+  let status = ref 0 in (* for running status *)
   let read_event () =
     let get_byte () =
@@ -103 +106 @@
         ans
     in
-    let cmd = (data.(!pos) lsr 4) land 0xf in
-    let chan = data.(!pos) land 0xf in
+    let advance len =
+      pos := !pos + len
+    in
+    let command = data.(!pos) in
     incr pos;
-    let event =
+    let command =
+      if command land 0x80 <> 0 then
+        (
+          status := command;
+          command
+        )
+      else
+        (
+          decr pos;
+          !status
+        )
+    in
+    let cmd = (command lsr 4) land 0xf in
+    let chan = command land 0xf in
       match cmd with
         | 8 ->
             let n = get_byte () in
             let v = get_byte () in
-              Midi.Note_off (n, v)
+              Some chan, Midi.Note_off (n, float v /. 127.)
         | 9 ->
             let n = get_byte () in
             let v = get_byte () in
-              log#f 6 "Note on: %d %d" n v;
-              Midi.Note_on (n, v)
-        | 10 ->
+              Some chan, Midi.Note_on (n, float v /. 127.)
+        | 0xa ->
             let n = get_byte () in
             let v = get_byte () in
-              Midi.Aftertouch (n, v)
-        | 11 ->
+              Some chan, Midi.Aftertouch (n, float v /. 127.)
+        | 0xb ->
             let c = get_byte () in
             let v = get_byte () in
-              Midi.Control_change (c, v)
-        | 12 ->
+              Some chan, Midi.Control_change (c, v)
+        | 0xc ->
             let p = get_byte () in
-              Midi.Patch p
-        | 13 ->
+              Some chan, Midi.Patch p
+        | 0xd ->
             let c = get_byte () in
-              Midi.Channel_aftertouch c
-        | 14 ->
+              Some chan, Midi.Channel_aftertouch c
+        | 0xe ->
             let l = get_byte () land 0x7f in
             let h = get_byte () land 0x7f in
-              Midi.Pitch ((h lsl 7) + l)
-        | 15 ->
-            (
-              let cmd = get_byte () in
-                match cmd with
-                  | 0 ->
-                      assert (get_byte () = 2);
-                      let h = get_byte () in
-                      let l = get_byte () in
-                        Midi.Sequence_number ((h lsl 8) + l)
-                  | 1 ->
-                      let len = get_byte () in
-                        Midi.Text (get_text len)
-                  | 2 ->
-                      let len = get_byte () in
-                        Midi.Copyright (get_text len)
-                  | 3 ->
-                      let len = get_byte () in
-                        Midi.Track_name (get_text len)
-                  | 4 ->
-                      let len = get_byte () in
-                        Midi.Instrument_name (get_text len)
-                  | 5 ->
-                      let len = get_byte () in
-                        Midi.Lyric (get_text len)
-                  | 6 ->
-                      let len = get_byte () in
-                        Midi.Marker (get_text len)
-                  | 7 ->
-                      let len = get_byte () in
-                        Midi.Cue (get_text len)
-                  | _ ->
-                      log#f 5 "Unknown command 15,%d" cmd;
-                      raise Not_found
-            )
+              Some chan, Midi.Pitch ((h lsl 7) + l)
         | _ ->
-            (* log#f 5 "Unknown command %d" cmd; *)
-            raise Not_found
-    in
-      chan, event
+            match command with
+              | 0xf0
+              | 0xf7 ->
+                  (* SysEx *)
+                  let len = read_delta () in
+                    advance len;
+                    raise Not_found
+              | 0xff ->
+                  (
+                  let cmd = get_byte () in
+                  let len = read_delta () in
+                    match cmd with
+                      | 0 ->
+                          assert (len = 2);
+                          let h = get_byte () in
+                          let l = get_byte () in
+                            None, Midi.Sequence_number ((h lsl 8) + l)
+                      | 1 ->
+                          None, Midi.Text (get_text len)
+                      | 2 ->
+                          None, Midi.Copyright (get_text len)
+                      | 3 ->
+                          None, Midi.Track_name (get_text len)
+                      | 4 ->
+                          None, Midi.Instrument_name (get_text len)
+                      | 5 ->
+                          None, Midi.Lyric (get_text len)
+                      | 6 ->
+                          None, Midi.Marker (get_text len)
+                      | 7 ->
+                          None, Midi.Cue (get_text len)
+                      | 0x2f (* End of track *) ->
+                          assert (len = 0);
+                          raise Not_found
+                      | 0x51 (* Tempo in microseconds per quarter note *) ->
+                          assert (len = 3);
+                          let t1 = get_byte () in
+                          let t2 = get_byte () in
+                          let t3 = get_byte () in
+                          let t = t1 lsl 16 + t2 lsl 8 + t3 in
+                            ignore t;
+                            None, Midi.Tempo t
+                      | 0x58 (* Time signature *) ->
+                          assert (len = 4);
+                          let n = get_byte () in (* numerator *)
+                          let d = get_byte () in (* denominator *)
+                          let c = get_byte () in (* ticks in a metronome click *)
+                          let b = get_byte () in (* 32nd notes to the quarter note *)
+                            ignore (n, d, c, b);
+                            None, Midi.Time_signature (n, d, c, b)
+                      | 0x59 (* Key signature *) ->
+                          assert (len = 2);
+                          let sf = get_byte () in (* sharps / flats *)
+                          let m = get_byte () in (* minor? *)
+                            ignore (sf, m);
+                            None, Midi.Key_signature (sf, m <> 0)
+                      | 0x54 (* SMPTE Offset *)
+                      | 0x7f (* Sequencer-specific data *) ->
+                          advance len;
+                          raise Not_found
+                      | _ ->
+                          advance len;
+                          log#f 5 "Unknown meta-event %x" cmd;
+                          raise Not_found
+                  )
+              | _ ->
+                  advance 1;
+                  log#f 5 "Unknown command %x (pos: %d)" command !pos;
+                  raise Not_found
   in
   let ans = ref [] in
     while !pos < len do
       try
-        ans := (read_delta (), read_event ())::!ans
+        let d = read_delta () in
+        let e = read_event () in
+        ans := (d, e)::!ans
       with
         | Not_found -> ()
@@ -186 +236 @@
 let decoder file =
   log#f 4 "Decoding %s..." file;
-  let fd = Unix.openfile file [Unix.O_RDONLY] 0 in
+  let fd = Unix.openfile file [Unix.O_RDONLY] 0o644 in
   let closed = ref false in
 
@@ -202 +252 @@
     (* We don't need to access the file anymore. *)
     close ();
-    log#f 5 "Read %d events" (List.length tracks.(0));
+    (* Convert delta-times in delta-liquidsoap-ticks. *)
+    for n = 0 to ntracks - 1 do
+      let tpq =
+        match division with
+          | Midi.Ticks_per_quarter tpq -> tpq
+          | _ -> assert false
+      in
+      let tempo = ref 125000 in
+        tracks.(n) <-
+          List.map
+            (fun (d,(c,e)) ->
+               let d = (d * !tempo / tpq) * Fmt.ticks_per_second () / 1000000 in
+               let d = d * 2 in (* TODO: remove this! *)
+                 (
+                   match e with
+                     | Midi.Tempo t ->
+                         tempo := t
+                     | _ -> ()
+                 );
+                 (d,(c,e))
+            ) tracks.(n)
+    done;
+    (* Merge all tracks. *)
+    let track = ref tracks.(0) in (* TODO! *)
+    (* Filling function. *)
     let fill buf =
-      1000 (* TODO *)
+      let m = MFrame.tracks buf in
+      (* TODO: why do we have to do this here??? *)
+      AFrame.blankify buf 0 (AFrame.size buf);
+      m.(0) := [];
+      let buflen = MFrame.size buf in
+      let offset_in_buf = ref 0 in
+        while !track <> [] && !offset_in_buf < buflen do
+          let d,(c,e) = List.hd !track in
+            (* Printf.printf "delta: %d\n%!" d; *)
+            offset_in_buf := !offset_in_buf + d;
+            if !offset_in_buf < buflen then
+              (
+                track := List.tl !track;
+                match c with
+                  | Some c ->
+                      (
+                        match e with
+                          | Midi.Note_on _
+                          | Midi.Note_off _ ->
+                              (* Printf.printf "EVENT (chan %d)!\n%!" c; *)
+                              let c = if c <> 10 then 0 else c in (* TODO: remove this *)
+                              m.(c) := !(m.(c))@[!offset_in_buf, e]
+                          | _ -> () (* TODO *)
+                      )
+                  | None -> () (* TODO *)
+              )
+            else
+              track := (!offset_in_buf - buflen,(c,e))::(List.tl !track)
+        done;
+        MFrame.add_break buf (MFrame.size buf);
+        0
     in
       { Decoder.fill = fill ; Decoder.close = fun () -> () }
@@ -213 +317 @@
 
 (* TODO *)
+(*
 let metadatas ~format file =
   []
 
 let () = Request.mresolvers#register "MID" metadatas
+*)

trunk/liquidsoap/src/stream/mFrame.mli

@@ -6 +6 @@
 val is_partial : t -> bool
 
-(** Number of video frames. *)
+(** Number of ticks in a MIDI frame. *)
 val size : t -> int
 

trunk/liquidsoap/src/synth/keyboard_sdl.ml

@@ -98 +98 @@
   Lang.add_operator "input.keyboard.sdl"
     [
-      "velocity", Lang.float_t, Some (Lang.float 0.3), Some "Velocity of notes."
+      "velocity", Lang.float_t, Some (Lang.float 0.8), Some "Velocity of notes."
     ]
     ~category:Lang.Input

trunk/liquidsoap/src/synth/synth.ml

@@ -5 +5 @@
 class type synth =
 object
+  method set_volume : float -> unit
+
   method note_on : int -> float -> unit
 
@@ -10 +12 @@
 
   method synth : float -> float array array -> int -> int -> unit
+
+  method reset : unit
 end
 
@@ -15 +19 @@
 class virtual ['gs,'ns] base =
 object (self)
+  val mutable volume = 1.
+
+  method set_volume v = volume <- v
+
   val mutable state = None
 
@@ -23 +31 @@
 
   val mutable notes = []
+
+  method reset = notes <- []
 
   method virtual state_init : 'gs
@@ -35 +45 @@
 
   method note_on n v =
+    (* Limit the number of notes for now. TODO: parameter *)
+    if List.length notes > 8 then notes <- List.rev (List.tl (List.rev notes));
     notes <- (n, ref (self#note_init n v))::notes
 
@@ -84 +96 @@
     let phase i = ns.simple_phase +. float i /. freq *. ns.simple_freq in
       for i = ofs to ofs + len - 1 do
-        buf.(i) <- buf.(i) +. ns.simple_ampl *. f (phase i)
+        buf.(i) <- buf.(i) +. volume *. ns.simple_ampl *. f (phase i)
       done;
       gs, { ns with simple_phase = fst (modf (phase len)) }

trunk/liquidsoap/src/synth/synth_op.ml

@@ -23 +23 @@
 open Source
 
-class synth (synth:Synth.synth) (source:source) chan =
+class synth (synth:Synth.synth) (source:source) chan volume =
 object (self)
   inherit operator [source] as super
+
+  initializer
+    synth#set_volume volume
 
   method stype = source#stype
@@ -62 +65 @@
 end
 
-let () =
-  Lang.add_operator "synth.sine"
-    [ "", Lang.source_t, None, None ]
+let register obj name descr =
+  Lang.add_operator ("synth." ^ name)
+    [
+      "channel", Lang.int_t, Some (Lang.int 0), Some "MIDI channel to handle.";
+      "volume", Lang.float_t, Some (Lang.float 0.3), Some "Volume.";
+      "", Lang.source_t, None, None
+    ]
     ~category:Lang.SoundSynthesis
-    ~descr:"Sine synthesiser."
+    ~descr
     (fun p _ ->
        let f v = List.assoc v p in
+       let chan = Lang.to_int (f "channel") in
+       let volume = Lang.to_float (f "volume") in
        let src = Lang.to_source (f "") in
-         new synth (new Synth.sine :> Synth.synth) src 0)
+         new synth (obj ()) src chan volume)
 
-let () =
-  Lang.add_operator "synth.square"
-    [ "", Lang.source_t, None, None ]
-    ~category:Lang.SoundSynthesis
-    ~descr:"Square synthesiser."
-    (fun p _ ->
-       let f v = List.assoc v p in
-       let src = Lang.to_source (f "") in
-         new synth (new Synth.square :> Synth.synth) src 0)
-
-let () =
-  Lang.add_operator "synth.saw"
-    [ "", Lang.source_t, None, None ]
-    ~category:Lang.SoundSynthesis
-    ~descr:"Saw synthesiser."
-    (fun p _ ->
-       let f v = List.assoc v p in
-       let src = Lang.to_source (f "") in
-         new synth (new Synth.saw :> Synth.synth) src 0)
+let () = register (fun () -> (new Synth.sine :> Synth.synth)) "sine" "Sine synthesiser."
+let () = register (fun () -> (new Synth.square :> Synth.synth)) "square" "Square synthesiser."
+let () = register (fun () -> (new Synth.saw :> Synth.synth)) "saw" "Saw synthesiser."

trunk/liquidsoap/src/visualization/midimeter.ml

@@ -21 +21 @@
  *****************************************************************************)
 
-(** VU meter. *)
-
 open Source
 
-let screen_width = 80
-let rms_max = -5.
-let rms_min = -25.
-
-let vol n v =
-  let v = Sutils.dB_of_lin v in
-  let ans = ref "" in
-  let barwidth = screen_width / n - 7 in
-  let barlen = int_of_float (float barwidth *. min 1. (max 0. ((v -. rms_min) /. (rms_max -. rms_min)))) in
-    for i = 0 to barlen - 1 do ans := !ans ^ "=" done;
-    for i = 0 to barwidth - barlen - 1 do ans := !ans ^ "." done;
-    Printf.sprintf "% 5.1f %s" v !ans
-
-class vumeter source scroll =
+class midimeter source =
 object
   inherit operator [source] as super
@@ -48 +33 @@
 
   method get_frame buf =
-    let offset = AFrame.position buf in
     source#get buf;
-    let rms = AFrame.rms buf offset (AFrame.position buf - offset) in
-    let vol = Array.map (vol (Array.length rms)) rms in
-    let vol = Array.fold_left (fun ans s -> ans ^ "  " ^ s) "" vol in
-    let vol = String.sub vol 2 (String.length vol - 2) in
-      if scroll then
-        Printf.printf "%s\n%!" vol
-      else
-        Printf.printf "\r%s%!" vol
+    let m = MFrame.tracks buf in
+      for c = 0 to Array.length m - 1 do
+        List.iter
+          (fun (t, e) ->
+             let s =
+               match e with
+                 | Midi.Note_on (n, v) ->
+                     Printf.sprintf "Note %d on at %.02f" n v
+                 | Midi.Note_off (n, v) ->
+                     Printf.sprintf "Note %d off at %.02f" n v
+                 | _ -> "???"
+             in
+               Printf.printf "%d: %s.\n%!" c s
+          ) !(m.(c))
+      done
 end
 
 let () =
-  Lang.add_operator "vumeter"
-    [ "scroll", Lang.bool_t, Some (Lang.bool false), Some "Scroll.";
-      "", Lang.source_t, None, None ]
+  Lang.add_operator "midimeter"
+    [ "", Lang.source_t, None, None ]
     ~category:Lang.Visualization
-    ~descr:"VU meter (display the volume)."
+    ~flags:[Lang.Hidden; Lang.Experimental]
+    ~descr:"Display midi events."
     (fun p _ ->
        let f v = List.assoc v p in
-       let scroll, src =
-         Lang.to_bool (f "scroll"),
-         Lang.to_source (f "")
-       in
-         ((new vumeter src scroll):>Source.source))
+       let src = Lang.to_source (f "") in
+         ((new midimeter src):>Source.source))