Changeset 7125

Timestamp:

01/30/10 07:14:11 (7 months ago)

Author:

dbaelde

Message:

Fix a dumb bug in audio_to_stereo, which was really only tested on streams until now.

Files:

• trunk/liquidsoap/src/conversions/audio_to_stereo.ml (modified) (3 diffs)

trunk/liquidsoap/src/conversions/audio_to_stereo.ml

@@ -45 +45 @@
     let start = Frame.position frame in
     let stop  = source#get frame ; Frame.position frame in
+    let len   = stop-start in
     let _,src = Frame.content frame start in
       assert (src.Frame.video = [||] && src.Frame.midi = [||]) ;
@@ -59 +60 @@
                 src !start
                 dst.Frame.audio.(0) !start
-                !stop ;
+                !len ;
               Array.blit
                 src !start
                 dst.Frame.audio.(1) !start
-                !stop
+                !len
         | [|_;_|] -> ()
         | src ->
+            (* We have more than two channels: drop the last ones. *)
             let dst = Frame.content_of_type frame start stereo in
             let (!) = Frame.audio_of_master in
@@ -71 +73 @@
                 src.(0) !start
                 dst.Frame.audio.(0) !start
-                !stop ;
+                !len ;
               Array.blit
                 src.(1) !start
                 dst.Frame.audio.(1) !start
-                !stop
+                !len
 
 end