libdatachannel-py 2025.1.0.dev14__tar.gz → 2025.1.0.dev16__tar.gz

{libdatachannel_py-2025.1.0.dev14/src/libdatachannel_py.egg-info → libdatachannel_py-2025.1.0.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libdatachannel-py
-Version: 2025.1.0.dev14
+Version: 2025.1.0.dev16
 Summary: libdatachannel-py is a Python binding for libdatachannel.
 Home-page: https://github.com/shiguredo/libdatachannel-py
 License-Expression: Apache-2.0

libdatachannel_py-2025.1.0.dev16/VERSION

@@ -0,0 +1 @@
+2025.1.0.dev16

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16}/buildbase.py

@@ -29,6 +29,7 @@ import logging
 import multiprocessing
 import os
 import platform
+import hashlib
 import shlex
 import shutil
 import stat
@@ -143,7 +144,12 @@ def add_path(path: str, is_after=False):
         os.environ["PATH"] = path + PATH_SEPARATOR + os.environ["PATH"]
 
 
-def download(url: str, output_dir: Optional[str] = None, filename: Optional[str] = None) -> str:
+def download(
+    url: str,
+    output_dir: Optional[str] = None,
+    filename: Optional[str] = None,
+    expected_sha256: Optional[str] = None,
+) -> str:
     if filename is None:
         output_path = urllib.parse.urlparse(url).path.split("/")[-1]
     else:
@@ -153,22 +159,53 @@ def download(url: str, output_dir: Optional[str] = None, filename: Optional[str]
         output_path = os.path.join(output_dir, output_path)
 
     if os.path.exists(output_path):
-        return output_path
+        if expected_sha256 is not None:
+            try:
+                verify_sha256(output_path, expected_sha256)
+            except ValueError:
+                logging.warning(f"Existing file has invalid hash, removing: {output_path}")
+                os.remove(output_path)
+                return download(url, output_dir, filename, expected_sha256)
+        else:
+            return output_path
 
     try:
+        logging.info(f"Downloading {url} to {output_path}")
         if shutil.which("curl") is not None:
             cmd(["curl", "-fLo", output_path, url])
         else:
             cmd(["wget", "-cO", output_path, url])
+
+        if expected_sha256 is not None:
+            verify_sha256(output_path, expected_sha256)
     except Exception:
         # ゴミを残さないようにする
         if os.path.exists(output_path):
+            logging.error(f"Removing incomplete/invalid file: {output_path}")
             os.remove(output_path)
         raise
 
     return output_path
 
 
+def verify_sha256(file_path: str, expected_sha256: str):
+    logging.info(f"Verifying SHA256 hash for {file_path}")
+    sha256_hash = hashlib.sha256()
+    with open(file_path, "rb") as f:
+        for byte_block in iter(lambda: f.read(4096), b""):
+            sha256_hash.update(byte_block)
+    actual_sha256 = sha256_hash.hexdigest()
+    if actual_sha256 != expected_sha256.lower():
+        error_msg = (
+            f"SHA256 hash mismatch for {file_path}:\n"
+            f"  Expected: {expected_sha256.lower()}\n"
+            f"  Actual:   {actual_sha256}"
+        )
+        logging.error(error_msg)
+        raise ValueError(error_msg)
+    logging.info(f"SHA256 hash verified successfully for {file_path}")
+
+
 def read_version_file(path: str) -> Dict[str, str]:
     versions = {}
 
@@ -1732,7 +1769,13 @@ def install_boringssl(
 
 @versioned
 def install_opus(
-    version, source_dir, build_dir, install_dir, configuration: str, cmake_args: List[str]
+    version,
+    source_dir,
+    build_dir,
+    install_dir,
+    configuration: str,
+    cmake_args: List[str],
+    expected_sha256: Optional[str] = None,
 ):
     opus_source_dir = os.path.join(source_dir, "opus")
     opus_build_dir = os.path.join(build_dir, "opus")
@@ -1740,7 +1783,14 @@ def install_opus(
     rm_rf(opus_source_dir)
     rm_rf(opus_build_dir)
     rm_rf(opus_install_dir)
-    git_clone_shallow("https://gitlab.xiph.org/xiph/opus", version, opus_source_dir)
+    # Git クローンではなく、配布アーカイブをダウンロードして展開する
+    # 例: OPUS_VERSION=v1.5.2 -> https://oss-mirrors.shiguredo.jp/opus-1.5.2.tar.gz
+    version_nov = version[1:] if version.startswith("v") else version
+    archive_filename = f"opus-{version_nov}.tar.gz"
+    # 公式サイトに負荷をかけないための時雨堂によるミラー
+    url = f"https://oss-mirrors.shiguredo.jp/{archive_filename}"
+    archive_path = download(url, source_dir, expected_sha256=expected_sha256)
+    extract(archive_path, source_dir, "opus")
     mkdir_p(opus_build_dir)
     with cd(opus_build_dir):
         cmd(

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16}/pyproject.toml

@@ -17,21 +17,20 @@ Source = "https://github.com/shiguredo/libdatachannel-py"
 Discord = "https://discord.gg/shiguredo"
 
 [build-system]
-requires = ["setuptools>=80.9", "wheel>=0.45.1"]
+requires = ["setuptools>=80.9"]
 build-backend = "setuptools.build_meta"
 
 [dependency-groups]
 dev = [
-    "nanobind>=2.8",
-    "pytest",
+    "nanobind==2.9.2",
     "setuptools>=80.9",
-    "build>=1.2.2.post1",
-    "wheel>=0.45.1",
-    "numpy>=2.3",
+    "pytest",
+    "pytest-aiohttp",
+    "numpy",
     "ty",
     "hypothesis",
     "aiohttp",
-    "pytest-aiohttp",
+    "ruff",
 ]
 
 [tool.uv.workspace]

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16}/run.py

@@ -1,8 +1,10 @@
 import argparse
+import glob
 import multiprocessing
 import os
 import shutil
 import sys
+from typing import Optional
 
 from buildbase import (
     Platform,
@@ -128,6 +130,7 @@ def install_deps(
         "install_dir": install_dir,
         "configuration": "Debug" if debug else "Release",
         "cmake_args": macos_cmake_args,
+        "expected_sha256": version.get("OPUS_SHA256_HASH"),
     }
     install_opus(**install_opus_args)
 
@@ -179,29 +182,52 @@ AVAILABLE_TARGETS = [
 ]
 
 
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--debug", action="store_true")
-    parser.add_argument("--relwithdebinfo", action="store_true")
-    parser.add_argument("target", choices=AVAILABLE_TARGETS)
+def _find_clang_binary(name: str) -> Optional[str]:
+    if shutil.which(name) is not None:
+        return name
+    else:
+        for n in range(50, 14, -1):
+            if shutil.which(f"{name}-{n}") is not None:
+                return f"{name}-{n}"
+    return None
 
-    args = parser.parse_args()
-    if args.target == "windows_x86_64":
+
+def _format(
+    clang_format_path: Optional[str] = None,
+):
+    if clang_format_path is None:
+        clang_format_path = _find_clang_binary("clang-format")
+    if clang_format_path is None:
+        raise Exception("clang-format not found. Please install it or specify the path.")
+    patterns = [
+        "src/**/*.cpp",
+        "src/**/*.h",
+    ]
+    target_files = []
+    for pattern in patterns:
+        files = glob.glob(pattern, recursive=True)
+        target_files.extend(files)
+    cmd([clang_format_path, "-i"] + target_files)
+
+
+def _build(args):
+    target = args.target
+    if target == "windows_x86_64":
         platform = Platform("windows", get_windows_osver(), "x86_64")
-    elif args.target == "macos_x86_64":
+    elif target == "macos_x86_64":
         platform = Platform("macos", get_macos_osver(), "x86_64")
-    elif args.target == "macos_arm64":
+    elif target == "macos_arm64":
         platform = Platform("macos", get_macos_osver(), "arm64")
-    elif args.target == "ubuntu-22.04_x86_64":
+    elif target == "ubuntu-22.04_x86_64":
         platform = Platform("ubuntu", "22.04", "x86_64")
-    elif args.target == "ubuntu-24.04_x86_64":
+    elif target == "ubuntu-24.04_x86_64":
         platform = Platform("ubuntu", "24.04", "x86_64")
-    elif args.target == "ubuntu-24.04_armv8":
+    elif target == "ubuntu-24.04_armv8":
         platform = Platform("ubuntu", "24.04", "armv8")
-    elif args.target == "ubuntu-22.04_armv8_jetson":
+    elif target == "ubuntu-22.04_armv8_jetson":
         platform = Platform("jetson", None, "armv8", "ubuntu-22.04")
     else:
-        raise Exception(f"Unknown target {args.target}")
+        raise Exception(f"Unknown target {target}")
 
     source_dir = os.path.join(BASE_DIR, "_source", platform.target.package_name)
     build_dir = os.path.join(BASE_DIR, "_build", platform.target.package_name)
@@ -341,5 +367,29 @@ def main():
                 )
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    sp = parser.add_subparsers(dest="command")
+
+    # build コマンド
+    bp = sp.add_parser("build")
+    bp.add_argument("target", choices=AVAILABLE_TARGETS)
+    bp.add_argument("--debug", action="store_true")
+    bp.add_argument("--relwithdebinfo", action="store_true")
+
+    # format コマンド
+    fp = sp.add_parser("format")
+    fp.add_argument("--clang-format-path", type=str, default=None)
+
+    args = parser.parse_args()
+
+    if args.command == "build":
+        _build(args)
+    elif args.command == "format":
+        _format(clang_format_path=args.clang_format_path)
+    else:
+        parser.print_help()
+
+
 if __name__ == "__main__":
     main()

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16}/src/libdatachannel/codec/__init__.pyi

@@ -3,7 +3,8 @@ import datetime
 import enum
 from typing import Annotated
 
-from numpy.typing import ArrayLike
+import numpy
+from numpy.typing import NDArray
 
 
 class VideoCodecType(enum.Enum):
@@ -29,22 +30,22 @@ class VideoFrameBufferI420:
     def create(arg0: int, arg1: int, /) -> VideoFrameBufferI420: ...
 
     @property
-    def y(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
+    def y(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')]: ...
 
     @y.setter
-    def y(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
+    def y(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')], /) -> None: ...
 
     @property
-    def u(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
+    def u(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')]: ...
 
     @u.setter
-    def u(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
+    def u(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')], /) -> None: ...
 
     @property
-    def v(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
+    def v(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')]: ...
 
     @v.setter
-    def v(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
+    def v(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')], /) -> None: ...
 
     def width(self) -> int: ...
 
@@ -61,16 +62,16 @@ class VideoFrameBufferNV12:
     def create(arg0: int, arg1: int, /) -> VideoFrameBufferNV12: ...
 
     @property
-    def y(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
+    def y(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')]: ...
 
     @y.setter
-    def y(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
+    def y(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')], /) -> None: ...
 
     @property
-    def uv(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
+    def uv(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')]: ...
 
     @uv.setter
-    def uv(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
+    def uv(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None), order='C')], /) -> None: ...
 
     def width(self) -> int: ...
 
@@ -85,10 +86,10 @@ class VideoFrameBufferBGR888:
     def create(arg0: int, arg1: int, /) -> VideoFrameBufferBGR888: ...
 
     @property
-    def bgr(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C')]: ...
+    def bgr(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3), order='C')]: ...
 
     @bgr.setter
-    def bgr(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C')], /) -> None: ...
+    def bgr(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None, None, 3), order='C')], /) -> None: ...
 
     def width(self) -> int: ...
 
@@ -161,10 +162,10 @@ class EncodedImage:
     def __init__(self) -> None: ...
 
     @property
-    def data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')]: ...
+    def data(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None,), order='C')]: ...
 
     @data.setter
-    def data(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')], /) -> None: ...
+    def data(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None,), order='C')], /) -> None: ...
 
     @property
     def timestamp(self) -> datetime.timedelta: ...
@@ -263,10 +264,10 @@ class AudioFrame:
     def sample_rate(self, arg: int, /) -> None: ...
 
     @property
-    def pcm(self) -> Annotated[ArrayLike, dict(dtype='float32', shape=(None, None), order='C')]: ...
+    def pcm(self) -> Annotated[NDArray[numpy.float32], dict(shape=(None, None), order='C')]: ...
 
     @pcm.setter
-    def pcm(self, arg: Annotated[ArrayLike, dict(dtype='float32', shape=(None, None), order='C')], /) -> None: ...
+    def pcm(self, arg: Annotated[NDArray[numpy.float32], dict(shape=(None, None), order='C')], /) -> None: ...
 
     @property
     def timestamp(self) -> datetime.timedelta: ...
@@ -282,10 +283,10 @@ class EncodedAudio:
     def __init__(self) -> None: ...
 
     @property
-    def data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')]: ...
+    def data(self) -> Annotated[NDArray[numpy.uint8], dict(shape=(None,), order='C')]: ...
 
     @data.setter
-    def data(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')], /) -> None: ...
+    def data(self, arg: Annotated[NDArray[numpy.uint8], dict(shape=(None,), order='C')], /) -> None: ...
 
     @property
     def timestamp(self) -> datetime.timedelta: ...

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16}/src/libdatachannel/libyuv/__init__.pyi

@@ -1,6 +1,6 @@
 import enum
 
-from numpy.typing import ArrayLike
+from numpy.typing import NDArray
 
 
 class FilterMode(enum.Enum):
@@ -172,16 +172,16 @@ class RotationMode(enum.Enum):
 
     kRotate270 = 270
 
-def nv12_scale(src_y: ArrayLike, src_uv: ArrayLike, src_stride_y: int, src_stride_uv: int, src_width: int, src_height: int, dst_y: ArrayLike, dst_uv: ArrayLike, dst_stride_y: int, dst_stride_uv: int, dst_width: int, dst_height: int, filtering: FilterMode) -> int: ...
+def nv12_scale(src_y: NDArray, src_uv: NDArray, src_stride_y: int, src_stride_uv: int, src_width: int, src_height: int, dst_y: NDArray, dst_uv: NDArray, dst_stride_y: int, dst_stride_uv: int, dst_width: int, dst_height: int, filtering: FilterMode) -> int: ...
 
-def i420_scale(src_y: ArrayLike, src_u: ArrayLike, src_v: ArrayLike, src_stride_y: int, src_stride_u: int, src_stride_v: int, src_width: int, src_height: int, dst_y: ArrayLike, dst_u: ArrayLike, dst_v: ArrayLike, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, dst_width: int, dst_height: int, filtering: FilterMode) -> int: ...
+def i420_scale(src_y: NDArray, src_u: NDArray, src_v: NDArray, src_stride_y: int, src_stride_u: int, src_stride_v: int, src_width: int, src_height: int, dst_y: NDArray, dst_u: NDArray, dst_v: NDArray, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, dst_width: int, dst_height: int, filtering: FilterMode) -> int: ...
 
-def convert_to_i420(sample: ArrayLike, sample_size: int, dst_y: ArrayLike, dst_stride_y: int, dst_u: ArrayLike, dst_stride_u: int, dst_v: ArrayLike, dst_stride_v: int, crop_x: int, crop_y: int, src_width: int, src_height: int, crop_width: int, crop_height: int, rotation: RotationMode, fourcc: FourCC) -> int: ...
+def convert_to_i420(sample: NDArray, sample_size: int, dst_y: NDArray, dst_stride_y: int, dst_u: NDArray, dst_stride_u: int, dst_v: NDArray, dst_stride_v: int, crop_x: int, crop_y: int, src_width: int, src_height: int, crop_width: int, crop_height: int, rotation: RotationMode, fourcc: FourCC) -> int: ...
 
-def nv12_to_i420(src_y: ArrayLike, src_uv: ArrayLike, src_stride_y: int, src_stride_uv: int, dst_y: ArrayLike, dst_u: ArrayLike, dst_v: ArrayLike, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, width: int, height: int) -> int: ...
+def nv12_to_i420(src_y: NDArray, src_uv: NDArray, src_stride_y: int, src_stride_uv: int, dst_y: NDArray, dst_u: NDArray, dst_v: NDArray, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, width: int, height: int) -> int: ...
 
-def i420_to_nv12(src_y: ArrayLike, src_u: ArrayLike, src_v: ArrayLike, src_stride_y: int, src_stride_u: int, src_stride_v: int, dst_y: ArrayLike, dst_uv: ArrayLike, dst_stride_y: int, dst_stride_uv: int, width: int, height: int) -> int: ...
+def i420_to_nv12(src_y: NDArray, src_u: NDArray, src_v: NDArray, src_stride_y: int, src_stride_u: int, src_stride_v: int, dst_y: NDArray, dst_uv: NDArray, dst_stride_y: int, dst_stride_uv: int, width: int, height: int) -> int: ...
 
-def rgb24_to_i420(src_rgb24: ArrayLike, src_stride_rgb24: int, dst_y: ArrayLike, dst_u: ArrayLike, dst_v: ArrayLike, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, width: int, height: int) -> int: ...
+def rgb24_to_i420(src_rgb24: NDArray, src_stride_rgb24: int, dst_y: NDArray, dst_u: NDArray, dst_v: NDArray, dst_stride_y: int, dst_stride_u: int, dst_stride_v: int, width: int, height: int) -> int: ...
 
-def i420_to_rgb24(src_y: ArrayLike, src_u: ArrayLike, src_v: ArrayLike, src_stride_y: int, src_stride_u: int, src_stride_v: int, dst_rgb24: ArrayLike, dst_stride_rgb24: int, width: int, height: int) -> int: ...
+def i420_to_rgb24(src_y: NDArray, src_u: NDArray, src_v: NDArray, src_stride_y: int, src_stride_u: int, src_stride_v: int, dst_rgb24: NDArray, dst_stride_rgb24: int, width: int, height: int) -> int: ...

{libdatachannel_py-2025.1.0.dev14 → libdatachannel_py-2025.1.0.dev16/src/libdatachannel_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libdatachannel-py
-Version: 2025.1.0.dev14
+Version: 2025.1.0.dev16
 Summary: libdatachannel-py is a Python binding for libdatachannel.
 Home-page: https://github.com/shiguredo/libdatachannel-py
 License-Expression: Apache-2.0

libdatachannel_py-2025.1.0.dev14/VERSION

@@ -1 +0,0 @@
-2025.1.0.dev14