Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Synchronize with the streaming process to make sure that we start playing only when the streaming service is ready

Browse source
This commit is contained in:
Fabio Manganiello 2019-02-06 15:12:55 +01:00
parent 97d2e734ee
commit 880a394d74
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
platypush/plugins/media/__init__.py
View file

@ -141,6 +141,8 @@ class MediaPlugin(Plugin):
self._videos_queue = [] self._videos_queue = []
self._streaming_port = streaming_port self._streaming_port = streaming_port
self._streaming_proc = None self._streaming_proc = None
self._streaming_started = Event()
self._streaming_ended = Event()
def _get_resource(self, resource): def _get_resource(self, resource):
""" """
@ -352,22 +354,33 @@ class MediaPlugin(Plugin):
@action @action
def start_streaming(self, media): def start_streaming(self, media, port=None):
"""
Starts streaming local media over the specified HTTP port.
The stream will be available to HTTP clients on
`http://{this-ip}:{port}/media
:param media: Media to stream
"""
if self._streaming_proc: if self._streaming_proc:
self.logger.info('A streaming process is already running, ' + self.logger.info('A streaming process is already running, ' +
'terminating it first') 'terminating it first')
self.stop_streaming() self.stop_streaming()
self._streaming_started.clear()
self._streaming_ended.clear()
self._streaming_proc = subprocess.Popen( self._streaming_proc = subprocess.Popen(
[self._local_stream_bin, media, str(self._streaming_port)], [self._local_stream_bin, media, str(self._streaming_port)],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT stdout=subprocess.PIPE, stderr=subprocess.STDOUT
) )
threading.Thread(target=self._streaming_process_monitor(media)).start() threading.Thread(target=self._streaming_process_monitor(media)).start()
url = 'http://{}:{}/video'.format(get_ip_or_hostname(), url = 'http://{}:{}/media'.format(get_ip_or_hostname(),
self._streaming_port) self._streaming_port)
self.logger.info('Starting streaming {} on {}'.format(media, url)) self.logger.info('Starting streaming {} on {}'.format(media, url))
self._streaming_started.wait()
self.logger.info('Started streaming {} on {}'.format(media, url))
return { 'url': url } return { 'url': url }
@action @action
@ -398,6 +411,7 @@ class MediaPlugin(Plugin):
continue continue
if line.startswith('Listening on'): if line.startswith('Listening on'):
self._streaming_started.set()
break break
self.logger.info('Message from streaming service: {}'.format(line)) self.logger.info('Message from streaming service: {}'.format(line))
@ -405,6 +419,7 @@ class MediaPlugin(Plugin):
self._streaming_proc.wait() self._streaming_proc.wait()
try: self.stop_streaming() try: self.stop_streaming()
except: pass except: pass
self._streaming_ended.set()
self.logger.info('Streaming service terminated') self.logger.info('Streaming service terminated')
return _thread return _thread

2
platypush/plugins/media/bin/localstream.js
View file

@ -30,7 +30,7 @@ function parseArgv() {
let args = parseArgv() let args = parseArgv()
app.get('/video', function(req, res) { app.get('/media', function(req, res) {
const path = args.file const path = args.file
const ext = args.file.split('.').pop() const ext = args.file.split('.').pop()
const stat = fs.statSync(path) const stat = fs.statSync(path)