matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Insert options before pipe:1 in ffmpeg player, otherwise they are ignored

Browse Source
This commit is contained in:
Khazhismel 2015-12-23 17:58:34 -05:00
parent 483384595b
commit e8a06b7ee9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
discord/voice_client.py
View File

@ -386,12 +386,14 @@ class VoiceClient:
""" """
command = 'ffmpeg' if not use_avconv else 'avconv' command = 'ffmpeg' if not use_avconv else 'avconv'
input_name = '-' if pipe else shlex.quote(filename) input_name = '-' if pipe else shlex.quote(filename)
cmd = command + ' -i {} -f s16le -ar {} -ac {} -loglevel warning pipe:1' cmd = command + ' -i {} -f s16le -ar {} -ac {} -loglevel warning'
cmd = cmd.format(input_name, self.encoder.sampling_rate, self.encoder.channels) cmd = cmd.format(input_name, self.encoder.sampling_rate, self.encoder.channels)
if isinstance(options, str): if isinstance(options, str):
cmd = cmd + ' ' + options cmd = cmd + ' ' + options
cmd += ' pipe:1'
stdin = None if not pipe else filename stdin = None if not pipe else filename
args = shlex.split(cmd) args = shlex.split(cmd)
try: try:
@ -567,4 +569,3 @@ class VoiceClient:
packet = self._get_voice_packet(encoded_data) packet = self._get_voice_packet(encoded_data)
sent = self.socket.sendto(packet, (self.endpoint_ip, self.voice_port)) sent = self.socket.sendto(packet, (self.endpoint_ip, self.voice_port))
self.checked_add('timestamp', self.encoder.samples_per_frame, 4294967295) self.checked_add('timestamp', self.encoder.samples_per_frame, 4294967295)