blacklight/micmon
1
0
Fork 0
mirror of https://github.com/BlackLight/micmon.git synced 2024-11-27 22:25:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Send ffmpeg stderr to /dev/null unless debug=True"

Browse source 
This reverts commit ab431bc2f8.
This commit is contained in:
Fabio Manganiello 2020-10-29 00:40:19 +01:00
parent ab431bc2f8
commit 5233baf451
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
micmon/audio/source.py
View file

@ -1,9 +1,8 @@
import logging import logging
import os
import signal import signal
import subprocess import subprocess
from abc import ABC from abc import ABC
from typing import Optional, Union, IO from typing import Optional, Union
from micmon.audio.segment import AudioSegment from micmon.audio.segment import AudioSegment
@ -13,8 +12,7 @@ class AudioSource(ABC):
sample_duration: float = 2.0, sample_duration: float = 2.0,
sample_rate: int = 44100, sample_rate: int = 44100,
channels: int = 1, channels: int = 1,
ffmpeg_bin: str = 'ffmpeg', ffmpeg_bin: str = 'ffmpeg'):
debug: bool = False):
self.ffmpeg_bin = ffmpeg_bin self.ffmpeg_bin = ffmpeg_bin
self.ffmpeg_base_args = ( self.ffmpeg_base_args = (
'-f', 's16le', '-f', 's16le',
@ -28,10 +26,7 @@ class AudioSource(ABC):
self.sample_duration = sample_duration self.sample_duration = sample_duration
self.sample_rate = sample_rate self.sample_rate = sample_rate
self.channels = channels self.channels = channels
self.debug = debug
self.logger = logging.getLogger(self.__class__.__name__) self.logger = logging.getLogger(self.__class__.__name__)
self.logger.setLevel(logging.DEBUG if self.debug else logging.INFO)
self.devnull: Optional[IO] = None
def __iter__(self): def __iter__(self):
return self return self
@ -47,12 +42,7 @@ class AudioSource(ABC):
raise StopIteration raise StopIteration
def __enter__(self): def __enter__(self):
kwargs = dict(stdout=subprocess.PIPE) self.ffmpeg = subprocess.Popen(self.ffmpeg_args, stdout=subprocess.PIPE)
if not self.debug:
self.devnull = open(os.devnull, 'w')
kwargs['stderr'] = self.devnull
self.ffmpeg = subprocess.Popen(self.ffmpeg_args, **kwargs)
return self return self
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
@ -69,10 +59,6 @@ class AudioSource(ABC):
self.ffmpeg.wait() self.ffmpeg.wait()
self.ffmpeg = None self.ffmpeg = None
if self.devnull:
self.devnull.close()
self.devnull = None
def pause(self): def pause(self):
if not self.ffmpeg: if not self.ffmpeg:
return return