Changeset 28548 for gs3-extensions/web-audio/trunk/js-mad/script/main-jsmad.js

Timestamp:

2013-10-29T13:27:04+13:00 (10 years ago)

Author:

davidb

Message:

Changes after developing the demo for the SMAM-2013 keynote talk

File:

• gs3-extensions/web-audio/trunk/js-mad/script/main-jsmad.js (modified) (7 diffs)

gs3-extensions/web-audio/trunk/js-mad/script/main-jsmad.js

@@ -26 +26 @@
     this.playBufferStore = new Array();
 
+/*
+    // default is to operate as fast as possible
+    if (BrowserDetect.browser == "Firefox") {
+    this.speedup_batch_limit = 100;
+    this.speedup_pause = 0;
+    }
+    else {
+    // e.g. Chrome 
+    // => the following values played more nicely with letting DSP playback operate straightaway 
+    //    i.e. when jsmad is still working its way through the frames
+    
+    this.speedup_batch_limit = 10;
+    this.speedup_pause = 2;
+
+    //speedup_batch_limit = 100;
+    //speedup_pause = 0;
+
+    //console.log("*** Running JsMadProcessing with: batch limit = " + speedup_batch_limit 
+    //      + ", pause = " + this.speedup_pause + " msecs");
+    }
+*/
+
+    // Assume slow, unless the user explicitly activates "speed up"
+    this.speedup_batch_limit = 10;
+    this.speedup_pause = 1000;
+
+    this.processing_finished = false;
+
     stream.requestAbsolute(1 * 1024, function() { that.streamCallback(stream) });
 
 }
 
-
-
+JsMadProcessing.prototype.setSpeedupParams = function(new_batch_limit,new_pause) {
+    this.speedup_batch_limit = new_batch_limit;
+    this.speedup_pause       = new_pause;
+}
+
+
+JsMadProcessing.prototype.processingFinished = function() {
+    return this.processing_finished;
+}
 
 JsMadProcessing.prototype.streamCallback = function(stream) {
@@ -66 +101 @@
     console.log("*** main-jsmad.js::stream_callback(): hardwiring workflow buffer size to 2048");
 
-    var speedup_batch_limit;
-    var speedup_pause;
-    
-    if (BrowserDetect.browser == "Firefox") {
-    speedup_batch_limit = 100;
-    speedup_pause = 0;
-    }
-    else {
-    // e.g. Chrome 
-    // => the following values played more nicely with letting DSP playback operate straightaway 
-    //    i.e. when jsmad is still working its way through the frames
-    
-    speedup_batch_limit = 10;
-    speedup_pause = 2;
-
-    //speedup_batch_limit = 100;
-    //speedup_pause = 0;
-
-    console.log("*** Running JsMadProcessing with: batch limit = " + speedup_batch_limit 
-            + ", pause = " + speedup_pause + " msecs");
-    }
+    var $acc_proc_status = $('#accProcStatus') || null;
 
 
@@ -96 +111 @@
         var speedup_i = 0;
 
-        while (speedup_i < speedup_batch_limit) { // Decode 100 frames at a time, before setTimeout break
+        while (speedup_i < that.speedup_batch_limit) { // Decode 100 frames at a time, before setTimeout break
 
         frame = Mad.Frame.decode(frame, mpeg);
@@ -169 +184 @@
         speedup_i++;
         i++;
+
+
+        if ((i%10)==0) {
+            if ($acc_proc_status != null) {
+            $acc_proc_status.text(" (decoded " + i + " frames)");
+            }
+        }
+        
         }
         
@@ -175 +198 @@
         if (err == "Header decoding failed") {
         console.info("JsMadProcessing::streamCallack() decoded " + i + " frames");
+        $acc_proc_status.text(" (done)");
+        that.processing_finished = true;
         }
         else {
@@ -183 +208 @@
 
     if (more_frames) {
-        setTimeout(arguments.callee,speedup_pause); // even a delay of '0' gives the browser thread a break
+        setTimeout(arguments.callee,that.speedup_pause); // even a delay of '0' gives the browser thread a break
     }
     else {
@@ -194 +219 @@
         //console.log("Computed song duration: " + song_duration + " secs");
         console.info("JsMad processing done in " + speedup_duration + " secs (a speed factor of " + speedup_factor + ")");
+
+        $acc_proc_status.text(" (done)");
+        that.processing_finished = true;
+
     }