From 7042f092b0f46d66a6f763a8b4629664400cdeac Mon Sep 17 00:00:00 2001
From: WyattBlue <wyattblue@auto-editor.com>
Date: Wed, 24 Apr 2024 18:43:10 -0400
Subject: [PATCH] Default callback no longer needs gil

---
 av/logging.pyi | 11 -----------
 av/logging.pyx | 14 +++++++++-----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/av/logging.pyi b/av/logging.pyi
index 64ca9df3c..1db5e4a3b 100644
--- a/av/logging.pyi
+++ b/av/logging.pyi
@@ -1,5 +1,3 @@
-import logging
-from threading import Lock
 from typing import Any, Callable
 
 PANIC: int
@@ -32,12 +30,3 @@ class Capture:
         value: Exception | None,
         traceback: Callable[..., Any] | None,
     ) -> None: ...
-
-level_threshold: int
-skip_repeated: bool
-skip_lock: Lock
-last_log: tuple[int, str, str] | None
-skip_count: int
-last_error: tuple[int, str, str] | None
-global_captures: list[list[tuple[int, str, str]]]
-thread_captures: dict[int, list[tuple[int, str, str]]]
diff --git a/av/logging.pyx b/av/logging.pyx
index d3c3bfce5..1006d094c 100644
--- a/av/logging.pyx
+++ b/av/logging.pyx
@@ -49,7 +49,6 @@ import sys
 from threading import Lock, get_ident
 
 # Library levels.
-# QUIET  = lib.AV_LOG_QUIET # -8; not really a level.
 PANIC = lib.AV_LOG_PANIC  # 0
 FATAL = lib.AV_LOG_FATAL  # 8
 ERROR = lib.AV_LOG_ERROR
@@ -110,8 +109,12 @@ def set_level(level):
     """
     global level_threshold
 
-    if level is None or type(level) is int:
+    if level is None:
         level_threshold = level
+        lib.av_log_set_callback(nolog_callback)
+    elif type(level) is int:
+        level_threshold = level
+        lib.av_log_set_callback(log_callback)
     else:
         raise ValueError("level must be: int | None")
 
@@ -288,8 +291,6 @@ cdef void log_callback(void *ptr, int level, const char *format, lib.va_list arg
         return
 
     with gil:
-        if level_threshold is None:
-            return
         if level > level_threshold and level != lib.AV_LOG_ERROR:
             return
 
@@ -314,4 +315,7 @@ cdef void log_callback(void *ptr, int level, const char *format, lib.va_list arg
             lib.PyErr_Display(exc, type_, tb)
 
 
-lib.av_log_set_callback(log_callback)
+cdef void nolog_callback(void *ptr, int level, const char *format, lib.va_list args) noexcept nogil:
+    pass
+
+lib.av_log_set_callback(nolog_callback)