scivision / PyLivestream / 146

pending completion

Build # 146

Build Type

push

travis-ci

Committed by

scivision

Commit Message

<a href="https://github.com/scivision/PyLivestream/commit/<a class=hub.com/scivision/PyLivestream/commit/<a class="double-link" href="https://git"><a class=hub.com/scivision/PyLivestream/commit/<a class="double-link" href="https://git"><a class=hub.com/scivision/PyLivestream/commit/<a class="double-link" href="https://git"><a class=hub.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9">469af97cb<a href="https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9">&lt;a href=&quot;https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9">&lt;a href=&quot;https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9&amp;quot;&amp;gt;&amp;amp;quot;&amp;amp;gt;Squashed commit of the following:

commit &amp;amp;lt;/a&amp;amp;gt;&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;https://github.com/scivision/PyLivestream/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/scivision/PyLivestream/commit/bd0b2d78bb6cb6610151fdf2ded2aa332d5942bb&amp;quot;&amp;gt;bd0b2d78b&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;bd0b2d78b&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9&amp;quot;&amp;gt;
Author: Michael Hirsch, Ph.D &amp;amp;lt;scivision@users.noreply.github.com&amp;amp;gt;
Date:   Sun Jun 3 10:48:04 2018 -0400

    default localhost listener

commit &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/scivision/PyLivestream/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/scivision/PyLivestream/commit/52072e33603a3e0fb26898989b2884884ddd9211&quot;&gt;52072e336&lt;/a&gt;&quot;&gt;52072e336&lt;/a&gt;&lt;a href=&quot;https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9&quot;&gt;
Author: Michael Hirsch, Ph.D &amp;lt;scivision@users.noreply.github.com&amp;gt;
Date:   Sun Jun 3 10:19:08 2018 -0400

    handle filename doesn&#39;t exist

commit </a><a class="double-link" href="https://github.com/scivision/PyLivestream/commit/<a class="double-link" href="https://github.com/scivision/PyLivestream/commit/bc7a87299ea812331b8629f9fecc7632ea8a274b">bc7a87299</a>">bc7a87299</a><a href="https://github.com/scivision/PyLivestream/commit/469af97cb19664a19252d48b318e6ea0b83396f9">
Author: Michael Hirsch, Ph.D &lt;scivision@users.noreply.github.com&gt;
Date:   Sun Jun 3 10:07:27 2018 -0400

    autostop listener

commit </a><a class="double-link" href="https://github.com/scivision/PyLivestream/commit/<a class="double-link" href="https://github.com/scivision/PyLivestream/commit/7c0568051be3f0b7f2fdfc4b24472b02f432c30f">7c0568051">7c0568051
Author: Michael Hirsch, Ph.D <scivision@users.noreply.github.com>
Date:   Sun Jun 3 09:41:31 2018 -0400

    support for audio streams + animated GIF or video loop

Run Details

77 of 77 new or added lines in 5 files covered. (100.0%)

398 of 498 relevant lines covered (79.92%)

0.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

60.0

/PyLivestream/ffmpeg.py

import subprocess
from typing import List, Union
from time import sleep


class Ffmpeg():

    def __init__(self):

        self.ERROR: List[str] = ['-v', 'error']
        self.WARNING: List[str] = ['-v', 'warning']
        self.INFO: List[str] = ['-v', 'info']

        self.YES: List[str] = ['-y']

        # default 8, increasing can help avoid warnings
        self.QUEUE: List[str] = ['-thread_queue_size', '8']

        self.THROTTLE: str = '-re'

    def timelimit(self, t: Union[None, str, int, float]) -> List[str]:
        if t is None:
            return []

        assert isinstance(t, (str, int, float))

        t = str(t)

        if len(t) > 0:
            return ['-t', str(t)]
        else:
            return []

    def drawtext(self, text: Union[None, str]) -> List[str]:
        # fontfile=/path/to/font.ttf:
        if not text:  # None or '' or [] etc.
            return []

        fontcolor = 'fontcolor=white'
        fontsize = 'fontsize=24'
        box = 'box=1'
        boxcolor = 'boxcolor=black@0.5'
        border = 'boxborderw=5'
        x = 'x=(w-text_w)/2'
        y = 'y=(h-text_h)*3/4'

        return ['-vf',
                f"drawtext=text='{text}':{fontcolor}:{fontsize}:{box}:{boxcolor}:{border}:{x}:{y}"]

    def listener(self):
        """
        no need to check return code, errors will show up in client.
        """
        print('starting RTMP listener')
        proc = subprocess.Popen(['ffplay', '-v', 'fatal', '-timeout', '5',
                                 '-autoexit', 'rtmp://localhost'],
                                stdout=subprocess.DEVNULL)
#        proc = subprocess.Popen(['ffmpeg', '-v', 'fatal', '-timeout', '5',
#                                 '-i', 'rtmp://localhost', '-f', 'null', '-'],
#                                stdout=subprocess.DEVNULL)

        sleep(0.5)  # 0.2 not long enough. 0.3 worked, so set 0.5 for some margin.
        return proc

1	import subprocess	1✔
2	from typing import List, Union	1✔
3	from time import sleep	1✔
4
5
6	class Ffmpeg():	1✔
7
8	def __init__(self):	1✔
9
10	self.ERROR: List[str] = ['-v', 'error']	1✔
11	self.WARNING: List[str] = ['-v', 'warning']	1✔
12	self.INFO: List[str] = ['-v', 'info']	1✔
13
14	self.YES: List[str] = ['-y']	1✔
15
16	# default 8, increasing can help avoid warnings
17	self.QUEUE: List[str] = ['-thread_queue_size', '8']	1✔
18
19	self.THROTTLE: str = '-re'	1✔
20
21	def timelimit(self, t: Union[None, str, int, float]) -> List[str]:	1✔
22	if t is None:	1✔
23	return []	×
24
25	assert isinstance(t, (str, int, float))	1✔
26
27	t = str(t)	1✔
28
29	if len(t) > 0:	1✔
30	return ['-t', str(t)]	1✔
31	else:
32	return []	×
33
34	def drawtext(self, text: Union[None, str]) -> List[str]:	1✔
35	# fontfile=/path/to/font.ttf:
36	if not text: # None or '' or [] etc.	1✔
37	return []	1✔
38
39	fontcolor = 'fontcolor=white'	×
40	fontsize = 'fontsize=24'	×
41	box = 'box=1'	×
42	boxcolor = 'boxcolor=black@0.5'	×
43	border = 'boxborderw=5'	×
44	x = 'x=(w-text_w)/2'	×
45	y = 'y=(h-text_h)*3/4'	×
46
47	return ['-vf',	×
48	f"drawtext=text='{text}':{fontcolor}:{fontsize}:{box}:{boxcolor}:{border}:{x}:{y}"]
49
50	def listener(self):	1✔
51	"""
52	no need to check return code, errors will show up in client.
53	"""
54	print('starting RTMP listener')	×
55	proc = subprocess.Popen(['ffplay', '-v', 'fatal', '-timeout', '5',	×
56	'-autoexit', 'rtmp://localhost'],
57	stdout=subprocess.DEVNULL)
58	# proc = subprocess.Popen(['ffmpeg', '-v', 'fatal', '-timeout', '5',
59	# '-i', 'rtmp://localhost', '-f', 'null', '-'],
60	# stdout=subprocess.DEVNULL)
61
62	sleep(0.5) # 0.2 not long enough. 0.3 worked, so set 0.5 for some margin.	×
63	return proc	×

scivision / PyLivestream / 146

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous