Skip to content

Graph: Add helper function to improve cython type inference #2210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyattBlue merged 1 commit into from
Mar 23, 2026
+18 −15
Merged

Graph: Add helper function to improve cython type inference #2210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions av/filter/graph.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ cdef class Graph:

cdef dict _name_counts
cdef str _get_unique_name(self, str name)
cdef list[FilterContext] _get_context_by_type(self, str type)

cdef _register_context(self, FilterContext)
cdef _auto_register(self)
cdef int _nb_filters_seen
cdef dict _context_by_ptr
cdef dict _context_by_name
cdef dict _context_by_type
cdef dict[long, FilterContext] _context_by_ptr
cdef dict[str, list[FilterContext]] _context_by_type
27 changes: 15 additions & 12 deletions av/filter/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def __cinit__(self):
self._name_counts = {}
self._nb_filters_seen = 0
self._context_by_ptr = {}
self._context_by_name = {}
self._context_by_type = {}

def __dealloc__(self):
Expand All @@ -37,6 +36,11 @@ def _get_unique_name(self, name: str) -> str:
else:
return name

@cython.cfunc
@cython.inline
def _get_context_by_type(self, type_: str) -> list[FilterContext]:
return self._context_by_type.get(type_, [])

@cython.ccall
def configure(self, auto_buffer: cython.bint = True, force: cython.bint = False):
if self.configured and not force:
Expand Down Expand Up @@ -87,7 +91,6 @@ def add(self, filter, args=None, **kwargs):
@cython.cfunc
def _register_context(self, ctx: FilterContext):
self._context_by_ptr[cython.cast(cython.long, ctx.ptr)] = ctx
self._context_by_name[ctx.ptr.name] = ctx
Copy link
Copy Markdown
Contributor Author

@lgeiger lgeiger Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_context_by_name is not used anywhere at the moment, so I think we can safely remove it

self._context_by_type.setdefault(ctx.filter.ptr.name, []).append(ctx)

@cython.cfunc
Expand Down Expand Up @@ -203,7 +206,7 @@ def set_audio_frame_size(self, frame_size):
"""
if not self.configured:
raise ValueError("graph not configured")
sinks = self._context_by_type.get("abuffersink", [])
sinks = self._get_context_by_type("abuffersink")
if not sinks:
raise ValueError("missing abuffersink filter")
for sink in sinks:
Expand All @@ -213,13 +216,13 @@ def set_audio_frame_size(self, frame_size):

def push(self, frame):
if frame is None:
contexts = self._context_by_type.get(
"buffer", []
) + self._context_by_type.get("abuffer", [])
contexts = self._get_context_by_type("buffer") + self._get_context_by_type(
"abuffer"
)
elif isinstance(frame, VideoFrame):
contexts = self._context_by_type.get("buffer", [])
contexts = self._get_context_by_type("buffer")
elif isinstance(frame, AudioFrame):
contexts = self._context_by_type.get("abuffer", [])
contexts = self._get_context_by_type("abuffer")
else:
raise ValueError(
f"can only AudioFrame, VideoFrame or None; got {type(frame)}"
Expand All @@ -230,13 +233,13 @@ def push(self, frame):

def vpush(self, frame: VideoFrame | None):
"""Like `push`, but only for VideoFrames."""
for ctx in self._context_by_type.get("buffer", []):
for ctx in self._get_context_by_type("buffer"):
ctx.push(frame)

# TODO: Test complex filter graphs, add `at: int = 0` arg to pull() and vpull().
def pull(self):
vsinks = self._context_by_type.get("buffersink", [])
asinks = self._context_by_type.get("abuffersink", [])
vsinks = self._get_context_by_type("buffersink")
asinks = self._get_context_by_type("abuffersink")

nsinks = len(vsinks) + len(asinks)
if nsinks != 1:
Expand All @@ -246,7 +249,7 @@ def pull(self):

def vpull(self):
"""Like `pull`, but only for VideoFrames."""
vsinks = self._context_by_type.get("buffersink", [])
vsinks = self._get_context_by_type("buffersink")
nsinks = len(vsinks)
if nsinks != 1:
raise ValueError(f"can only auto-pull with single sink; found {nsinks}")
Expand Down
Loading