Changeset 7106

Timestamp:

01/25/10 21:50:04 (7 months ago)

Author:

metamorph68

Message:

Added back internal AAC+ encoding..

Location:

trunk/liquidsoap/src

Files:

• Makefile (modified) (1 diff)
• encoder/aacplus_encoder.ml (added)
• encoder/encoder.ml (modified) (4 diffs)
• lang/lang_lexer.mll (modified) (1 diff)
• lang/lang_parser.mly (modified) (4 diffs)
• outputs/icecast2.ml (modified) (7 diffs)

trunk/liquidsoap/src/Makefile

@@ -102 +102 @@
         encoder/external_encoder.ml \
         $(if $(W_LAME),encoder/lame_encoder.ml) \
-        # $(if $(W_AACPLUS),outputs/aacplus_encoded.ml) \
-        $(if $(W_FAAC),outputs/faac_encoded.ml)
+        $(if $(W_AACPLUS),encoder/aacplus_encoder.ml) \
+        # $(if $(W_FAAC),outputs/faac_encoded.ml)
 
 outputs = outputs/output.ml $(if $(W_AO),outputs/ao_out.ml) \

trunk/liquidsoap/src/encoder/encoder.ml

@@ -78 +78 @@
       (string_of_stereo m.stereo)
       m.quality
+      m.samplerate
+      m.bitrate
+
+end
+
+module AACPlus =
+struct
+
+  type t = {
+    channels   : int ;
+    samplerate : int ;
+    bitrate    : int ;
+  }
+
+  let to_string m =
+    Printf.sprintf "%%aac+(channels=%d,samplerate=%d,bitrate=%d)"
+      m.channels
       m.samplerate
       m.bitrate
@@ -239 +256 @@
   | Ogg of Ogg.t
   | MP3 of MP3.t
+  | AACPlus of AACPlus.t
   | External of External.t
 
@@ -247 +265 @@
   | MP3 m ->
       { Frame.audio = if m.MP3.stereo then 2 else 1 ;
+        Frame.video = 0 ; Frame.midi = 0 }
+  | AACPlus m ->
+      { Frame.audio = m.AACPlus.channels ;
         Frame.video = 0 ; Frame.midi = 0 }
   | Ogg l ->
@@ -276 +297 @@
   | Ogg w -> Ogg.to_string w
   | MP3 w -> MP3.to_string w
+  | AACPlus w -> AACPlus.to_string w
   | External w -> External.to_string w
 

trunk/liquidsoap/src/lang/lang_lexer.mll

@@ -138 +138 @@
   | "%wav" { WAV }
   | "%mp3" { MP3 }
+  | "%aac+" { AACPLUS }
+  | "%aacplus" { AACPLUS }
 
   | '[' { LBRA }

trunk/liquidsoap/src/lang/lang_parser.mly

@@ -145 +145 @@
     in
       mk (Encoder (Encoder.MP3 mp3))
+
+  let mk_aacplus params =
+    let defaults =
+      { Encoder.AACPlus.
+          channels = 2 ;
+          samplerate = 44100 ;
+          bitrate = 64 }
+    in
+    let aacplus =
+      List.fold_left
+        (fun f ->
+          function
+            | ("channels",{ term = Int i }) ->
+                { f with Encoder.AACPlus.channels = i }
+            | ("samplerate",{ term = Int i }) ->
+                { f with Encoder.AACPlus.samplerate = i }
+            | ("bitrate",{ term = Int i }) ->
+                { f with Encoder.AACPlus.bitrate = i }
+            | ("",{ term = Var s }) when String.lowercase s = "mono" ->
+                { f with Encoder.AACPlus.channels = 1 }
+            | ("",{ term = Var s }) when String.lowercase s = "stereo" ->
+                { f with Encoder.AACPlus.channels = 2 }
+
+            | _ -> raise Parsing.Parse_error)
+        defaults params
+    in
+      mk (Encoder (Encoder.AACPlus aacplus))
 
   let mk_external params =
@@ -390 +417 @@
 %token <int option list> TIME
 %token <int option list * int option list> INTERVAL
-%token OGG VORBIS VORBIS_CBR VORBIS_ABR THEORA DIRAC SPEEX WAV MP3 EXTERNAL
+%token OGG VORBIS VORBIS_CBR VORBIS_ABR THEORA DIRAC SPEEX WAV AACPLUS MP3 EXTERNAL
 %token EOF
 %token BEGIN END GETS TILD
@@ -457 +484 @@
   | GET expr                         { mk (Get $2) }
   | MP3 app_opt                      { mk_mp3 $2 }
+  | AACPLUS app_opt                      { mk_aacplus $2 }
   | EXTERNAL app_opt                 { mk_external $2 }
   | WAV app_opt                      { mk_wav $2 }
@@ -509 +537 @@
   | cexpr SET expr                   { mk (Set ($1,$3)) }
   | MP3 app_opt                      { mk_mp3 $2 }
+  | AACPLUS app_opt                      { mk_aacplus $2 }
   | EXTERNAL app_opt                 { mk_external $2 }
   | WAV app_opt                      { mk_wav $2 }

trunk/liquidsoap/src/outputs/icecast2.ml

@@ -89 +89 @@
 
   let source = Lang.assoc "" 2 p in
-  let encoder_factory,ogg,icecast_info =
+  let encoder_factory,format,icecast_info =
     let v = Lang.assoc "" 1 p in
     let enc = Lang.to_format v in
-    let icecast_info,ogg =
+    let icecast_info,format =
       match enc with
         | Encoder.MP3 m ->
@@ -99 +99 @@
               samplerate = Some m.Encoder.MP3.samplerate ;
               channels = Some (if m.Encoder.MP3.stereo then 2 else 1)
-            }, false
+            }, Some Cry.mpeg
+        | Encoder.AACPlus m ->
+            { quality = None ;
+              bitrate = Some m.Encoder.AACPlus.bitrate ;
+              samplerate = Some m.Encoder.AACPlus.samplerate ;
+              channels = Some m.Encoder.AACPlus.channels
+            }, Some (Cry.content_type_of_string "audio/aacp")
         | Encoder.External m ->
             { quality = None ;
@@ -105 +111 @@
               samplerate = Some m.Encoder.External.samplerate ;
               channels = Some m.Encoder.External.channels
-            }, false
+            }, None
         | Encoder.Ogg o ->
             let info =
@@ -118 +124 @@
                       samplerate = Some s ;
                       channels = Some n }
+                
                 | [Encoder.Ogg.Vorbis
                      {Encoder.Vorbis.channels=n;
@@ -138 +145 @@
               raise (Lang.Invalid_value
                        (v, "icy protocol (shoutcast) does not support Ogg")) ;
-              info, true
+              info, Some Cry.ogg_application
         | Encoder.WAV _ ->
             raise (Lang.Invalid_value (v, "WAV is not supported"))
@@ -148 +155 @@
                      (v, "No encoder found for that format"))
     in
-      encoder_factory, ogg, icecast_info
+      encoder_factory, format, icecast_info
   in
 
@@ -154 +161 @@
     let f = s "format" in
       if f <> "" then Cry.content_type_of_string f else
-        if ogg then Cry.ogg_application else Cry.mpeg
+        match format with 
+          | Some x -> x
+          | None   -> raise (Lang.Invalid_value (Lang.assoc "" 1 p, 
+                                                 "No content-type (mime) found, \
+                                                  please specify one."))
+  in
+
+  let ogg = 
+   (Cry.string_of_content_type format = Cry.string_of_content_type Cry.ogg_application) ||
+   (Cry.string_of_content_type format = Cry.string_of_content_type Cry.ogg_audio) ||
+   (Cry.string_of_content_type format = Cry.string_of_content_type Cry.ogg_video)
   in