djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use node only

Browse Source
This commit is contained in:
jb-alvarado 2021-02-16 21:42:43 +01:00
parent 96fe5412fd
commit 52a1739139
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplayout/folder.py
View File

@ -186,12 +186,12 @@ class GetSourceFromFolder:
'source': self._media.store[0] 'source': self._media.store[0]
} }
filtergraph = build_filtergraph( self.node['src_cmd'] = ['-i', self._media.store[self.index]]
self.node['filter'] = build_filtergraph(
self.node, self.node_last, self.node_next, duration, self.node, self.node_last, self.node_next, duration,
0.0, duration, self.probe) 0.0, duration, self.probe)
yield ['-i', self._media.store[self.index]] + filtergraph, \ yield self.node
self.node
self.index += 1 self.index += 1
self.node_last = deepcopy(self.node) self.node_last = deepcopy(self.node)
else: else:

4
ffplayout/output/desktop.py
View File

@ -60,7 +60,7 @@ def output():
get_source = GetSourceFromFolder(media) get_source = GetSourceFromFolder(media)
try: try:
for src_cmd, node in get_source.next(): for node in get_source.next():
if watcher is not None: if watcher is not None:
watcher.current_clip = node.get('source') watcher.current_clip = node.get('source')
@ -68,7 +68,7 @@ def output():
dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(), dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(),
'-hide_banner', '-nostats' '-hide_banner', '-nostats'
] + src_cmd + ff_pre_settings ] + node['src_cmd'] + ff_pre_settings
messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"') messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"')

4
ffplayout/output/hls.py
View File

@ -54,7 +54,7 @@ def output():
get_source = GetSourceFromFolder(media) get_source = GetSourceFromFolder(media)
try: try:
for src_cmd, node in get_source.next(): for node in get_source.next():
if watcher is not None: if watcher is not None:
watcher.current_clip = node.get('source') watcher.current_clip = node.get('source')
@ -63,7 +63,7 @@ def output():
cmd = [ cmd = [
'ffmpeg', '-v', _log.ff_level.lower(), '-hide_banner', 'ffmpeg', '-v', _log.ff_level.lower(), '-hide_banner',
'-nostats' '-nostats'
] + src_cmd + [ ] + node['src_cmd'] + [
'-metadata', 'service_name=' + _playout.name, '-metadata', 'service_name=' + _playout.name,
'-metadata', 'service_provider=' + _playout.provider, '-metadata', 'service_provider=' + _playout.provider,
'-metadata', 'year={}'.format(year) '-metadata', 'year={}'.format(year)

4
ffplayout/output/stream.py
View File

@ -67,7 +67,7 @@ def output():
get_source = GetSourceFromFolder(media) get_source = GetSourceFromFolder(media)
try: try:
for src_cmd, node in get_source.next(): for node in get_source.next():
if watcher is not None: if watcher is not None:
watcher.current_clip = node.get('source') watcher.current_clip = node.get('source')
@ -75,7 +75,7 @@ def output():
dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(), dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(),
'-hide_banner', '-nostats' '-hide_banner', '-nostats'
] + src_cmd + ff_pre_settings ] + node['src_cmd'] + ff_pre_settings
messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"') messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"')