Changeset 35879 for lang/actionscript

Timestamp:

11/09/09 20:39:14 (2 years ago)

Author:

arche

Message:

OffGaoさんより報告のあったDPCM音源のバグ修正と全体的な高速化

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MChannel.as (modified) (5 diffs)
• com/txt_nifty/sketch/flmml/MFilter.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MFormant.as (modified) (1 diff)
• com/txt_nifty/sketch/flmml/MOscFcDpcm.as (modified) (3 diffs)
• flmml.swf (modified) (previous)

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MChannel.as

@@ -20 +20 @@
         private var m_velocity:Number;         // velocity (max:1.0)
         private var m_ampLevel:Number;         // amplifier level (max:1.0)
-        private var m_panL:Number;
-        private var m_panR:Number;
+        private var m_pan:Number;                               // left 0.0 - 1.0 right
         private var m_onCounter:int;
         private var m_lfoDelay:int;
@@ -201 +200 @@
         }
         public function setPan(pan:int):void {
-            // left 0 - 64 - 127 right
-            // master_vol = 0.25
-            m_panR = (pan - 1) * (0.25 / 63.0);
-            if (m_panR < 0) m_panR = 0;
-            m_panL = (2.0 * 0.25) - m_panR;
+            // left 1 - 64 - 127 right
+            // master_vol = (0.25 * 2)
+            m_pan = (pan - 1) * (0.5 / 63.0);
+            if (m_pan < 0) m_pan = 0;
         }
         public function setFormant(vowel:int):void {
@@ -273 +271 @@
         public function getSamples(samples:Vector.<Number>, max:int, start:int, delta:int):void {
             var end:int = start + delta;
-            var amplitude:Number;
+            var amplitude:Number, rightAmplitude:Number;
+            var playing:Boolean = m_envelope1.isPlaying(), tmpFlag:Boolean;
             var freqNo:int;
-            var i:int;
+            var i:int, j:int;
             if (end >= max) end = max;
             var key:Number = m_oscMod1.getFrequency();
-            if (!m_envelope1.isPlaying()) {
-                for(i = start; i < end; i++) s_samples[i] = 0.0;
+            if (!playing) {
+                // for(i = start; i < end; i++) s_samples[i] = 0.0;
             }
             else if (m_inSens < 0.000001) {
@@ -353 +352 @@
                 }
             }
-            if (m_ringSens >= 0.000001) {
+            if (playing && (m_ringSens >= 0.000001)) {
                 // with ring
                 for(i = start; i < end; i++){
@@ -359 +358 @@
                                 }
             }
-            m_formant.run(s_samples, start, end);
-            m_filter.run(s_samples, start, end, m_envelope2, m_lpfFrq, m_lpfAmt, m_lpfRes, key);
-            switch(m_outMode) {
-            case 0:
-                //trace("output audio");
+            
+            // フォルマントフィルタを経由した後の音声が無音であればスキップ
+            tmpFlag = playing;
+            playing = playing || m_formant.checkToSilence();
+            if(playing != tmpFlag){
+                for(i = start; i < end; i++) s_samples[i] = 0;
+            }
+            if(playing){
+                m_formant.run(s_samples, start, end);
+            }
+
+            // フィルタを経由した後の音声が無音であればスキップ
+            tmpFlag = playing;
+            playing = playing || m_filter.checkToSilence();
+            if(playing != tmpFlag){
+                for(i = start; i < end; i++) s_samples[i] = 0;
+            }
+            if(playing){
+                m_filter.run(s_samples, start, end, m_envelope2, m_lpfFrq, m_lpfAmt, m_lpfRes, key);
+            }
+            
+            if(playing){
+                switch(m_outMode) {
+                case 0:
+                    //trace("output audio");
+                    for(i = start; i < end; i++) {
+                        j = i << 1;
+                        amplitude = s_samples[i] * 0.5;
+                        rightAmplitude = amplitude * m_pan;
+                        samples[j]   += amplitude - rightAmplitude;
+                        samples[j+1] += rightAmplitude;
+                    }
+                    break;
+                case 1: // overwrite
+                    //trace("output "+m_outPipe);
+                    for(i = start; i < end; i++) {
+                        s_pipeArr[m_outPipe][i] = s_samples[i];
+                    }
+                    break;
+                case 2: // add
+                    for(i = start; i < end; i++) {
+                        s_pipeArr[m_outPipe][i] += s_samples[i];
+                    }
+                    break;
+                }
+            }else if(m_outMode == 1){
                 for(i = start; i < end; i++) {
-                    amplitude = s_samples[i];
-                    samples[i+i]   += amplitude * m_panL;
-                    samples[i+i+1] += amplitude * m_panR;
-                }
-                break;
-            case 1: // overwrite
-                //trace("output "+m_outPipe);
-                for(i = start; i < end; i++) {
-                    s_pipeArr[m_outPipe][i] = s_samples[i];
-                }
-                break;
-            case 2: // add
-                for(i = start; i < end; i++) {
-                    s_pipeArr[m_outPipe][i] += s_samples[i];
-                }
-                break;
-            default:
-                break;
+                    s_pipeArr[m_outPipe][i] = 0;
+                }
             }
         }

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MFilter.as

@@ -28 +28 @@
             reset();
             sw = s;
+        }
+        // 無音入力時に何かの信号を出力するかのチェック
+        public function checkToSilence():Boolean {
+            switch(sw){
+                case 0:
+                    return false;
+                case 1:
+                case -1:
+                    return (-0.000001 <= b0 && b0 <= 0.000001 && -0.000001 <= b1 && b1 <= 0.000001);
+                case 2:
+                case -2:
+                    return (
+                        -0.000001 <= t1 && t1 <= 0.000001 &&
+                        -0.000001 <= t2 && t2 <= 0.000001 &&
+                        -0.000001 <= b0 && b0 <= 0.000001 &&
+                        -0.000001 <= b1 && b1 <= 0.000001 &&
+                        -0.000001 <= b2 && b2 <= 0.000001 &&
+                        -0.000001 <= b3 && b3 <= 0.000001 &&
+                        -0.000001 <= b4 && b4 <= 0.000001
+                    ); 
+            }
+            return false;
         }
         public function run(samples:Vector.<Number>, start:int, end:int, envelope:MEnvelope, frq:Number, amt:Number, res:Number, key:Number):void {

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MFormant.as

@@ -64 +64 @@
             for(var i:int = m_len-1; i >= 0; i--) m_lMemory[i] = m_rMemory[i] = 0;
         }
+
+        // 無音入力時に何かの信号を出力するかのチェック
+        public function checkToSilence():Boolean {
+            return m_power && (
+                -0.000001 <= m_lMemory[0] && m_lMemory[0] <= 0.000001 &&
+                -0.000001 <= m_lMemory[1] && m_lMemory[1] <= 0.000001 &&
+                -0.000001 <= m_lMemory[2] && m_lMemory[2] <= 0.000001 &&
+                -0.000001 <= m_lMemory[3] && m_lMemory[3] <= 0.000001 &&
+                -0.000001 <= m_lMemory[4] && m_lMemory[4] <= 0.000001 &&
+                -0.000001 <= m_lMemory[5] && m_lMemory[5] <= 0.000001 &&
+                -0.000001 <= m_lMemory[6] && m_lMemory[6] <= 0.000001 &&
+                -0.000001 <= m_lMemory[7] && m_lMemory[7] <= 0.000001 &&
+                -0.000001 <= m_lMemory[8] && m_lMemory[8] <= 0.000001 &&
+                -0.000001 <= m_lMemory[9] && m_lMemory[9] <= 0.000001
+            );
+        }
         
         public function run(samples:Vector.<Number>, start:int, end:int):void {

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MOscFcDpcm.as

@@ -1 +1 @@
 package com.txt_nifty.sketch.flmml {
     /**
-       09/05/11 by OffGao
+       DPCM Oscillator by OffGao
+       09/05/11：作成
+       09/11/05：波形データ格納処理で、データが32bitごとに1bit抜けていたのを修正
      */
     import __AS3__.vec.Vector;
@@ -24 +26 @@
         protected static var s_length:Vector.<int>;     //再生レングス
         protected var m_waveNo:int;
-        protected static var s_interval:Vector.<int> = Vector.<int>([
+        protected static var s_interval:Vector.<int> = Vector.<int>([ //音程
                         428, 380, 340, 320, 286, 254, 226, 214, 190, 160, 142, 128, 106,  85,  72,  54,
                 ]);
@@ -80 +82 @@
                 }
                                 for(i = 5; i >=0 ; i--) {
-                                        s_table[waveNo][intPos] += ((code >> i) & 1) << (intCnt*8 + 8-intCn2);
+                                        s_table[waveNo][intPos] += ((code >> i) & 1) << (intCnt*8 + 7-intCn2);
                                         intCn2++;
                                         if (intCn2 >= 8) {