changed: capture_log=None = console display

tikuma-lsuhsc · tikuma-lsuhsc · commit 4b4fac1fd285 · 2022-01-31T12:21:44.000-06:00
diff --git a/src/ffmpegio/audio.py b/src/ffmpegio/audio.py
@@ -63,7 +63,7 @@ def _run_read(
             *args,
             dtype=dtype,
             shape=ac,
-            capture_log=False if show_log else None,
+            capture_log=None if show_log else False,
             **kwargs,
         ).stdout
 
@@ -253,7 +253,7 @@ def write(url, rate_in, data, progress=None, overwrite=None, show_log=None, **op
         stdout=stdout,
         progress=progress,
         overwrite=overwrite,
-        capture_log=False if show_log else None,
+        capture_log=None if show_log else False,
     )
 
 
diff --git a/src/ffmpegio/ffmpeg.py b/src/ffmpegio/ffmpeg.py
@@ -419,8 +419,8 @@ def exec(
     :param overwrite: True to overwrite if output url exists, defaults to None
                       (auto-select)
     :type overwrite: bool, optional
-    :param capture_log: True to capture log messages on stderr, False to send
-                        logs to console, defaults to None (no show/capture)
+    :param capture_log: True to capture log messages on stderr, False to suppress
+                        console log messages, defaults to None (show on console)
     :type capture_log: bool or None, optional
     :param stdin: source file object, defaults to None
     :type stdin: readable file-like object, optional
@@ -503,7 +503,7 @@ def iswritable(f):
     if stderr == _sp.STDOUT and outpipe == PIPE:
         raise ValueError("stderr cannot be redirected to stdout, which is in use")
     errpipe = stderr or (
-        PIPE if capture_log else DEVNULL if capture_log is None else None
+        PIPE if capture_log else None if capture_log is None else DEVNULL
     )
 
     # set y or n flags (overwrite)
diff --git a/src/ffmpegio/image.py b/src/ffmpegio/image.py
@@ -48,7 +48,7 @@ def _run_read(*args, shape=None, pix_fmt_in=None, s_in=None, show_log=None, **kw
             *args,
             dtype=dtype,
             shape=shape,
-            capture_log=False if show_log else True,
+            capture_log=None if show_log else False,
             **kwargs,
         )
         if out.returncode:
@@ -218,7 +218,7 @@ def write(url, data, overwrite=None, show_log=None, **options):
         input=data,
         stdout=stdout,
         overwrite=overwrite,
-        capture_log=False if show_log else None,
+        capture_log=None if show_log else False,
     )
 
 
diff --git a/src/ffmpegio/media.py b/src/ffmpegio/media.py
@@ -64,7 +64,7 @@ def read(*urls, progress=None, show_log=None, **options):
     out = ffmpegprocess.run(
         args,
         progress=progress,
-        capture_log=False if show_log else True,
+        capture_log=None if show_log else False,
     )
     if out.returncode:
         raise FFmpegError(out.stderr)
diff --git a/src/ffmpegio/transcode.py b/src/ffmpegio/transcode.py
@@ -80,7 +80,7 @@ def transcode(
         args,
         progress=progress,
         overwrite=overwrite,
-        capture_log=False if show_log else True,
+        capture_log=None if show_log else False,
         stdin=stdin,
         stdout=stdout,
         input=input,
diff --git a/src/ffmpegio/video.py b/src/ffmpegio/video.py
@@ -51,7 +51,7 @@ def _run_read(
             *args,
             dtype=dtype,
             shape=shape,
-            capture_log=False if show_log else True,
+            capture_log=None if show_log else False,
             **kwargs,
         )
         if out.returncode:
@@ -264,7 +264,7 @@ def write(
         progress=progress,
         overwrite=overwrite,
         **kwargs,
-        capture_log=False if show_log else None,
+        capture_log=None if show_log else False,
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def read(urls, progress=None, show_log=None, *options):`
`64`	`64`	`out = ffmpegprocess.run(`
`65`	`65`	`args,`
`66`	`66`	`progress=progress,`
`67`		`- capture_log=False if show_log else True,`
	`67`	`+ capture_log=None if show_log else False,`
`68`	`68`	`)`
`69`	`69`	`if out.returncode:`
`70`	`70`	`raise FFmpegError(out.stderr)`