Mercurial > hg > webaudioevaluationtool
comparison js/core.js @ 2680:470bbfd78a96
Merge branch 'vnext' into Dev_main
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Wed, 01 Mar 2017 11:56:08 +0000 |
parents | 628f447a021b 7ebeb0bffc5a |
children | 95f614a82762 |
comparison
equal
deleted
inserted
replaced
2679:628f447a021b | 2680:470bbfd78a96 |
---|---|
1914 copybuffer.buffer = callee.cropBuffer(startTime || 0, stopTime || callee.buffer.duration); | 1914 copybuffer.buffer = callee.cropBuffer(startTime || 0, stopTime || callee.buffer.duration); |
1915 if (preSilenceTime !== 0 || postSilenceTime !== 0) { | 1915 if (preSilenceTime !== 0 || postSilenceTime !== 0) { |
1916 copybuffer.buffer = copybuffer.copyBuffer(preSilenceTime, postSilenceTime); | 1916 copybuffer.buffer = copybuffer.copyBuffer(preSilenceTime, postSilenceTime); |
1917 } | 1917 } |
1918 | 1918 |
1919 copybuffer.lufs = callee.buffer.lufs; | 1919 copybuffer.buffer.lufs = callee.buffer.lufs; |
1920 this.buffer = copybuffer; | 1920 this.buffer = copybuffer; |
1921 | 1921 |
1922 var targetLUFS = this.specification.parent.loudness || specification.loudness; | 1922 var targetLUFS = this.specification.loudness || this.specification.parent.loudness || specification.loudness; |
1923 if (typeof targetLUFS === "number" && isFinite(targetLUFS)) { | 1923 if (typeof targetLUFS === "number" && isFinite(targetLUFS)) { |
1924 this.buffer.buffer.playbackGain = decibelToLinear(targetLUFS - this.buffer.buffer.lufs); | 1924 this.buffer.buffer.playbackGain = decibelToLinear(targetLUFS - this.buffer.buffer.lufs); |
1925 } else { | 1925 } else { |
1926 this.buffer.buffer.playbackGain = 1.0; | 1926 this.buffer.buffer.playbackGain = 1.0; |
1927 } | 1927 } |