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

voice fixes

Browse Source
This commit is contained in:
Amish Shah
2015-12-05 20:57:08 +00:00
parent de19475ae0
commit d122184b6b
6 changed files with 87 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/Voice/AudioEncoder.js
View File

@@ -3,36 +3,36 @@
import cpoc from "child_process";
var opus;
try{
try {
opus = require("node-opus");
}catch(e){
} catch (e) {
// no opus!
}
export default class AudioEncoder {
constructor(){
if(opus){
constructor() {
if (opus) {
this.opus = new opus.OpusEncoder(48000, 1);
}
this.choice = false;
}
opusBuffer(buffer){
opusBuffer(buffer) {
return this.opus.encode(buffer, 1920);
}
getCommand(force){
getCommand(force) {
if(this.choice && force)
if (this.choice && force)
return choice;
var choices = ["avconv", "ffmpeg"];
for(var choice of choices){
for (var choice of choices) {
var p = cpoc.spawnSync(choice);
if(!p.error){
if (!p.error) {
this.choice = choice;
return choice;
}
@@ -41,74 +41,74 @@ export default class AudioEncoder {
return "help";
}
encodeStream(stream, callback=function(err, buffer){}){
encodeStream(stream, callback = function (err, buffer) { }) {
var self = this;
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand() , [
"-f", "s16le",
"-ar", "48000",
"-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
"-af", "volume=1",
"pipe:1",
"-i", "-"
var enc = cpoc.spawn(self.getCommand(), [
'-i', "-",
'-f', 's16le',
'-ar', '48000',
'-ac', 1,
'pipe:1'
]);
stream.pipe(enc.stdin);
enc.stdout.once("readable", function() {
enc.stdout.once("readable", function () {
callback(null, {
proc : enc,
stream : enc.stdout,
instream : stream
proc: enc,
stream: enc.stdout,
instream: stream
});
resolve({
proc : enc,
stream : enc.stdout,
instream : stream
proc: enc,
stream: enc.stdout,
instream: stream
});
});
enc.stdout.on("end", function() {
enc.stdout.on("end", function () {
callback("end");
reject("end");
});
enc.stdout.on("close", function() {
enc.stdout.on("close", function () {
callback("close");
reject("close");
});
});
}
encodeFile(file, callback=function(err, buffer){}){
encodeFile(file, callback = function (err, buffer) { }) {
var self = this;
return new Promise((resolve, reject) => {
var enc = cpoc.spawn(self.getCommand() , [
"-f", "s16le",
"-ar", "48000",
"-ac", "1", // this can be 2 but there's no point, discord makes it mono on playback, wasted bandwidth.
"-af", "volume=1",
"pipe:1",
"-i", file
var enc = cpoc.spawn(self.getCommand(), [
'-i', file,
'-f', 's16le',
'-ar', '48000',
'-ac', 1,
'pipe:1'
]);
enc.stdout.once("readable", function() {
enc.stdout.once("readable", function () {
callback(null, {
proc : enc,
stream : enc.stdout
proc: enc,
stream: enc.stdout
});
resolve({
proc : enc,
stream : enc.stdout
proc: enc,
stream: enc.stdout
});
});
enc.stdout.on("end", function() {
enc.stdout.on("end", function () {
console.log("end");
callback("end");
reject("end");
});
enc.stdout.on("close", function() {
enc.stdout.on("close", function () {
console.log("close");
callback("close");
reject("close");
});