HwCodecDetect 0.1.0__tar.gz → 0.1.2__tar.gz

{hwcodecdetect-0.1.0/src/HwCodecDetect.egg-info → hwcodecdetect-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HwCodecDetect
-Version: 0.1.0
+Version: 0.1.2
 Summary: A cross-platform tool to automatically detect and test hardware video decoders/encoders using FFmpeg.
 Home-page: https://github.com/whyb/HwCodecDetect
 Author: whyb
@@ -23,7 +23,7 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# FFmpeg Hardware Codec Test Script(HwCodecDetect)
+# FFmpeg Hardware Codec Detect Script(HwCodecDetect)
 <p align="center">
     <a href="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml">
         <img src="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml/badge.svg" />
@@ -46,7 +46,7 @@ This project was created to solve this very problem. It's a convenient tool for
 
 ## Key Features
 ### Encoders
-The script automatically tests and reports on the following major hardware encoders and their supported formats:
+The script automatically detect and reports on the following major hardware encoders and their supported formats:
 | Encoder Name                   	       | Supported Video Formats                   |
 |------------------------------------------|------------------------------------------- |
 | NVEnc                          	       | H.264、H.265、AV1                          |
@@ -59,7 +59,7 @@ The script automatically tests and reports on the following major hardware encod
 | Apple VideoToolbox               	       | H.264、H.265                               |
 
 ### Decoders
-The script automatically tests and reports on the following major hardware decoders and their supported formats:
+The script automatically detect and reports on the following major hardware decoders and their supported formats:
 | Decoder Name                              | Supported Video Formats                                      |
 |------------------------------------------	|------------------------------------------------------------- |
 | NVDec (CUVID)                  	        | H.264、H.265、AV1、MJPEG、MPEG-1、MPEG-2、MPEG-4、VP8、VP9    |

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/README.md

@@ -1,4 +1,4 @@
-# FFmpeg Hardware Codec Test Script(HwCodecDetect)
+# FFmpeg Hardware Codec Detect Script(HwCodecDetect)
 <p align="center">
     <a href="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml">
         <img src="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml/badge.svg" />
@@ -21,7 +21,7 @@ This project was created to solve this very problem. It's a convenient tool for
 
 ## Key Features
 ### Encoders
-The script automatically tests and reports on the following major hardware encoders and their supported formats:
+The script automatically detect and reports on the following major hardware encoders and their supported formats:
 | Encoder Name                   	       | Supported Video Formats                   |
 |------------------------------------------|------------------------------------------- |
 | NVEnc                          	       | H.264、H.265、AV1                          |
@@ -34,7 +34,7 @@ The script automatically tests and reports on the following major hardware encod
 | Apple VideoToolbox               	       | H.264、H.265                               |
 
 ### Decoders
-The script automatically tests and reports on the following major hardware decoders and their supported formats:
+The script automatically detect and reports on the following major hardware decoders and their supported formats:
 | Decoder Name                              | Supported Video Formats                                      |
 |------------------------------------------	|------------------------------------------------------------- |
 | NVDec (CUVID)                  	        | H.264、H.265、AV1、MJPEG、MPEG-1、MPEG-2、MPEG-4、VP8、VP9    |

hwcodecdetect-0.1.2/VERSION

@@ -0,0 +1 @@
+0.1.2

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/pyproject.toml

@@ -4,7 +4,6 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "HwCodecDetect"
-version = "0.1.0"
 authors = [
   { name="whyb", email="whyber@outlook.com" },
 ]
@@ -15,10 +14,7 @@ license = "BSD-3-Clause"
 license-files = [
     "LICENSE",
 ]
-dependencies = [
-    "colorama",
-    "tqdm"
-]
+
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
@@ -26,6 +22,7 @@ classifiers = [
     "Topic :: System :: Installation/Setup",
     "Topic :: Utilities",
 ]
+dynamic = ["version", "dependencies"]
 
 [project.scripts]
 hwcodecdetect = "HwCodecDetect.run_tests:main"
@@ -33,3 +30,7 @@ hwcodecdetect = "HwCodecDetect.run_tests:main"
 [project.urls]
 Homepage = "https://github.com/whyb/HwCodecDetect"
 Issues = "https://github.com/whyb/HwCodecDetect/issues"
+
+[tool.setuptools.dynamic]
+version = {file = ["VERSION"]}
+dependencies = {file = ["requirements.txt"]}

hwcodecdetect-0.1.2/requirements.txt

@@ -0,0 +1,2 @@
+colorama
+tqdm

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/setup.py

@@ -1,5 +1,9 @@
 from setuptools import setup, find_packages
 
+def load_requirements(filename="requirements.txt"):
+    with open(filename, encoding="utf-8") as f:
+        return [line.strip() for line in f if line.strip() and not line.startswith("#")]
+
 with open("README.md", encoding="utf-8") as f:
     long_description = f.read()
 
@@ -32,7 +36,7 @@ setup(
         "Topic :: Utilities",
     ],
     python_requires=">=3.8",
-    install_requires=["colorama", "tqdm"],
+    install_requires=load_requirements(),
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     entry_points={

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/src/HwCodecDetect/install_ffmpeg_if_needed.py

@@ -138,24 +138,48 @@ def install_on_linux():
         return -1
 
 def install_on_macos():
-    """
-    Installs FFmpeg using Homebrew for macOS.
-    """
-    print("FFmpeg not found. Attempting to install via Homebrew...")
+    print("FFmpeg not found. Attempting to install for macOS...")
 
-    if not shutil.which("brew"):
-        print("Homebrew not found. Please install Homebrew first by running:", file=sys.stderr)
-        print('/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"', file=sys.stderr)
-        return -1
+    # Try Homebrew
+    if shutil.which("brew"):
+        try:
+            subprocess.run(["brew", "install", "ffmpeg"], check=True)
+            print("FFmpeg installation complete via Homebrew.")
+            return 0
+        except subprocess.CalledProcessError:
+            print("Homebrew installation failed. Trying next method.", file=sys.stderr)
+
+    # Try MacPorts
+    if shutil.which("port"):
+        try:
+            subprocess.run(["sudo", "port", "install", "ffmpeg"], check=True)
+            print("FFmpeg installation complete via MacPorts.")
+            return 0
+        except subprocess.CalledProcessError:
+            print("MacPorts installation failed. Trying next method.", file=sys.stderr)
+
+    # Try Conda
+    if shutil.which("conda"):
+        try:
+            subprocess.run(["conda", "install", "-c", "conda-forge", "ffmpeg", "-y"], check=True)
+            print("FFmpeg installation complete via Conda.")
+            return 0
+        except subprocess.CalledProcessError:
+            print("Conda installation failed. Trying next method.", file=sys.stderr)
+
+    # Try Nix
+    if shutil.which("nix-env"):
+        try:
+            subprocess.run(["nix-env", "-iA", "nixpkgs.ffmpeg"], check=True)
+            print("FFmpeg installation complete via Nix.")
+            return 0
+        except subprocess.CalledProcessError:
+            print("Nix installation failed. Trying next method.", file=sys.stderr)
+
+    # Manual fallback
+    print("All package manager installations failed. Please install FFmpeg manually from https://ffmpeg.org/download.html", file=sys.stderr)
+    return -1
 
-    try:
-        print("Attempting to install FFmpeg using brew...")
-        subprocess.run(["brew", "install", "ffmpeg"], check=True)
-        print("FFmpeg installation complete.")
-        return 0
-    except subprocess.CalledProcessError as e:
-        print(f"Error installing FFmpeg with Homebrew: {e}", file=sys.stderr)
-        return -1
 
 def get_linux_distro():
     """

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/src/HwCodecDetect/run_tests.py

@@ -1,6 +1,7 @@
 import os
 import re
 import sys
+import shlex
 import subprocess
 import shutil
 import tempfile
@@ -182,11 +183,29 @@ def _run_encoder_test_single(test_data):
     status = "succeeded" if success else "failed"
 
     if verbose:
-        if stdout:
-            print(f"Output:\n{stdout}")
-        if stderr:
-            print(f"Error Output:\n{stderr}")
-        print(f"Test Result: {status}")
+        info_str = f"codec: {codec}, encoder: {encoder}, resolution: {res_size}, status: {status}"
+        command_str = " ".join(shlex.quote(arg) for arg in command)
+        if stdout.strip() and stderr.strip():
+            command_log = f"{stdout.strip()}\n{stderr.strip()}"
+        elif stdout.strip():
+            command_log = stdout.strip()
+        elif stderr.strip():
+            command_log = stderr.strip()
+        else:
+            command_log = "(none)"
+        log_message = f"""
+==================================================
+[Encoder Detect Info]
+{info_str}
+
+[FFmpeg Command]
+{command_str}
+
+[Command Log]
+{command_log}
+
+""".strip()
+        print(log_message)
 
     title = ENCODER_TITLES.get((encoder, codec), f"{encoder.upper()} Encoder:")
     return title, res_name, status
@@ -276,11 +295,29 @@ def _run_decoder_test_single(test_data):
     status = "succeeded" if success else "failed"
 
     if verbose:
-        if stdout:
-            print(f"Output:\n{stdout}")
-        if stderr:
-            print(f"Error Output:\n{stderr}")
-        print(f"Test Result: {status}")
+        info_str = f"codec: {codec}, decoder: {hw_decoder}, resolution: {res_size}, status: {status}"
+        command_str = " ".join(shlex.quote(arg) for arg in command)
+        if stdout.strip() and stderr.strip():
+            command_log = f"{stdout.strip()}\n{stderr.strip()}"
+        elif stdout.strip():
+            command_log = stdout.strip()
+        elif stderr.strip():
+            command_log = stderr.strip()
+        else:
+            command_log = "(none)"
+        log_message = f"""
+==================================================
+[Decoder Detect Info]
+{info_str}
+
+[FFmpeg Command]
+{command_str}
+
+[Command Log]
+{command_log}
+
+""".strip()
+        print(log_message)
 
     title = DECODER_TITLES.get((hw_decoder, codec), f"{hw_decoder.upper()} Decoder:")
     return title, res_name, status

hwcodecdetect-0.1.2/src/HwCodecDetect/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.2"

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2/src/HwCodecDetect.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HwCodecDetect
-Version: 0.1.0
+Version: 0.1.2
 Summary: A cross-platform tool to automatically detect and test hardware video decoders/encoders using FFmpeg.
 Home-page: https://github.com/whyb/HwCodecDetect
 Author: whyb
@@ -23,7 +23,7 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# FFmpeg Hardware Codec Test Script(HwCodecDetect)
+# FFmpeg Hardware Codec Detect Script(HwCodecDetect)
 <p align="center">
     <a href="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml">
         <img src="https://github.com/whyb/HwCodecDetect/actions/workflows/run-test.yml/badge.svg" />
@@ -46,7 +46,7 @@ This project was created to solve this very problem. It's a convenient tool for
 
 ## Key Features
 ### Encoders
-The script automatically tests and reports on the following major hardware encoders and their supported formats:
+The script automatically detect and reports on the following major hardware encoders and their supported formats:
 | Encoder Name                   	       | Supported Video Formats                   |
 |------------------------------------------|------------------------------------------- |
 | NVEnc                          	       | H.264、H.265、AV1                          |
@@ -59,7 +59,7 @@ The script automatically tests and reports on the following major hardware encod
 | Apple VideoToolbox               	       | H.264、H.265                               |
 
 ### Decoders
-The script automatically tests and reports on the following major hardware decoders and their supported formats:
+The script automatically detect and reports on the following major hardware decoders and their supported formats:
 | Decoder Name                              | Supported Video Formats                                      |
 |------------------------------------------	|------------------------------------------------------------- |
 | NVDec (CUVID)                  	        | H.264、H.265、AV1、MJPEG、MPEG-1、MPEG-2、MPEG-4、VP8、VP9    |

{hwcodecdetect-0.1.0 → hwcodecdetect-0.1.2}/src/HwCodecDetect.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 VERSION
 pyproject.toml
+requirements.txt
 setup.py
 src/HwCodecDetect/__init__.py
 src/HwCodecDetect/install_ffmpeg_if_needed.py

hwcodecdetect-0.1.0/VERSION

@@ -1 +0,0 @@
-0.1.0

hwcodecdetect-0.1.0/src/HwCodecDetect/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.0"