blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/17' into feature/18

Browse Source
This commit is contained in:
Karl Kroening 2017-07-05 04:52:55 -06:00
commit 7613f746d2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffmpeg/dag.py
View File

@ -104,7 +104,8 @@ def get_incoming_edges(downstream_node, incoming_edge_map):
def get_outgoing_edges(upstream_node, outgoing_edge_map):
edges = []
for upstream_label, (downstream_node, downstream_label) in outgoing_edge_map.items():
for upstream_label, downstream_infos in outgoing_edge_map.items():
for (downstream_node, downstream_label) in downstream_infos:
edges += [DagEdge(downstream_node, downstream_label, upstream_node, upstream_label)]
return edges
@ -176,9 +177,11 @@ def topo_sort(downstream_nodes):
raise RuntimeError('Graph is not a DAG')
if downstream_node is not None:
if upstream_node not in outgoing_edge_maps:
outgoing_edge_maps[upstream_node] = {}
outgoing_edge_maps[upstream_node][upstream_label] = (downstream_node, downstream_label)
outgoing_edge_map = outgoing_edge_maps.get(upstream_node, {})
outgoing_edge_infos = outgoing_edge_map.get(upstream_label, [])
outgoing_edge_infos += [(downstream_node, downstream_label)]
outgoing_edge_map[upstream_label] = outgoing_edge_infos
outgoing_edge_maps[upstream_node] = outgoing_edge_map
if upstream_node not in sorted_nodes:
marked_nodes.append(upstream_node)