Skip to content

Inline make_error #1744

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
Feb 1, 2025
Merged

Inline make_error #1744

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
1 change: 0 additions & 1 deletion av/container/core.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ class Container:
exc_val: BaseException | None,
exc_tb: TracebackType | None,
) -> bool: ...
def err_check(self, value: int) -> int: ...
def set_timeout(self, timeout: Real | None) -> None: ...
def start_timeout(self) -> None: ...

Expand Down
39 changes: 17 additions & 22 deletions av/error.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,27 +379,6 @@ cdef int stash_exception(exc_info=None):

cdef int _last_log_count = 0


cpdef make_error(int res, filename=None, log=None):
cdef int code = -res
cdef char* error_buffer = <char*>malloc(lib.AV_ERROR_MAX_STRING_SIZE * sizeof(char))
if error_buffer == NULL:
raise MemoryError()

try:
if code == c_PYAV_STASHED_ERROR:
message = PYAV_STASHED_ERROR_message
else:
lib.av_strerror(res, error_buffer, lib.AV_ERROR_MAX_STRING_SIZE)
# Fallback to OS error string if no message
message = error_buffer or os.strerror(code)

cls = classes.get(code, UndefinedError)
return cls(code, message, filename, log)
finally:
free(error_buffer)


cpdef int err_check(int res, filename=None) except -1:
"""Raise appropriate exceptions from library return code."""

Expand All @@ -425,7 +404,23 @@ cpdef int err_check(int res, filename=None) except -1:
else:
log = None

raise make_error(res, filename, log)
cdef int code = -res
cdef char* error_buffer = <char*>malloc(lib.AV_ERROR_MAX_STRING_SIZE * sizeof(char))
if error_buffer == NULL:
raise MemoryError()

try:
if code == c_PYAV_STASHED_ERROR:
message = PYAV_STASHED_ERROR_message
else:
lib.av_strerror(res, error_buffer, lib.AV_ERROR_MAX_STRING_SIZE)
# Fallback to OS error string if no message
message = error_buffer or os.strerror(code)

cls = classes.get(code, UndefinedError)
raise cls(code, message, filename, log)
finally:
free(error_buffer)


class UndefinedError(FFmpegError):
Expand Down
Loading