Changeset 7109

Timestamp:

01/26/10 05:13:19 (7 months ago)

Author:

metamorph68

Message:

Set either quality or bitrate for mp3 encoder..

Location:

trunk/liquidsoap/src

Files:

• encoder/encoder.ml (modified) (1 diff)
• encoder/lame_encoder.ml (modified) (3 diffs)
• lang/lang_parser.mly (modified) (2 diffs)
• outputs/icecast2.ml (modified) (1 diff)

trunk/liquidsoap/src/encoder/encoder.ml

@@ -67 +67 @@
 struct
 
+  type bitrate_control = Quality of int | Bitrate of int
+
   type t = {
     stereo     : bool ;
-    quality    : int ;
+    bitrate    : bitrate_control ;
     samplerate : int ;
-    bitrate    : int ;
-  }
+  }
+
+  let string_of_bitrate_control x = 
+    match x with
+      | Quality x -> Printf.sprintf "quality=%i" x
+      | Bitrate x -> Printf.sprintf "bitrate=%i" x
 
   let to_string m =
-    Printf.sprintf "%%mp3(%s,quality=%d,samplerate=%d,bitrate=%d)"
+    Printf.sprintf "%%mp3(%s,%s,samplerate=%d)"
       (string_of_stereo m.stereo)
-      m.quality
+      (string_of_bitrate_control m.bitrate)
       m.samplerate
-      m.bitrate
 
 end

trunk/liquidsoap/src/encoder/lame_encoder.ml

@@ -26 +26 @@
 open Encoder.MP3
 
-let create_encoder ~samplerate ~bitrate ~quality ~stereo =
+let create_encoder ~samplerate ~bitrate ~stereo =
   let enc = Lame.create_encoder () in
     (* Input settings *)
@@ -33 +33 @@
     (* Output settings *)
     Lame.set_mode enc (if stereo then Lame.Stereo else Lame.Mono) ;
-    Lame.set_quality enc quality ;
+    begin
+      match bitrate with
+        | Encoder.MP3.Quality quality ->
+             Lame.set_quality enc quality
+        | Encoder.MP3.Bitrate bitrate ->
+             Lame.set_brate enc bitrate
+    end; 
     Lame.set_out_samplerate enc samplerate ;
-    Lame.set_brate enc bitrate ;
     Lame.init_params enc ;
     enc
@@ -43 +48 @@
   let e = create_encoder ~samplerate:mp3.samplerate 
                          ~bitrate:mp3.bitrate 
-                         ~quality:mp3.quality 
                          ~stereo:mp3.stereo 
   in

trunk/liquidsoap/src/lang/lang_parser.mly

@@ -120 +120 @@
           stereo = true ;
           samplerate = 44100 ;
-          bitrate = 128 ;
-          quality = 5 }
+          bitrate = Encoder.MP3.Bitrate 128 }
     in
     let mp3 =
@@ -132 +131 @@
                 { f with Encoder.MP3.samplerate = i }
             | ("bitrate",{ term = Int i }) ->
-                { f with Encoder.MP3.bitrate = i }
+                { f with Encoder.MP3.bitrate = 
+                         Encoder.MP3.Bitrate i }
             | ("quality",{ term = Int q }) ->
-                { f with Encoder.MP3.quality = q }
+                { f with Encoder.MP3.bitrate = 
+                         Encoder.MP3.Quality q }
 
             | ("",{ term = Var s }) when String.lowercase s = "mono" ->

trunk/liquidsoap/src/outputs/icecast2.ml

@@ -95 +95 @@
       match enc with
         | Encoder.MP3 m ->
-            { quality = Some (string_of_int m.Encoder.MP3.quality) ;
-              bitrate = Some m.Encoder.MP3.bitrate ;
+            let quality,bitrate = 
+              match m.Encoder.MP3.bitrate with
+                | Encoder.MP3.Bitrate x -> None,(Some x)
+                | Encoder.MP3.Quality x -> (Some (string_of_int x)),None
+            in
+            { quality = quality ;
+              bitrate = bitrate ;
               samplerate = Some m.Encoder.MP3.samplerate ;
               channels = Some (if m.Encoder.MP3.stereo then 2 else 1)