diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index e036c0da7..4ff9359ef 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -591,9 +591,12 @@ class Status extends ImmutablePureComponent {
)}
diff --git a/app/javascript/flavours/glitch/features/audio/index.js b/app/javascript/flavours/glitch/features/audio/index.js
index ba3534492..172fe4c30 100644
--- a/app/javascript/flavours/glitch/features/audio/index.js
+++ b/app/javascript/flavours/glitch/features/audio/index.js
@@ -1,11 +1,135 @@
import React from 'react';
import PropTypes from 'prop-types';
-import WaveSurfer from 'wavesurfer.js';
import { defineMessages, injectIntl } from 'react-intl';
import { formatTime } from 'flavours/glitch/features/video';
import Icon from 'flavours/glitch/components/icon';
import classNames from 'classnames';
import { throttle } from 'lodash';
+import { encode, decode } from 'blurhash';
+import { getPointerPosition } from 'mastodon/features/video';
+
+const digitCharacters = [
+ '0',
+ '1',
+ '2',
+ '3',
+ '4',
+ '5',
+ '6',
+ '7',
+ '8',
+ '9',
+ 'A',
+ 'B',
+ 'C',
+ 'D',
+ 'E',
+ 'F',
+ 'G',
+ 'H',
+ 'I',
+ 'J',
+ 'K',
+ 'L',
+ 'M',
+ 'N',
+ 'O',
+ 'P',
+ 'Q',
+ 'R',
+ 'S',
+ 'T',
+ 'U',
+ 'V',
+ 'W',
+ 'X',
+ 'Y',
+ 'Z',
+ 'a',
+ 'b',
+ 'c',
+ 'd',
+ 'e',
+ 'f',
+ 'g',
+ 'h',
+ 'i',
+ 'j',
+ 'k',
+ 'l',
+ 'm',
+ 'n',
+ 'o',
+ 'p',
+ 'q',
+ 'r',
+ 's',
+ 't',
+ 'u',
+ 'v',
+ 'w',
+ 'x',
+ 'y',
+ 'z',
+ '#',
+ '$',
+ '%',
+ '*',
+ '+',
+ ',',
+ '-',
+ '.',
+ ':',
+ ';',
+ '=',
+ '?',
+ '@',
+ '[',
+ ']',
+ '^',
+ '_',
+ '{',
+ '|',
+ '}',
+ '~',
+];
+
+const decode83 = (str) => {
+ let value = 0;
+ let c, digit;
+
+ for (let i = 0; i < str.length; i++) {
+ c = str[i];
+ digit = digitCharacters.indexOf(c);
+ value = value * 83 + digit;
+ }
+
+ return value;
+};
+
+const decodeRGB = int => ({
+ r: Math.max(0, (int >> 16)),
+ g: Math.max(0, (int >> 8) & 255),
+ b: Math.max(0, (int & 255)),
+});
+
+const luma = ({ r, g, b }) => 0.2126 * r + 0.7152 * g + 0.0722 * b;
+
+const adjustColor = ({ r, g, b }, lumaThreshold = 100) => {
+ let delta;
+
+ if (luma({ r, g, b }) >= lumaThreshold) {
+ delta = -80;
+ } else {
+ delta = 80;
+ }
+
+ return {
+ r: r + delta,
+ g: g + delta,
+ b: b + delta,
+ };
+};
const messages = defineMessages({
play: { id: 'video.play', defaultMessage: 'Play' },
@@ -15,26 +139,36 @@ const messages = defineMessages({
download: { id: 'video.download', defaultMessage: 'Download file' },
});
+const TICK_SIZE = 10;
+const PADDING = 180;
+
export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
src: PropTypes.string.isRequired,
alt: PropTypes.string,
+ poster: PropTypes.string,
duration: PropTypes.number,
peaks: PropTypes.arrayOf(PropTypes.number),
+ width: PropTypes.number,
height: PropTypes.number,
preload: PropTypes.bool,
editable: PropTypes.bool,
intl: PropTypes.object.isRequired,
+ cacheWidth: PropTypes.func,
};
state = {
+ width: this.props.width,
currentTime: 0,
+ buffer: 0,
duration: null,
paused: true,
muted: false,
volume: 0.5,
+ dragging: false,
+ color: { r: 255, g: 255, b: 255 },
};
// hard coded in components.scss
@@ -49,96 +183,116 @@ class Audio extends React.PureComponent {
return (offset > 110) ? 110 : offset;
}
+ setPlayerRef = c => {
+ this.player = c;
+
+ if (c) {
+ const width = c.offsetWidth;
+ const height = width / (16/9);
+
+ if (this.props.cacheWidth) {
+ this.props.cacheWidth(width);
+ }
+
+ this.setState({ width, height });
+ }
+ }
+
+ setSeekRef = c => {
+ this.seek = c;
+ }
+
setVolumeRef = c => {
this.volume = c;
}
- setWaveformRef = c => {
- this.waveform = c;
+ setAudioRef = c => {
+ this.audio = c;
+
+ if (this.audio) {
+ this.setState({ volume: this.audio.volume, muted: this.audio.muted });
+ }
}
+ setBlurhashCanvasRef = c => {
+ this.blurhashCanvas = c;
+ }
+
+ setCanvasRef = c => {
+ this.canvas = c;
+
+ if (c) {
+ this.canvasContext = c.getContext('2d');
+ }
+ }
+
componentDidMount () {
- if (this.waveform) {
- this._updateWaveform();
- }
+ const img = new Image();
+ img.onload = () => this.handlePosterLoad(img);
+ img.src = this.props.poster;
}
- componentDidUpdate (prevProps) {
- if (this.waveform && prevProps.src !== this.props.src) {
- this._updateWaveform();
- }
- }
-
- componentWillUnmount () {
- if (this.wavesurfer) {
- this.wavesurfer.destroy();
- this.wavesurfer = null;
- }
- }
-
- _updateWaveform () {
- const { src, height, duration, peaks, preload } = this.props;
-
- const progressColor = window.getComputedStyle(document.querySelector('.audio-player__progress-placeholder')).getPropertyValue('background-color');
- const waveColor = window.getComputedStyle(document.querySelector('.audio-player__wave-placeholder')).getPropertyValue('background-color');
-
- if (this.wavesurfer) {
- this.wavesurfer.destroy();
- this.loaded = false;
+ componentDidUpdate (prevProps, prevState) {
+ if (prevProps.poster !== this.props.poster) {
+ const img = new Image();
+ img.onload = () => this.handlePosterLoad(img);
+ img.src = this.props.poster;
}
- const wavesurfer = WaveSurfer.create({
- container: this.waveform,
- height,
- barWidth: 3,
- cursorWidth: 0,
- progressColor,
- waveColor,
- backend: 'MediaElement',
- interact: preload,
- });
+ if (prevState.blurhash !== this.state.blurhash) {
+ const context = this.blurhashCanvas.getContext('2d');
+ const pixels = decode(this.state.blurhash, 32, 32);
+ const outputImageData = new ImageData(pixels, 32, 32);
- wavesurfer.setVolume(this.state.volume);
-
- if (preload) {
- wavesurfer.load(src);
- this.loaded = true;
- } else {
- wavesurfer.load(src, peaks, 'none', duration);
- this.loaded = false;
+ context.putImageData(outputImageData, 0, 0);
}
- wavesurfer.on('ready', () => this.setState({ duration: Math.floor(wavesurfer.getDuration()) }));
- wavesurfer.on('audioprocess', () => this.setState({ currentTime: Math.floor(wavesurfer.getCurrentTime()) }));
- wavesurfer.on('pause', () => this.setState({ paused: true }));
- wavesurfer.on('play', () => this.setState({ paused: false }));
- wavesurfer.on('volume', volume => this.setState({ volume }));
- wavesurfer.on('mute', muted => this.setState({ muted }));
-
- this.wavesurfer = wavesurfer;
+ this._clear();
+ this._draw();
}
togglePlay = () => {
if (this.state.paused) {
- if (!this.props.preload && !this.loaded) {
- this.wavesurfer.createBackend();
- this.wavesurfer.createPeakCache();
- this.wavesurfer.load(this.props.src);
- this.wavesurfer.toggleInteraction();
- this.wavesurfer.setVolume(this.state.volume);
- this.loaded = true;
- }
-
- this.wavesurfer.play();
- this.setState({ paused: false });
+ this.setState({ paused: false }, () => this.audio.play());
} else {
- this.wavesurfer.pause();
- this.setState({ paused: true });
+ this.setState({ paused: true }, () => this.audio.pause());
+ }
+ }
+
+ handlePlay = () => {
+ this.setState({ paused: false });
+
+ if (this.canvas && !this.audioContext) {
+ this._initAudioContext();
+ }
+
+ if (this.audioContext && this.audioContext.state === 'suspended') {
+ this.audioContext.resume();
+ }
+
+ this._renderCanvas();
+ }
+
+ handlePause = () => {
+ this.setState({ paused: true });
+
+ if (this.audioContext) {
+ this.audioContext.suspend();
+ }
+ }
+
+ handleProgress = () => {
+ if (this.audio.buffered.length > 0) {
+ this.setState({ buffer: this.audio.buffered.end(0) / this.audio.duration * 100 });
}
}
toggleMute = () => {
- this.wavesurfer.setMute(!this.state.muted);
+ const muted = !this.state.muted;
+
+ this.setState({ muted }, () => {
+ this.audio.muted = muted;
+ });
}
handleVolumeMouseDown = e => {
@@ -160,6 +314,48 @@ class Audio extends React.PureComponent {
document.removeEventListener('touchend', this.handleVolumeMouseUp, true);
}
+ handleMouseDown = e => {
+ document.addEventListener('mousemove', this.handleMouseMove, true);
+ document.addEventListener('mouseup', this.handleMouseUp, true);
+ document.addEventListener('touchmove', this.handleMouseMove, true);
+ document.addEventListener('touchend', this.handleMouseUp, true);
+
+ this.setState({ dragging: true });
+ this.audio.pause();
+ this.handleMouseMove(e);
+
+ e.preventDefault();
+ e.stopPropagation();
+ }
+
+ handleMouseUp = () => {
+ document.removeEventListener('mousemove', this.handleMouseMove, true);
+ document.removeEventListener('mouseup', this.handleMouseUp, true);
+ document.removeEventListener('touchmove', this.handleMouseMove, true);
+ document.removeEventListener('touchend', this.handleMouseUp, true);
+
+ this.setState({ dragging: false });
+ this.audio.play();
+ }
+
+ handleMouseMove = throttle(e => {
+ const { x } = getPointerPosition(this.seek, e);
+ const currentTime = Math.floor(this.audio.duration * x);
+
+ if (!isNaN(currentTime)) {
+ this.setState({ currentTime }, () => {
+ this.audio.currentTime = currentTime;
+ });
+ }
+ }, 60);
+
+ handleTimeUpdate = () => {
+ this.setState({
+ currentTime: Math.floor(this.audio.currentTime),
+ duration: Math.floor(this.audio.duration),
+ });
+ }
+
handleMouseVolSlide = throttle(e => {
const rect = this.volume.getBoundingClientRect();
const x = (e.clientX - rect.left) / this.volWidth; // x position within the element.
@@ -173,30 +369,267 @@ class Audio extends React.PureComponent {
slideamt = 0;
}
- this.wavesurfer.setVolume(slideamt);
+ this.setState({ volume: slideamt }, () => {
+ this.audio.volume = slideamt;
+ });
}
}, 60);
+ _initAudioContext () {
+ const context = new AudioContext();
+ const analyser = context.createAnalyser();
+ const source = context.createMediaElementSource(this.audio);
+
+ analyser.smoothingTimeConstant = 0.6;
+ analyser.fftSize = 2048;
+
+ source.connect(analyser);
+ source.connect(context.destination);
+
+ this.audioContext = context;
+ this.analyser = analyser;
+ }
+
+ handlePosterLoad = image => {
+ const canvas = document.createElement('canvas');
+ const context = canvas.getContext('2d');
+
+ canvas.width = image.width;
+ canvas.height = image.height;
+
+ context.drawImage(image, 0, 0);
+
+ const inputImageData = context.getImageData(0, 0, image.width, image.height);
+ const blurhash = encode(inputImageData.data, image.width, image.height, 4, 4);
+ const averageColor = decodeRGB(decode83(blurhash.slice(2, 6)));
+
+ this.setState({
+ blurhash,
+ color: adjustColor(averageColor),
+ darkText: luma(averageColor) >= 165,
+ });
+ }
+
+ _renderCanvas () {
+ requestAnimationFrame(() => {
+ this._clear();
+ this._draw();
+
+ if (!this.state.paused) {
+ this._renderCanvas();
+ }
+ });
+ }
+
+ _clear () {
+ this.canvasContext.clearRect(0, 0, this.state.width, this.state.height);
+ }
+
+ _draw () {
+ this.canvasContext.save();
+
+ const ticks = this._getTicks(360 * this._getScaleCoefficient(), TICK_SIZE);
+
+ ticks.forEach(tick => {
+ this._drawTick(tick.x1, tick.y1, tick.x2, tick.y2);
+ });
+
+ this.canvasContext.restore();
+ }
+
+ _getRadius () {
+ return parseInt(((this.state.height || this.props.height) - (PADDING * this._getScaleCoefficient()) * 2) / 2);
+ }
+
+ _getScaleCoefficient () {
+ return (this.state.height || this.props.height) / 982;
+ }
+
+ _getTicks (count, size, animationParams = [0, 90]) {
+ const radius = this._getRadius();
+ const ticks = this._getTickPoints(count);
+ const lesser = 200;
+ const m = [];
+ const bufferLength = this.analyser ? this.analyser.frequencyBinCount : 0;
+ const frequencyData = new Uint8Array(bufferLength);
+ const allScales = [];
+ const scaleCoefficient = this._getScaleCoefficient();
+
+ if (this.analyser) {
+ this.analyser.getByteFrequencyData(frequencyData);
+ }
+
+ ticks.forEach((tick, i) => {
+ const coef = 1 - i / (ticks.length * 2.5);
+
+ let delta = ((frequencyData[i] || 0) - lesser * coef) * scaleCoefficient;
+
+ if (delta < 0) {
+ delta = 0;
+ }
+
+ let k;
+
+ if (animationParams[0] <= tick.angle && tick.angle <= animationParams[1]) {
+ k = radius / (radius - this._getSize(tick.angle, animationParams[0], animationParams[1]) - delta);
+ } else {
+ k = radius / (radius - (size + delta));
+ }
+
+ const x1 = tick.x * (radius - size);
+ const y1 = tick.y * (radius - size);
+ const x2 = x1 * k;
+ const y2 = y1 * k;
+
+ m.push({ x1, y1, x2, y2 });
+
+ if (i < 20) {
+ let scale = delta / (200 * scaleCoefficient);
+ scale = scale < 1 ? 1 : scale;
+ allScales.push(scale);
+ }
+ });
+
+ const scale = allScales.reduce((pv, cv) => pv + cv, 0) / allScales.length;
+
+ return m.map(({ x1, y1, x2, y2 }) => ({
+ x1: x1,
+ y1: y1,
+ x2: x2 * scale,
+ y2: y2 * scale,
+ }));
+ }
+
+ _getSize (angle, l, r) {
+ const scaleCoefficient = this._getScaleCoefficient();
+ const maxTickSize = TICK_SIZE * 9 * scaleCoefficient;
+ const m = (r - l) / 2;
+ const x = (angle - l);
+
+ let h;
+
+ if (x === m) {
+ return maxTickSize;
+ }
+
+ const d = Math.abs(m - x);
+ const v = 40 * Math.sqrt(1 / d);
+
+ if (v > maxTickSize) {
+ h = maxTickSize;
+ } else {
+ h = Math.max(TICK_SIZE, v);
+ }
+
+ return h;
+ }
+
+ _getTickPoints (count) {
+ const PI = 360;
+ const coords = [];
+ const step = PI / count;
+
+ let rad;
+
+ for(let deg = 0; deg < PI; deg += step) {
+ rad = deg * Math.PI / (PI / 2);
+ coords.push({ x: Math.cos(rad), y: -Math.sin(rad), angle: deg });
+ }
+
+ return coords;
+ }
+
+ _drawTick (x1, y1, x2, y2) {
+ const radius = this._getRadius();
+ const cx = parseInt(this.state.width / 2);
+ const cy = parseInt(radius + (PADDING * this._getScaleCoefficient()));
+
+ const dx1 = parseInt(cx + x1);
+ const dy1 = parseInt(cy + y1);
+ const dx2 = parseInt(cx + x2);
+ const dy2 = parseInt(cy + y2);
+
+ const gradient = this.canvasContext.createLinearGradient(dx1, dy1, dx2, dy2);
+
+ const mainColor = `rgb(${this.state.color.r}, ${this.state.color.g}, ${this.state.color.b})`;
+ const lastColor = `rgba(${this.state.color.r}, ${this.state.color.g}, ${this.state.color.b}, 0)`;
+
+ gradient.addColorStop(0, mainColor);
+ gradient.addColorStop(0.6, mainColor);
+ gradient.addColorStop(1, lastColor);
+
+ this.canvasContext.beginPath();
+ this.canvasContext.strokeStyle = gradient;
+ this.canvasContext.lineWidth = 2;
+ this.canvasContext.moveTo(dx1, dy1);
+ this.canvasContext.lineTo(dx2, dy2);
+ this.canvasContext.stroke();
+ }
+
+ _getColor () {
+ return `rgb(${this.state.color.r}, ${this.state.color.g}, ${this.state.color.b})`;
+ }
+
render () {
- const { height, intl, alt, editable } = this.props;
- const { paused, muted, volume, currentTime } = this.state;
+ const { src, intl, alt, editable } = this.props;
+ const { paused, muted, volume, currentTime, duration, buffer, darkText, dragging } = this.state;
const volumeWidth = muted ? 0 : volume * this.volWidth;
const volumeHandleLoc = muted ? this.volHandleOffset(0) : this.volHandleOffset(volume);
+ const progress = (currentTime / duration) * 100;
return (
-
-
-
+
+
-
+
+
+
+
+
+
@@ -205,12 +638,12 @@ class Audio extends React.PureComponent {
@@ -224,7 +657,7 @@ class Audio extends React.PureComponent {
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.js b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
index 4fbd65517..834390d28 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.js
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.js
@@ -142,6 +142,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
src={attachment.get('url')}
alt={attachment.get('description')}
duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+ poster={status.getIn(['account', 'avatar_static'])}
height={110}
preload
/>
diff --git a/app/javascript/flavours/glitch/styles/components/media.scss b/app/javascript/flavours/glitch/styles/components/media.scss
index 772b40dc4..a9abb9c16 100644
--- a/app/javascript/flavours/glitch/styles/components/media.scss
+++ b/app/javascript/flavours/glitch/styles/components/media.scss
@@ -332,6 +332,7 @@
}
.audio-player {
+ overflow: hidden;
box-sizing: border-box;
position: relative;
background: darken($ui-base-color, 8%);
@@ -344,37 +345,50 @@
height: 100%;
}
- &__waveform {
- padding: 15px 0;
- position: relative;
- overflow: hidden;
+ &.with-light-background {
+ .video-player__seek::before {
+ color: rgba($black, 0.35);
+ }
- &::before {
- content: "";
- display: block;
- position: absolute;
- border-top: 1px solid lighten($ui-base-color, 4%);
- width: 100%;
- height: 0;
- left: 0;
- top: calc(50% + 1px);
+ .video-player__seek__seek {
+ color: rgba($black, 0.2);
+ }
+
+ .video-player__buttons button {
+ color: rgba($black, 0.75);
+
+ &:active,
+ &:hover,
+ &:focus {
+ color: $black;
+ }
+ }
+
+ .video-player__time-sep,
+ .video-player__time-total,
+ .video-player__time-current {
+ color: $black;
+ }
+
+ .video-player__volume::before {
+ background: rgba($black, 0.35);
}
}
- &__progress-placeholder {
- background-color: rgba(lighten($ui-highlight-color, 8%), 0.5);
+ .video-player__seek::before,
+ .video-player__seek__buffer,
+ .video-player__seek__progress {
+ top: 0;
}
- &__wave-placeholder {
- background-color: lighten($ui-base-color, 16%);
+ .video-player__seek__handle {
+ top: -4px;
}
.video-player__controls {
padding: 0 15px;
padding-top: 10px;
- background: darken($ui-base-color, 8%);
- border-top: 1px solid lighten($ui-base-color, 4%);
- border-radius: 0 0 4px 4px;
+ background: transparent;
}
}