Changeset 6693

Timestamp:

06/28/09 23:03:17 (14 months ago)

Author:

smimram

Message:

Start experimenting a new idea: audio synthesis. Nothing to see for now though...

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (6 diffs)
• stream/frame.ml (modified) (4 diffs)
• stream/frame.mli (modified) (2 diffs)
• stream/mFrame.ml (copied) (copied from trunk/liquidsoap/src/stream/vFrame.ml) (1 diff)
• stream/mFrame.mli (copied) (copied from trunk/liquidsoap/src/stream/vFrame.mli) (2 diffs)
• stream/midi.ml (modified) (1 diff)
• synth (added)
• synth/Makefile (added)
• synth/keyboard.ml (added)

trunk/liquidsoap/src/Makefile

@@ -2 +2 @@
 SUBDIRS= operators sources tools formats protocols outputs io plugins stream \
          visualization lang analyze playlists ogg_formats video_converters \
-         audio_converters
+         audio_converters synth
 
 DISTFILES = $(wildcard *.mli) Makefile \
@@ -138 +138 @@
         request.ml source.ml root.ml \
         stream/float_pcm_c.c stream/float_pcm.ml \
-        stream/aFrame.ml stream/vFrame.ml
+        stream/aFrame.ml stream/vFrame.ml stream/mFrame.ml
 
 visualization = visualization/vumeter.ml \
@@ -145 +145 @@
         $(if $(W_GL),visualization/vis_glvolume.ml) \
         visualization/video_volume.ml
+
+synth = synth/keyboard.ml
 
 liquidsoap_sources= $(tools) SVN.ml audio_converter.ml $(stream) \
@@ -156 +158 @@
         $(video_converters) $(audio_converters) \
         $(ogg_utils) $(protocols) $(sources) $(operators) $(outputs) $(io) \
-        $(analyze) $(playlists) $(visualization) $(formats) \
+        $(analyze) $(playlists) $(visualization) $(synth) $(formats) \
         shebang.ml \
         lang/lang_builtins.ml \
@@ -166 +168 @@
         -I tools -I lang -I playlists -I stream -I outputs -I formats \
         -I video_converters -I sources -I operators -I io -I visualization \
-        -I analyze -I ogg_formats -I audio_converters
+        -I analyze -I ogg_formats -I audio_converters -I synth
 OCAML_LFLAGS= $(if $(BYTE),dynlink.cma) $(if $(W_RTP),-cclib -lortp) \
                           $(if $(W_OPAL),-cclib -lopal)
 DEP_OPTS= -I sources -I operators -I tools -I lang -I formats -I playlists \
                   -I video_converters -I outputs -I io -I stream -I visualization \
-                  -I analyze -I ogg_formats -I audio_converters
+                  -I analyze -I ogg_formats -I audio_converters -I synth
 
 liquidsoap_doc_sources= \
@@ -186 +188 @@
         $(if $(W_OGG),ogg_encoder.ml ogg_demuxer.ml) \
         stream/frame.ml stream/float_pcm.ml stream/aFrame.ml \
-        stream/vFrame.ml stream/RGB.ml audio_converter.ml
+        stream/vFrame.ml stream/RGB.ml audio_converter.ml \
+        stream/mFrame.ml
 
 top_srcdir=..

trunk/liquidsoap/src/stream/frame.ml

@@ -27 +27 @@
 type track_t =
   | Float_pcm_t of float_pcm_t
-  | Midi_t of Midi.header
+  | Midi_t
   | RGB_t
 
 type track =
   | Float_pcm of (float_pcm_t * float_pcm)
-  | Midi of (Midi.header * Midi.track ref)
+  | Midi of (int * Midi.event) list ref
   | RGB of RGB.t array
 
@@ -63 +63 @@
       in
         Float_pcm (f, Array.create len 0.)
-  | Midi_t h ->
-      Midi (h, ref (Midi.create_track ()))
+  | Midi_t ->
+      Midi (ref (Midi.create_track ()))
   | RGB_t ->
       RGB (Array.init
@@ -98 +98 @@
 let kind_of_track = function
   | Float_pcm (t, _) -> Float_pcm_t t
-  | Midi (h, _) -> Midi_t h
+  | Midi _ -> Midi_t
   | RGB _ -> RGB_t
 
@@ -172 +172 @@
           let c x = int_of_float (float x *. r) in
             float_blit a (c src_pos) a' (c dst_pos) (c len)
-      | Midi (_,m), Midi (h,m') -> m' := !m
+      | Midi m, Midi m' -> m' := !m (* TODO: use parameters.... *)
       | RGB src, RGB dst ->
           (* TODO: handle offsets! *)

trunk/liquidsoap/src/stream/frame.mli

@@ -39 +39 @@
 type track_t =
   | Float_pcm_t of float_pcm_t (** PCM data *)
-  | Midi_t of Midi.header (** MIDI data *)
+  | Midi_t (** MIDI data *)
   | RGB_t (** YUV video data *)
 
@@ -45 +45 @@
 type track =
   | Float_pcm of (float_pcm_t * float_pcm) (** PCM data *)
-  | Midi of (Midi.header * Midi.track ref) (** MIDI data *)
+  | Midi of (int * Midi.event) list ref (** MIDI data *)
   | RGB of RGB.t array (** YUV data as an array of frames *)
 

trunk/liquidsoap/src/stream/mFrame.ml

@@ -1 +1 @@
 include Frame
-
-let vot = Fmt.video_frames_of_ticks
-let tov = Fmt.ticks_of_video_frames
-
-let size t = vot (size t)
-let position t = vot (position t)
-let add_break t i = add_break t (tov i)
-
-let set_metadata t i m = set_metadata t (tov i) m
-let get_metadata t i = get_metadata t (tov i)
-
-let get_rgb b =
-  let tracks = Array.to_list (Frame.get_tracks b) in
-  let ans =
-    List.fold_left
-      (fun l t ->
-         match t with
-           | RGB a -> a::l
-           | _ -> l
-      ) [] tracks in
-    Array.of_list ans

trunk/liquidsoap/src/stream/mFrame.mli

@@ -1 @@
-(** Video frame manipulation *)
+(** MIDI frame manipulation *)
 
 type t = Frame.t
@@ -19 +19 @@
 val set_metadata     : t -> int -> metadata -> unit
 val get_metadata     : t -> int -> metadata option
-
-(** Get the contents of all video channels. *)
-val get_rgb : t -> RGB.t array array

trunk/liquidsoap/src/stream/midi.ml

@@ -26 +26 @@
 
 type event =
-  | Note_off of int * int
-  | Note_on of int * int
-  | Aftertouch of int * int
+  | Note_off of int * float
+  | Note_on of int * float (** Note on: note number (A4 = 91), velocity (between 0 and 1). *)
+  | Aftertouch of int * float
   | Control_change of int * int
   | Patch of int