move experimental or non-essential features to tools.etools

Author: fujiawei-dev

Makefile

@@ -4,7 +4,7 @@
 .NOTPARALLEL: ;          # wait for target to finish
 .EXPORT_ALL_VARIABLES: ; # send all vars to shell
 
-VERSION = 1.0.1
+VERSION = 1.0.4
 PACKAGE = ffmpeg-generator
 
 # While console windows in Windows 10 do support VT (Virtual Terminal) / ANSI

README.md

@@ -43,12 +43,13 @@ This project is based on [`ffmpeg-python`](https://github.com/kkroening/ffmpeg-p
 - support video sources
 - support almost all filters
 - support FFplay&FFprobe
-- enable cuda hwaccel by default
+- enable cuda hwaccel by default, or close globally by code below
 
-## TODO
+```python
+from ffmpeg import settings
 
-- [] separate outputs for select filter
-- [] experiment: automatically generate subtitle files
+settings.CUDA_ENABLE = False
+```
 
 ## Installation
 

ffmpeg/__init__.py

@@ -2,54 +2,43 @@
 Date: 2021.02.25 14:34:07
 Description: Omit
 LastEditors: Rustle Karl
-LastEditTime: 2021.05.31 10:38:26
+LastEditTime: 2021.06.25 09:25:13
 '''
 import subprocess
 
 from pkgs import color
 
 from ._ffmpeg import input, input_source, merge_outputs, output
-from ._ffplay import (detect_device_available, ffplay_audio, ffplay_video,
-                      run_ffplay)
+from ._ffplay import ffplay_audio, ffplay_video, run_ffplay
 from ._ffprobe import FFprobe, metadata, run_ffprobe
-from ._progress import show_progress
 from ._utils import convert_kwargs_to_cmd_line_args
-from ._view import view
 from .filters import afilters, avfilters, vfilters
 from .nodes import FFmpegError
-from .tools import atools, avtools, iotools, rtmp, vtools
+from .tools import atools, avtools, vtools
 
 __all__ = [
     'FFmpeg',
     'FFmpegError',
     'FFprobe',
-    '__version__',
     'afilters',
     'atools',
     'avfilters',
     'avtools',
     'constants',
-    'detect_device_available',
     'ffplay_audio',
     'ffplay_video',
     'input',
     'input_source',
-    'iotools',
     'merge_outputs',
     'metadata',
     'output',
-    'rtmp',
     'run_ffmpeg',
     'run_ffplay',
     'run_ffprobe',
-    'show_progress',
     'vfilters',
-    'view',
     'vtools',
 ]
 
-__version__ = '1.0.2'
-
 
 def run_ffmpeg(option: str = None, stdout=None, check=True, **kwargs) -> subprocess.CompletedProcess:
     '''Run raw ffmpeg command.'''

ffmpeg/_ffplay.py

@@ -1,24 +1,23 @@
 '''
 Date: 2021.03.06 23:06:21
 LastEditors: Rustle Karl
-LastEditTime: 2021.04.25 13:39:24
+LastEditTime: 2021.06.25 09:45:47
 '''
 import subprocess
 from pathlib import Path
 
 from pkgs import color
 
-from ._utils import join_cmd_args_seq, convert_kwargs_to_cmd_line_args
+from ._utils import convert_kwargs_to_cmd_line_args, join_cmd_args_seq
 
 __all__ = [
-    "detect_device_available",
     "ffplay_audio",
     "ffplay_video",
     "run_ffplay",
 ]
 
 
-def run_ffplay(source: str = None, direct_print=True, **kwargs):
+def run_ffplay(source: str = None, print_cmd=True, **kwargs):
     """Run raw ffplay command."""
     args = ["ffplay", "-hide_banner"]
 
@@ -34,7 +33,7 @@ def run_ffplay(source: str = None, direct_print=True, **kwargs):
     if source is not None:
         args.append(Path(source).as_posix())
 
-    if direct_print:
+    if print_cmd:
         color.greenln(join_cmd_args_seq(args))
 
     return subprocess.Popen(args)
@@ -68,12 +67,3 @@ def ffplay_video(source: str, x: int = None, y: int = None, video_size: str = No
                fs=fs, an=an, vn=vn, sn=sn, f=f, s=s, sync=sync, ss=ss, t=t, vf=vf,
                af=af, seek_interval=seek_interval, window_title=window_title,
                showmode=show_mode, loop=loop)
-
-
-def detect_device_available(source: str, f: str):
-    """
-    Examples:
-        ffplay -f dshow -i video='USB2.0 PC CAMERA
-        ffplay -f vfwcap -i 0
-    '"""
-    run_ffplay(source, f=f).wait()

ffmpeg/_progress.py

@@ -102,21 +102,21 @@ def get_output_args(self, overwrite=True, progress='') -> List[str]:
 
         return args
 
-    def compile(self, *, executable="ffmpeg", direct_print=True, join_args=False,
+    def compile(self, *, executable="ffmpeg", print_cmd=True, join_args=False,
                 overwrite=True, progress='') -> Union[str, List[str]]:
         '''Build command-line for invoking ffmpeg.'''
         cmd_args_seq = [executable] + self.get_output_args(overwrite, progress)
         command = join_cmd_args_seq(cmd_args_seq)
 
-        if direct_print:
+        if print_cmd:
             color.greenln(command)
 
         if join_args:
             return command
 
         return cmd_args_seq
 
-    def run_async(self, *, executable="ffmpeg", direct_print=True, join_args=False,
+    def run_async(self, *, executable="ffmpeg", print_cmd=True, join_args=False,
                   pipe_stdin=False, pipe_stdout=True, pipe_stderr=True, quiet=False,
                   overwrite=True, progress='') -> subprocess.Popen:
         '''Asynchronously invoke ffmpeg for the supplied node graph.'''
@@ -127,7 +127,7 @@ def run_async(self, *, executable="ffmpeg", direct_print=True, join_args=False,
 
         cmd_args_seq = self.compile(
                 executable=executable,
-                direct_print=direct_print,
+                print_cmd=print_cmd,
                 join_args=join_args,
                 overwrite=overwrite,
                 progress=progress,
@@ -144,14 +144,14 @@ def run_async(self, *, executable="ffmpeg", direct_print=True, join_args=False,
                 stderr=stderr_stream if not quiet else subprocess.STDOUT,
         )
 
-    def run(self, executable="ffmpeg", direct_print=True, quiet=False,
+    def run(self, executable="ffmpeg", print_cmd=True, quiet=False,
             capture_stdout=True, capture_stderr=True, pipe_stdin=None,
             overwrite=True, progress='') -> Union[str, List[str]]:
         '''Invoke ffmpeg for the supplied node graph.'''
         start = perf_counter()
         process = self.run_async(
                 executable=executable,
-                direct_print=direct_print,
+                print_cmd=print_cmd,
                 quiet=quiet,
                 pipe_stdin=pipe_stdin is not None,
                 pipe_stdout=capture_stdout,