capture stderr if not shown

tikuma-lsuhsc · tikuma-lsuhsc · commit 75676244c237 · 2022-02-23T22:00:45.000-06:00
diff --git a/src/ffmpegio/audio.py b/src/ffmpegio/audio.py
@@ -57,9 +57,11 @@ def _run_read(
     else:
         out = ffmpegprocess.run(
             *args,
-            capture_log=None if show_log else False,
+            capture_log=None if show_log else True,
             **kwargs,
         )
+        if out.returncode:
+            raise FFmpegError(out.stderr, show_log)
 
     return rate, plugins.get_hook().bytes_to_audio(
         b=out.stdout, dtype=dtype, shape=(ac,), squeeze=False
@@ -250,10 +252,10 @@ def write(url, rate_in, data, progress=None, overwrite=None, show_log=None, **op
         stdout=stdout,
         progress=progress,
         overwrite=overwrite,
-        capture_log=None if show_log else False,
+        capture_log=None if show_log else True,
     )
     if out.returncode:
-        raise FFmpegError(out.stderr)
+        raise FFmpegError(out.stderr, show_log)
 
 
 def filter(expr, input_rate, input, progress=None, sample_fmt=None, **options):
diff --git a/src/ffmpegio/image.py b/src/ffmpegio/image.py
@@ -40,11 +40,11 @@ def _run_read(*args, shape=None, pix_fmt_in=None, s_in=None, show_log=None, **kw
     else:
         out = ffmpegprocess.run(
             *args,
-            capture_log=None if show_log else False,
+            capture_log=None if show_log else True,
             **kwargs,
         )
         if out.returncode:
-            raise FFmpegError(out.stderr)
+            raise FFmpegError(out.stderr, show_log)
 
     nbytes = utils.get_samplesize(shape, dtype)
 
@@ -210,11 +210,11 @@ def write(url, data, overwrite=None, show_log=None, **options):
         input=plugins.get_hook().video_bytes(obj=data),
         stdout=stdout,
         overwrite=overwrite,
-        capture_log=None if show_log else False,
+        capture_log=None if show_log else True,
     )
 
     if out.returncode:
-        raise FFmpegError(out.stderr)
+        raise FFmpegError(out.stderr, show_log)
 
 
 def filter(expr, input, **options):
diff --git a/src/ffmpegio/media.py b/src/ffmpegio/media.py
@@ -67,10 +67,10 @@ def read(*urls, progress=None, show_log=None, **options):
     out = ffmpegprocess.run(
         args,
         progress=progress,
-        capture_log=None if show_log else False,
+        capture_log=None if show_log else True,
     )
     if out.returncode:
-        raise FFmpegError(out.stderr)
+        raise FFmpegError(out.stderr, show_log)
 
     # fire up the AVI reader and process the stdout bytes
     # TODO: Convert to use pipe/thread
diff --git a/src/ffmpegio/transcode.py b/src/ffmpegio/transcode.py
@@ -85,7 +85,7 @@ def transcode(
         args,
         progress=progress,
         overwrite=overwrite,
-        capture_log=None if show_log else False,
+        capture_log=None if show_log else True,
         stdin=stdin,
         stdout=stdout,
         input=input,
diff --git a/src/ffmpegio/video.py b/src/ffmpegio/video.py
@@ -261,10 +261,10 @@ def write(
         progress=progress,
         overwrite=overwrite,
         **kwargs,
-        capture_log=None if show_log else False,
+        capture_log=None if show_log else True,
     )
     if out.returncode:
-        raise FFmpegError(out.stderr)
+        raise FFmpegError(out.stderr, show_log)
 
 
 def filter(expr, rate, input, progress=None, show_log=None, **options):
