update dist files

H0201030 · Aug 8, 2013 · 27a37ca · 27a37ca
1 parent e3a1718
commit 27a37ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/dist/RecordRTC.js → dist/RecordRTC-together.js b/dist/RecordRTC.js → dist/RecordRTC-together.js
@@ -600,7 +600,8 @@ function StereoAudioRecorder(mediaStream, root) {
     recorder.connect(context.destination);
 }
 ;// Wang Zhuochun
-// 20/Jul/2013 10:04 PM
+// https://github.com/H0201030/record-rtc-together
+// 08/Aug/2013 06:08 PM
 
 (function() {
 
@@ -682,14 +683,23 @@ function StereoAudioRecorder(mediaStream, root) {
         startVideo: function() {
             console.log('started recording video frames');
 
+            // reset video blob
+            this.videoBlob = null;
+
             // set canvas width, height
             this.c_width = this.options.canvas_width || defaults.canvas_width;
             this.c_height = this.options.canvas_height || defaults.canvas_height;
             // set video width, height
             this.v_width = this.options.video_width || this.videoElem.offsetWidth;
             this.v_height = this.options.video_height || this.videoElem.offsetHeight;
 
-            // TODO select the min width/height btw canvas and videoElem
+            if (this.v_width < this.c_width) {
+                this.v_width = this.c_width;
+            }
+
+            if (this.v_height < this.c_height) {
+                this.v_height = this.c_height;
+            }
 
             this.canvas.width = this.c_width;
             this.canvas.height = this.c_height;
@@ -717,6 +727,9 @@ function StereoAudioRecorder(mediaStream, root) {
         startAudio: function() {
             console.log('started recording audio frames');
 
+            // reset audio blob
+            this.audioBlob = null;
+
             var self = this,
                 onDataReady = {
                     ondataavailable: self.onAudioReady.bind(self)
@@ -750,24 +763,24 @@ function StereoAudioRecorder(mediaStream, root) {
         // stop record all
         stop: function() {
             if (this.options.enable) {
-                if (this.options.enable.audio) this.stopAudio();
                 if (this.options.enable.video) this.stopVideo();
+                if (this.options.enable.audio) this.stopAudio();
             } else if (defaults.enable) {
-                if (defaults.enable.audio) this.stopAudio();
                 if (defaults.enable.video) this.stopVideo();
+                if (defaults.enable.audio) this.stopAudio();
             }
         },
         // on video ready
         onVideoReady: function(callback) {
-            console.log('on video ready');
-
             if (isFunction(callback)) {
                 this.onVideoCallback = callback;
 
                 if (this.videoBlob) {
                     callback(this.videoBlob);
                 }
             } else {
+                console.log('on video ready');
+
                 this.videoBlob = callback;
 
                 if (this.onVideoCallback) {
@@ -777,15 +790,15 @@ function StereoAudioRecorder(mediaStream, root) {
         },
         // on audio ready
         onAudioReady: function(callback) {
-            console.log('on audio ready');
-
             if (isFunction(callback)) {
                 this.onAudioCallback = callback;
 
                 if (this.audioBlob) {
                     callback(this.audioBlob);
                 }
             } else {
+                console.log('on audio ready');
+
                 this.audioBlob = callback;
 
                 if (this.onAudioCallback) {