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

Added stereo support

Browse Source
This commit is contained in:
Amish Shah
2015-12-05 21:19:38 +00:00
parent d122184b6b
commit e16211c4fb
7 changed files with 167 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Voice/AudioEncoder.js
View File

@@ -22,7 +22,7 @@ var AudioEncoder = (function () {
_classCallCheck(this, AudioEncoder);
if (opus) {
this.opus = new opus.OpusEncoder(48000, 1);
this.opus = new opus.OpusEncoder(48000, 2);
}
this.choice = false;
}
@@ -67,7 +67,7 @@ var AudioEncoder = (function () {
var self = this;
return new Promise(function (resolve, reject) {
var enc = _child_process2["default"].spawn(self.getCommand(), ['-i', "-", '-f', 's16le', '-ar', '48000', '-ac', 1, 'pipe:1']);
var enc = _child_process2["default"].spawn(self.getCommand(), ['-i', "-", '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']);
stream.pipe(enc.stdin);
@@ -75,12 +75,14 @@ var AudioEncoder = (function () {
callback(null, {
proc: enc,
stream: enc.stdout,
instream: stream
instream: stream,
channels: 2
});
resolve({
proc: enc,
stream: enc.stdout,
instream: stream
instream: stream,
channels: 2
});
});
@@ -101,16 +103,18 @@ var AudioEncoder = (function () {
var self = this;
return new Promise(function (resolve, reject) {
var enc = _child_process2["default"].spawn(self.getCommand(), ['-i', file, '-f', 's16le', '-ar', '48000', '-ac', 1, 'pipe:1']);
var enc = _child_process2["default"].spawn(self.getCommand(), ['-i', file, '-f', 's16le', '-ar', '48000', '-ac', 2, 'pipe:1']);
enc.stdout.once("readable", function () {
callback(null, {
proc: enc,
stream: enc.stdout
stream: enc.stdout,
channels: 2
});
resolve({
proc: enc,
stream: enc.stdout
stream: enc.stdout,
channels: 2
});
});

9
lib/Voice/VoiceConnection.js
View File

@@ -103,6 +103,7 @@ var VoiceConnection = (function (_EventEmitter) {
};
VoiceConnection.prototype.playStream = function playStream(stream) {
var channels = arguments.length <= 1 || arguments[1] === undefined ? 2 : arguments[1];
var self = this;
@@ -130,7 +131,7 @@ var VoiceConnection = (function (_EventEmitter) {
}
try {
var buffer = stream.read(1920);
var buffer = stream.read(1920 * channels);
if (!buffer) {
if (onWarning) {
@@ -145,8 +146,8 @@ var VoiceConnection = (function (_EventEmitter) {
}
}
if (buffer.length !== 1920) {
var newBuffer = new Buffer(1920).fill(0);
if (buffer.length !== 1920 * channels) {
var newBuffer = new Buffer(1920 * channels).fill(0);
buffer.copy(newBuffer);
buffer = newBuffer;
}
@@ -238,7 +239,7 @@ var VoiceConnection = (function (_EventEmitter) {
return new Promise(function (resolve, reject) {
_this.encoder.encodeFile(stream)["catch"](error).then(function (data) {
self.streamProc = data.proc;
var intent = self.playStream(data.stream);
var intent = self.playStream(data.stream, 2);
resolve(intent);
callback(null, intent);
});