Merge branch 'master' of github.com:imageio/imageio-ffmpeg

Author: almarklein

README.md

@@ -169,6 +169,8 @@ def write_frames(
     ffmpeg_timeout=0,
     input_params=None,
     output_params=None,
+    audio_path=None,
+    audio_codec=None,
 ):
     """
     Create a generator to write frames (bytes objects) into a video file.
@@ -205,6 +207,8 @@ def write_frames(
             ffmpeg needs depends on CPU speed, compression, and frame size.
         input_params (list): Additional ffmpeg input command line parameters.
         output_params (list): Additional ffmpeg output command line parameters.
+        audio_path (str): A input file path for encoding with an audio stream.
+        audio_codec (str): The audio codec to use if audio_path is provided.
     """
 ```
 

imageio_ffmpeg/_definitions.py

@@ -8,6 +8,8 @@ def get_platform():
     bits = struct.calcsize("P") * 8
     if sys.platform.startswith("linux"):
         return "linux{}".format(bits)
+    elif sys.platform.startswith("freebsd"):
+        return "freebsd{}".format(bits)
     elif sys.platform.startswith("win"):
         return "win{}".format(bits)
     elif sys.platform.startswith("cygwin"):
@@ -33,13 +35,15 @@ def get_platform():
     "win64": "ffmpeg-win64-v4.2.2.exe",
     # "linux32": "ffmpeg-linux32-v4.2.2",
     "linux64": "ffmpeg-linux64-v4.2.2",  # Kernel 3.2.0+
+    "linuxaarch64": "ffmpeg-linuxaarch64-v4.2.2",
 }
 
 osxplats = "macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64"
 
 # Wheel tag -> platform string
 WHEEL_BUILDS = {
     "py3-none-manylinux2010_x86_64": "linux64",
+    "py3-none-manylinux2014_aarch64": "linuxaarch64",
     "py3-none-" + osxplats: "osx64",
     "py3-none-win32": "win32",
     "py3-none-win_amd64": "win64",

imageio_ffmpeg/_io.py

@@ -276,6 +276,8 @@ def write_frames(
     ffmpeg_timeout=None,
     input_params=None,
     output_params=None,
+    audio_path=None,
+    audio_codec=None,
 ):
     """
     Create a generator to write frames (bytes objects) into a video file.
@@ -312,6 +314,11 @@ def write_frames(
             ffmpeg needs depends on CPU speed, compression, and frame size.
         input_params (list): Additional ffmpeg input command line parameters.
         output_params (list): Additional ffmpeg output command line parameters.
+        audio_path (str): A input file path for encoding with an audio stream.
+            Default None, no audio.
+        audio_codec (str): The audio codec to use if audio_path is provided.
+            "copy" will try to use audio_path's audio codec without re-encoding.
+            Default None, but some formats must have certain codecs specified.
     """
 
     # ----- Input args
@@ -373,11 +380,18 @@ def write_frames(
         default_codec = "msmpeg4"
     codec = codec or default_codec
 
+    audio_params = ["-an"]
+    if audio_path is not None and not path.lower().endswith(".gif"):
+        audio_params = ["-i", audio_path]
+        if audio_codec is not None:
+            output_params += ["-acodec", audio_codec]
+        output_params += ["-map", "0:v:0", "-map", "1:a:0"]
+
     # Get command
     cmd = [_get_exe(), "-y", "-f", "rawvideo", "-vcodec", "rawvideo", "-s", sizestr]
     cmd += ["-pix_fmt", pix_fmt_in, "-r", "{:.02f}".format(fps)] + input_params
-    cmd += ["-i", "-"]
-    cmd += ["-an", "-vcodec", codec, "-pix_fmt", pix_fmt_out]
+    cmd += ["-i", "-"] + audio_params
+    cmd += ["-vcodec", codec, "-pix_fmt", pix_fmt_out]
 
     # Add fixed bitrate or variable bitrate compression flags
     if bitrate is not None:

imageio_ffmpeg/_parsing.py

@@ -130,6 +130,17 @@ def parse_ffmpeg_header(text):
     meta["codec"] = line.split("Video: ", 1)[-1].lstrip().split(" ", 1)[0].strip()
     meta["pix_fmt"] = line.split("Video: ", 1)[-1].split(",")[1].strip()
 
+    # get the output line that speaks about audio
+    audiolines = [
+        l for l in lines if l.lstrip().startswith("Stream ") and " Audio: " in l
+    ]
+
+    if len(audiolines) > 0:
+        audio_line = audiolines[0]
+        meta["audio_codec"] = (
+            audio_line.split("Audio: ", 1)[-1].lstrip().split(" ", 1)[0].strip()
+        )
+
     # get the frame rate.
     # matches can be empty, see #171, assume nframes = inf
     # the regexp omits values of "1k tbr" which seems a specific edge-case #262

tests/test_io.py

@@ -349,6 +349,29 @@ def _write_frames(pixfmt, bpp, tout):
     assert nframes == n
 
 
+@no_warnings_allowed
+def test_write_audio_path():
+    # Provide an audio
+
+    gen = imageio_ffmpeg.write_frames(
+        test_file2, (64, 64), audio_path=test_file3, audio_codec="aac"
+    )
+    gen.send(None)  # seed
+    for i in range(9):
+        data = bytes([min(255, 100 + i * 10)] * 64 * 64 * 3)
+        gen.send(data)
+    gen.close()
+    # Check nframes
+    nframes, nsecs = imageio_ffmpeg.count_frames_and_secs(test_file2)
+    assert nframes == 9
+    # Check size
+    meta = imageio_ffmpeg.read_frames(test_file2).__next__()
+    audio_codec = meta["audio_codec"]
+
+    assert nframes == 9
+    assert audio_codec == "aac"
+
+
 if __name__ == "__main__":
     setup_module()
     test_ffmpeg_version()
@@ -366,3 +389,4 @@ def _write_frames(pixfmt, bpp, tout):
     test_write_bitrate()
     test_write_macro_block_size()
     test_write_big_frames()
+    test_write_audio_path()