Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-12 09:33:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding volume wrapper

Browse Source
This commit is contained in:
Aaron Scherer
2016-02-09 15:12:21 -08:00
parent c8acc17d8e
commit 3c64cfce4a
7 changed files with 266 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Voice/AudioEncoder.js
View File

@@ -9,6 +9,8 @@ try {
// no opus!
}
import VolumeTransformer from "./VolumeTransformer";
export default class AudioEncoder {
constructor() {
if (opus) {
@@ -40,8 +42,7 @@ export default class AudioEncoder {
}
getCommand(force) {
if (this.choice && force)
if(this.choice && force)
return choice;
var choices = ["avconv", "ffmpeg"];
@@ -58,73 +59,77 @@ export default class AudioEncoder {
}
encodeStream(stream, options) {
var self = this;
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand(), [
this.volume = new VolumeTransformer(options.volume || 1);
var enc = cpoc.spawn(this.getCommand(), [
'-loglevel', '0',
'-i', '-',
'-f', 's16le',
'-ar', '48000',
'-af', 'volume=' + (options.volume || 1),
'-ac', 2,
'pipe:1'
], {stdio: ['pipe', 'pipe', 'ignore']});
stream.pipe(enc.stdin);
enc.stdout.pipe(this.volume);
enc.stdout.once("readable", function () {
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: enc.stdout,
stream: this.volume,
instream: stream,
channels : 2
channels: 2
});
});
enc.stdout.on("end", function () {
this.volume.on("end", () => {
reject("end");
});
enc.stdout.on("close", function () {
this.volume.on("close", () => {
reject("close");
});
});
}
encodeFile(file, options) {
var self = this;
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand(), [
this.volume = new VolumeTransformer(options.volume || 1);
var enc = cpoc.spawn(this.getCommand(), [
'-loglevel', '0',
'-i', file,
'-f', 's16le',
'-ar', '48000',
'-af', 'volume=' + (options.volume || 1),
'-ac', 2,
'pipe:1'
], { stdio: ['pipe', 'pipe', 'ignore'] });
], {stdio: ['pipe', 'pipe', 'ignore']});
enc.stdout.once("readable", function () {
enc.stdout.pipe(this.volume);
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: enc.stdout,
channels : 2
stream: this.volume,
channels: 2
});
});
enc.stdout.on("end", function () {
this.volume.on("end", () => {
reject("end");
});
enc.stdout.on("close", function () {
this.volume.on("close", () => {
reject("close");
});
});
}
encodeArbitraryFFmpeg(ffmpegOptions) {
var self = this;
return new Promise((resolve, reject) => {
this.volume = new VolumeTransformer(1);
// add options discord.js needs
var options = ffmpegOptions.concat([
'-loglevel', '0',
@@ -133,21 +138,23 @@ export default class AudioEncoder {
'-ac', 2,
'pipe:1'
]);
var enc = cpoc.spawn(self.getCommand(), options, { stdio: ['pipe', 'pipe', 'ignore'] });
var enc = cpoc.spawn(this.getCommand(), options, {stdio: ['pipe', 'pipe', 'ignore']});
enc.stdout.once("readable", function () {
enc.stdout.pipe(this.volume);
this.volume.once("readable", () => {
resolve({
proc: enc,
stream: enc.stdout,
channels : 2
stream: this.volume,
channels: 2
});
});
enc.stdout.on("end", function () {
this.volume.on("end", () => {
reject("end");
});
enc.stdout.on("close", function () {
this.volume.on("close", () => {
reject("close");
});
});