libdatachannel-py 2025.1.0.dev6__tar.gz → 2025.1.0.dev8__tar.gz

{libdatachannel_py-2025.1.0.dev6/src/libdatachannel_py.egg-info → libdatachannel_py-2025.1.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libdatachannel-py
-Version: 2025.1.0.dev6
+Version: 2025.1.0.dev8
 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.dev8/VERSION

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

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8}/buildbase.py

@@ -702,8 +702,8 @@ def build_and_install_boost(
 ):
     version_underscore = version.replace(".", "_")
     archive = download(
-        # 公式サイトに負荷をかけないための時雨堂による R2 ミラー
-        f"https://pub-31f2ce80536a4322af33196843feefc2.r2.dev/boost_{version_underscore}.tar.gz",
+        # 公式サイトに負荷をかけないための時雨堂によるミラー
+        f"https://oss-mirrors.shiguredo.jp/boost_{version_underscore}.tar.gz",
         # Boost 公式のミラー
         # f"https://archives.boost.io/release/{version}/source/boost_{version_underscore}.tar.gz",
         source_dir,
@@ -1748,6 +1748,7 @@ def install_opus(
                 "cmake",
                 f"-DCMAKE_INSTALL_PREFIX={cmake_path(opus_install_dir)}",
                 f"-DCMAKE_BUILD_TYPE={configuration}",
+                "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
                 "-DOPUS_BUILD_SHARED_LIBRARY=OFF",
                 "-DOPUS_BUILD_TESTING=OFF",
                 "-DOPUS_BUILD_PROGRAMS=OFF",
@@ -1841,6 +1842,126 @@ def install_mbedtls(version, source_dir, build_dir, install_dir, debug, cmake_ar
         cmd(["cmake", "--install", os.path.join(build_dir, "mbedtls")])
 
 
+@versioned
+def install_libjpeg_turbo(version, source_dir, build_dir, install_dir, configuration, cmake_args):
+    libjpeg_source_dir = os.path.join(source_dir, "libjpeg-turbo")
+    libjpeg_build_dir = os.path.join(build_dir, "libjpeg-turbo")
+    libjpeg_install_dir = os.path.join(install_dir, "libjpeg-turbo")
+    rm_rf(libjpeg_source_dir)
+    rm_rf(libjpeg_build_dir)
+    rm_rf(libjpeg_install_dir)
+    git_clone_shallow(
+        "https://github.com/libjpeg-turbo/libjpeg-turbo.git",
+        version,
+        libjpeg_source_dir,
+    )
+    mkdir_p(libjpeg_build_dir)
+    with cd(libjpeg_build_dir):
+        cmd(
+            [
+                "cmake",
+                libjpeg_source_dir,
+                f"-DCMAKE_INSTALL_PREFIX={libjpeg_install_dir}",
+                f"-DCMAKE_BUILD_TYPE={configuration}",
+                "-DENABLE_SHARED=FALSE",
+                "-DENABLE_STATIC=TRUE",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
+            ]
+            + cmake_args
+        )
+        cmd(
+            [
+                "cmake",
+                "--build",
+                libjpeg_build_dir,
+                f"-j{multiprocessing.cpu_count()}",
+                "--config",
+                "Release",
+            ]
+        )
+        cmd(["cmake", "--install", libjpeg_build_dir])
+
+
+@versioned
+def install_libyuv(
+    version, source_dir, build_dir, install_dir, libjpeg_turbo_dir, configuration, cmake_args
+):
+    libyuv_source_dir = os.path.join(source_dir, "libyuv")
+    libyuv_build_dir = os.path.join(build_dir, "libyuv")
+    libyuv_install_dir = os.path.join(install_dir, "libyuv")
+    rm_rf(libyuv_source_dir)
+    rm_rf(libyuv_build_dir)
+    rm_rf(libyuv_install_dir)
+    git_clone_shallow(
+        "https://chromium.googlesource.com/libyuv/libyuv",
+        version,
+        libyuv_source_dir,
+    )
+    mkdir_p(libyuv_build_dir)
+    with cd(libyuv_build_dir):
+        cmd(
+            [
+                "cmake",
+                libyuv_source_dir,
+                f"-DCMAKE_INSTALL_PREFIX={cmake_path(libyuv_install_dir)}",
+                f"-DCMAKE_BUILD_TYPE={configuration}",
+                f"-DCMAKE_PREFIX_PATH={cmake_path(libjpeg_turbo_dir)}",
+                *cmake_args,
+            ]
+        )
+        cmd(
+            [
+                "cmake",
+                "--build",
+                libyuv_build_dir,
+                f"-j{multiprocessing.cpu_count()}",
+                "--config",
+                "Release",
+            ]
+        )
+        cmd(["cmake", "--install", libyuv_build_dir])
+
+
+@versioned
+def install_aom(version, source_dir, build_dir, install_dir, configuration, cmake_args):
+    aom_source_dir = os.path.join(source_dir, "aom")
+    aom_build_dir = os.path.join(build_dir, "aom")
+    aom_install_dir = os.path.join(install_dir, "aom")
+    rm_rf(aom_source_dir)
+    rm_rf(aom_build_dir)
+    rm_rf(aom_install_dir)
+    git_clone_shallow(
+        "https://aomedia.googlesource.com/aom",
+        version,
+        aom_source_dir,
+    )
+    with cd(aom_source_dir):
+        cmd(
+            [
+                "cmake",
+                "-B",
+                aom_build_dir,
+                f"-DCMAKE_INSTALL_PREFIX={cmake_path(aom_install_dir)}",
+                f"-DCMAKE_BUILD_TYPE={configuration}",
+                "-DENABLE_DOCS=OFF",
+                "-DENABLE_TESTS=OFF",
+                *cmake_args,
+            ]
+        )
+        cmd(
+            [
+                "cmake",
+                "--build",
+                aom_build_dir,
+                f"-j{multiprocessing.cpu_count()}",
+                "--config",
+                "Release",
+            ]
+        )
+        cmd(["cmake", "--install", aom_build_dir])
+
+
 class PlatformTarget(object):
     def __init__(self, os, osver, arch, extra=None):
         self.os = os

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8}/pyproject.toml

@@ -18,17 +18,17 @@ Source = "https://github.com/shiguredo/libdatachannel-py"
 Discord = "https://discord.gg/shiguredo"
 
 [build-system]
-requires = ["setuptools==80.4", "wheel==0.45.1"]
+requires = ["setuptools>=80.8", "wheel>=0.45.1"]
 build-backend = "setuptools.build_meta"
 
 [dependency-groups]
 dev = [
-    "nanobind>=2.7.0",
-    "pytest>=8.3.5",
-    "setuptools>=80.4",
+    "nanobind>=2.7",
+    "pytest>=8",
+    "setuptools>=80.8",
     "build>=1.2.2.post1",
     "wheel>=0.45.1",
-    "numpy>=2.2.5",
+    "numpy>=2.2",
 ]
 
 [tool.ruff]

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8}/run.py

@@ -16,9 +16,13 @@ from buildbase import (
     get_macos_osver,
     get_windows_osver,
     git_clone_shallow,
+    install_aom,
     install_cmake,
+    install_libjpeg_turbo,
+    install_libyuv,
     install_mbedtls,
     install_openh264,
+    install_opus,
     mkdir_p,
     read_version_file,
 )
@@ -115,6 +119,55 @@ def install_deps(
     }
     install_openh264(**install_openh264_args)
 
+    # Opus
+    install_opus_args = {
+        "version": version["OPUS_VERSION"],
+        "version_file": os.path.join(install_dir, "opus.version"),
+        "source_dir": source_dir,
+        "build_dir": build_dir,
+        "install_dir": install_dir,
+        "configuration": "Debug" if debug else "Release",
+        "cmake_args": macos_cmake_args,
+    }
+    install_opus(**install_opus_args)
+
+    # libjpeg-turbo
+    install_libjpeg_turbo_args = {
+        "version": version["LIBJPEG_TURBO_VERSION"],
+        "version_file": os.path.join(install_dir, "libjpeg-turbo.version"),
+        "source_dir": source_dir,
+        "build_dir": build_dir,
+        "install_dir": install_dir,
+        "configuration": "Debug" if debug else "Release",
+        "cmake_args": macos_cmake_args,
+    }
+    install_libjpeg_turbo(**install_libjpeg_turbo_args)
+
+    # libyuv
+    install_libyuv_args = {
+        "version": version["LIBYUV_VERSION"],
+        "version_file": os.path.join(install_dir, "libyuv.version"),
+        "source_dir": source_dir,
+        "build_dir": build_dir,
+        "install_dir": install_dir,
+        "libjpeg_turbo_dir": os.path.join(install_dir, "libjpeg-turbo"),
+        "configuration": "Debug" if debug else "Release",
+        "cmake_args": macos_cmake_args,
+    }
+    install_libyuv(**install_libyuv_args)
+
+    # AOM
+    install_aom_args = {
+        "version": version["AOM_VERSION"],
+        "version_file": os.path.join(install_dir, "aom.version"),
+        "source_dir": source_dir,
+        "build_dir": build_dir,
+        "install_dir": install_dir,
+        "configuration": "Debug" if debug else "Release",
+        "cmake_args": macos_cmake_args,
+    }
+    install_aom(**install_aom_args)
+
 
 AVAILABLE_TARGETS = [
     "windows_x86_64",
@@ -199,6 +252,18 @@ def main():
         # OpenH264
         cmake_args.append(f"-DOPENH264_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}")
 
+        # Opus
+        cmake_args.append(f"-DOPUS_DIR={cmake_path(os.path.join(install_dir, 'opus'))}")
+
+        # Libyuv
+        cmake_args.append(
+            f"-DLIBJPEG_TURBO_DIR={cmake_path(os.path.join(install_dir, 'libjpeg-turbo'))}"
+        )
+        cmake_args.append(f"-DLIBYUV_DIR={cmake_path(os.path.join(install_dir, 'libyuv'))}")
+
+        # AOM
+        cmake_args.append(f"-DAOM_DIR={cmake_path(os.path.join(install_dir, 'aom'))}")
+
         if platform.target.os == "macos":
             sysroot = cmdcap(["xcrun", "--sdk", "macosx", "--show-sdk-path"])
             cmake_args += [
@@ -261,6 +326,20 @@ def main():
                     os.path.join(libdatachannelpy_src_dir, file),
                 )
 
+        for file in os.listdir(os.path.join(libdatachannelpy_build_target_dir, "libyuv")):
+            if file in ("__init__.pyi",):
+                shutil.copyfile(
+                    os.path.join(libdatachannelpy_build_target_dir, "libyuv", file),
+                    os.path.join(libdatachannelpy_src_dir, "libyuv", file),
+                )
+
+        for file in os.listdir(os.path.join(libdatachannelpy_build_target_dir, "codec")):
+            if file in ("__init__.pyi",):
+                shutil.copyfile(
+                    os.path.join(libdatachannelpy_build_target_dir, "codec", file),
+                    os.path.join(libdatachannelpy_src_dir, "codec", file),
+                )
+
 
 if __name__ == "__main__":
     main()

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8}/src/libdatachannel/libdatachannel_ext.pyi

@@ -1,9 +1,9 @@
 from collections.abc import Callable, Sequence
 import datetime
 import enum
-from typing import Annotated, overload
+from typing import overload
 
-from numpy.typing import ArrayLike
+from . import codec as codec, libyuv as libyuv
 
 
 class IceServer:
@@ -1667,211 +1667,3 @@ class WebSocketServer:
     def port(self) -> int: ...
 
     def on_client(self, callback: Callable[[WebSocket], None]) -> None: ...
-
-class VideoCodecType(enum.Enum):
-    H264 = 0
-
-    H265 = 1
-
-    VP8 = 2
-
-    VP9 = 3
-
-    AV1 = 4
-
-class ImageFormat(enum.Enum):
-    I420 = 0
-
-    NV12 = 1
-
-    BGR888 = 2
-
-class VideoFrameBufferI420:
-    @staticmethod
-    def create(arg0: int, arg1: int, /) -> VideoFrameBufferI420: ...
-
-    @property
-    def y(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
-
-    @y.setter
-    def y(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
-
-    @property
-    def u(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
-
-    @u.setter
-    def u(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
-
-    @property
-    def v(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
-
-    @v.setter
-    def v(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
-
-    def width(self) -> int: ...
-
-    def height(self) -> int: ...
-
-    def stride_y(self) -> int: ...
-
-    def stride_u(self) -> int: ...
-
-    def stride_v(self) -> int: ...
-
-class VideoFrameBufferNV12:
-    @staticmethod
-    def create(arg0: int, arg1: int, /) -> VideoFrameBufferNV12: ...
-
-    @property
-    def y(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
-
-    @y.setter
-    def y(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
-
-    @property
-    def uv(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')]: ...
-
-    @uv.setter
-    def uv(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None), order='C')], /) -> None: ...
-
-    def width(self) -> int: ...
-
-    def height(self) -> int: ...
-
-    def stride_y(self) -> int: ...
-
-    def stride_uv(self) -> int: ...
-
-class VideoFrameBufferBGR888:
-    @staticmethod
-    def create(arg0: int, arg1: int, /) -> VideoFrameBufferBGR888: ...
-
-    @property
-    def bgr(self) -> Annotated[ArrayLike, dict(dtype='uint8', 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 width(self) -> int: ...
-
-    def height(self) -> int: ...
-
-    def stride(self) -> int: ...
-
-class VideoFrame:
-    def __init__(self) -> None: ...
-
-    @property
-    def format(self) -> ImageFormat: ...
-
-    @format.setter
-    def format(self, arg: ImageFormat, /) -> None: ...
-
-    @property
-    def i420_buffer(self) -> VideoFrameBufferI420: ...
-
-    @i420_buffer.setter
-    def i420_buffer(self, arg: VideoFrameBufferI420, /) -> None: ...
-
-    @property
-    def nv12_buffer(self) -> VideoFrameBufferNV12: ...
-
-    @nv12_buffer.setter
-    def nv12_buffer(self, arg: VideoFrameBufferNV12, /) -> None: ...
-
-    @property
-    def bgr888_buffer(self) -> VideoFrameBufferBGR888: ...
-
-    @bgr888_buffer.setter
-    def bgr888_buffer(self, arg: VideoFrameBufferBGR888, /) -> None: ...
-
-    @property
-    def timestamp(self) -> datetime.timedelta: ...
-
-    @timestamp.setter
-    def timestamp(self, arg: datetime.timedelta | float, /) -> None: ...
-
-    @property
-    def rid(self) -> str | None: ...
-
-    @rid.setter
-    def rid(self, arg: str, /) -> None: ...
-
-    @property
-    def base_width(self) -> int: ...
-
-    @base_width.setter
-    def base_width(self, arg: int, /) -> None: ...
-
-    @property
-    def base_height(self) -> int: ...
-
-    @base_height.setter
-    def base_height(self, arg: int, /) -> None: ...
-
-    def width(self) -> int: ...
-
-    def height(self) -> int: ...
-
-class EncodedImage:
-    def __init__(self) -> None: ...
-
-    @property
-    def data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')]: ...
-
-    @data.setter
-    def data(self, arg: Annotated[ArrayLike, dict(dtype='uint8', shape=(None), order='C')], /) -> None: ...
-
-    @property
-    def timestamp(self) -> datetime.timedelta: ...
-
-    @timestamp.setter
-    def timestamp(self, arg: datetime.timedelta | float, /) -> None: ...
-
-    @property
-    def rid(self) -> str | None: ...
-
-    @rid.setter
-    def rid(self, arg: str, /) -> None: ...
-
-class VideoEncoder:
-    def init(self, arg: VideoEncoder.Settings, /) -> bool: ...
-
-    def release(self) -> None: ...
-
-    def encode(self, arg: VideoFrame, /) -> None: ...
-
-    def force_intra_next_frame(self) -> None: ...
-
-    def set_on_encoded(self, arg: Callable[[EncodedImage], None], /) -> None: ...
-
-    class Settings:
-        def __init__(self) -> None: ...
-
-        @property
-        def codec_type(self) -> VideoCodecType: ...
-
-        @codec_type.setter
-        def codec_type(self, arg: VideoCodecType, /) -> None: ...
-
-        @property
-        def width(self) -> int: ...
-
-        @width.setter
-        def width(self, arg: int, /) -> None: ...
-
-        @property
-        def height(self) -> int: ...
-
-        @height.setter
-        def height(self, arg: int, /) -> None: ...
-
-        @property
-        def bitrate(self) -> int: ...
-
-        @bitrate.setter
-        def bitrate(self, arg: int, /) -> None: ...
-
-def create_openh264_video_encoder(openh264: str) -> VideoEncoder: ...
-
-def create_videotoolbox_video_encoder() -> VideoEncoder: ...

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8/src/libdatachannel_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libdatachannel-py
-Version: 2025.1.0.dev6
+Version: 2025.1.0.dev8
 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.dev6 → libdatachannel_py-2025.1.0.dev8}/src/libdatachannel_py.egg-info/SOURCES.txt

@@ -15,11 +15,13 @@ src/libdatachannel_py.egg-info/PKG-INFO
 src/libdatachannel_py.egg-info/SOURCES.txt
 src/libdatachannel_py.egg-info/dependency_links.txt
 src/libdatachannel_py.egg-info/top_level.txt
+tests/test_audio_codec.py
 tests/test_candidate.py
 tests/test_configuration.py
 tests/test_description.py
 tests/test_frameinfo.py
 tests/test_h265nalunit.py
+tests/test_libyuv.py
 tests/test_mediahandler.py
 tests/test_message.py
 tests/test_nalunit.py

libdatachannel_py-2025.1.0.dev8/tests/test_audio_codec.py

@@ -0,0 +1,72 @@
+from datetime import timedelta
+
+import numpy as np
+
+from libdatachannel.codec import (
+    AudioCodecType,
+    AudioEncoder,
+    AudioFrame,
+    EncodedAudio,
+    create_opus_audio_encoder,
+)
+
+
+def test_audio_encoder_encode():
+    encoder = create_opus_audio_encoder()
+
+    settings = AudioEncoder.Settings()
+    settings.codec_type = AudioCodecType.OPUS
+    settings.sample_rate = 48000
+    settings.channels = 2
+    settings.bitrate = 64000
+    settings.frame_duration_ms = 20
+
+    assert encoder.init(settings) is True
+
+    callback_timestamps = []
+
+    def on_encoded(encoded: EncodedAudio):
+        assert isinstance(encoded.data, np.ndarray)
+        callback_timestamps.append(encoded.timestamp)
+
+    encoder.set_on_encode(on_encoded)
+
+    frame = AudioFrame()
+    frame.sample_rate = 48000
+    frame.timestamp = timedelta(milliseconds=1000)
+    # 48000 Hz * 20 ms = 960 samples
+    frame.pcm = np.zeros((960, 2), dtype=np.float32)
+
+    encoder.encode(frame)
+
+    assert callback_timestamps == [timedelta(milliseconds=1000)]
+
+    # 10ms → 20ms でエンコード
+    frame = AudioFrame()
+    frame.sample_rate = 48000
+    frame.timestamp = timedelta(milliseconds=1000)
+    frame.pcm = np.zeros((480, 2), dtype=np.float32)
+
+    encoder.encode(frame)
+
+    frame.timestamp = timedelta(milliseconds=1100)  # わざと大きくずらす
+    frame.pcm = np.zeros((960, 2), dtype=np.float32)
+
+    encoder.encode(frame)
+
+    # 既存のフレームが 10ms あって、1100 だったので 1100 - 10 の 1090 になるはず
+    assert callback_timestamps == [timedelta(milliseconds=1000), timedelta(milliseconds=1090)]
+
+    # 10ms のデータを渡すと追加でエンコードされるはず
+    frame.timestamp = timedelta(milliseconds=1120)
+    frame.pcm = np.zeros((480, 2), dtype=np.float32)
+
+    encoder.encode(frame)
+
+    assert callback_timestamps == [
+        timedelta(milliseconds=1000),
+        timedelta(milliseconds=1090),
+        timedelta(milliseconds=1110),
+    ]
+
+    encoder.release()

libdatachannel_py-2025.1.0.dev8/tests/test_libyuv.py

@@ -0,0 +1,200 @@
+import numpy as np
+
+from libdatachannel.codec import VideoFrameBufferBGR888, VideoFrameBufferI420, VideoFrameBufferNV12
+from libdatachannel.libyuv import (
+    FilterMode,
+    FourCC,
+    RotationMode,
+    convert_to_i420,
+    i420_scale,
+    i420_to_nv12,
+    i420_to_rgb24,
+    nv12_scale,
+    nv12_to_i420,
+    rgb24_to_i420,
+)
+
+
+def test_libyuv_nv12_scale():
+    src_width, src_height = 640, 480
+    src = VideoFrameBufferNV12.create(src_width, src_height)
+    # type: ignore しないと型エラーになる
+    # 参考: https://github.com/wjakob/nanobind/pull/442
+    src.y[:, :] = 42  # type: ignore
+
+    dst_width, dst_height = 320, 240
+    dst = VideoFrameBufferNV12.create(dst_width, dst_height)
+    r = nv12_scale(
+        src.y,
+        src.uv,
+        src.stride_y(),
+        src.stride_uv(),
+        src.width(),
+        src.height(),
+        dst.y,
+        dst.uv,
+        dst.stride_y(),
+        dst.stride_uv(),
+        dst.width(),
+        dst.height(),
+        FilterMode.NONE,
+    )
+
+    assert r == 0
+    assert np.all(dst.y == 42)
+
+
+def test_libyuv_i420_scale():
+    src_width, src_height = 640, 480
+    src = VideoFrameBufferI420.create(src_width, src_height)
+    src.y[:, :] = 42  # type: ignore
+
+    dst_width, dst_height = 320, 240
+    dst = VideoFrameBufferI420.create(dst_width, dst_height)
+    r = i420_scale(
+        src.y,
+        src.u,
+        src.v,
+        src.stride_y(),
+        src.stride_u(),
+        src.stride_v(),
+        src.width(),
+        src.height(),
+        dst.y,
+        dst.u,
+        dst.v,
+        dst.stride_y(),
+        dst.stride_u(),
+        dst.stride_v(),
+        dst.width(),
+        dst.height(),
+        FilterMode.NONE,
+    )
+    assert r == 0
+    assert np.all(dst.y == 42)
+
+
+def test_libyuv_convert_to_i420():
+    nv12 = np.full((640, 480 + 480 // 2), 42, dtype=np.uint8)
+
+    dst = VideoFrameBufferI420.create(640, 480)
+    r = convert_to_i420(
+        nv12,
+        nv12.size,
+        dst.y,
+        dst.stride_y(),
+        dst.u,
+        dst.stride_u(),
+        dst.v,
+        dst.stride_v(),
+        0,
+        0,
+        640,
+        480,
+        640,
+        480,
+        RotationMode.Rotate0,
+        FourCC.NV12,
+    )
+    assert r == 0
+    assert np.all(dst.y == 42)
+
+
+def test_libyuv_nv12_to_i420():
+    src = VideoFrameBufferNV12.create(640, 480)
+    src.y[:, :] = 42  # type: ignore
+    src.uv[:, :] = 128  # type: ignore
+
+    dst = VideoFrameBufferI420.create(640, 480)
+    r = nv12_to_i420(
+        src.y,
+        src.uv,
+        src.stride_y(),
+        src.stride_uv(),
+        dst.y,
+        dst.u,
+        dst.v,
+        dst.stride_y(),
+        dst.stride_u(),
+        dst.stride_v(),
+        src.width(),
+        src.height(),
+    )
+
+    assert r == 0
+    assert np.all(dst.y == 42)
+    assert np.all(dst.u == 128)
+    assert np.all(dst.v == 128)
+
+
+def test_libyuv_i420_to_nv12():
+    src = VideoFrameBufferI420.create(640, 480)
+    src.y[:, :] = 42  # type: ignore
+    src.u[:, :] = 128  # type: ignore
+    src.v[:, :] = 128  # type: ignore
+
+    dst = VideoFrameBufferNV12.create(640, 480)
+    r = i420_to_nv12(
+        src.y,
+        src.u,
+        src.v,
+        src.stride_y(),
+        src.stride_u(),
+        src.stride_v(),
+        dst.y,
+        dst.uv,
+        dst.stride_y(),
+        dst.stride_uv(),
+        src.width(),
+        src.height(),
+    )
+
+    assert r == 0
+    assert np.all(dst.y == 42)
+    assert np.all(dst.uv == 128)
+
+
+def test_libyuv_rgb24_to_i420():
+    src = VideoFrameBufferBGR888.create(640, 480)
+    src.bgr[:, :, :] = 42  # type: ignore
+
+    dst = VideoFrameBufferI420.create(640, 480)
+    r = rgb24_to_i420(
+        src.bgr,
+        src.stride(),
+        dst.y,
+        dst.u,
+        dst.v,
+        dst.stride_y(),
+        dst.stride_u(),
+        dst.stride_v(),
+        src.width(),
+        src.height(),
+    )
+
+    assert r == 0
+    assert np.all(dst.y == 52)
+
+
+def test_libyuv_i420_to_rgb24():
+    src = VideoFrameBufferI420.create(640, 480)
+    src.y[:, :] = 42  # type: ignore
+    src.u[:, :] = 128  # type: ignore
+    src.v[:, :] = 128  # type: ignore
+
+    dst = VideoFrameBufferBGR888.create(640, 480)
+    r = i420_to_rgb24(
+        src.y,
+        src.u,
+        src.v,
+        src.stride_y(),
+        src.stride_u(),
+        src.stride_v(),
+        dst.bgr,
+        dst.stride(),
+        src.width(),
+        src.height(),
+    )
+
+    assert r == 0
+    assert np.all(dst.bgr == np.array([30, 30, 30], dtype=np.uint8))

{libdatachannel_py-2025.1.0.dev6 → libdatachannel_py-2025.1.0.dev8}/tests/test_video_codec.py

@@ -5,7 +5,7 @@ from datetime import timedelta
 import numpy as np
 import pytest
 
-from libdatachannel import (
+from libdatachannel.codec import (
     EncodedImage,
     ImageFormat,
     VideoCodecType,
@@ -14,6 +14,7 @@ from libdatachannel import (
     VideoFrameBufferBGR888,
     VideoFrameBufferI420,
     VideoFrameBufferNV12,
+    create_aom_video_encoder,
     create_openh264_video_encoder,
     create_videotoolbox_video_encoder,
 )
@@ -120,19 +121,19 @@ def test_openh264():
     frame.base_height = 480
     frame.timestamp = timedelta(microseconds=1234567)
 
-    on_encoded_called = False
+    on_encode_called = False
 
-    def on_encoded(encoded_image):
-        nonlocal on_encoded_called
+    def on_encode(encoded_image):
+        nonlocal on_encode_called
         assert encoded_image.data.size > 0
         assert encoded_image.timestamp == frame.timestamp
         assert encoded_image.rid == frame.rid
-        on_encoded_called = True
+        on_encode_called = True
 
-    encoder.set_on_encoded(on_encoded)
+    encoder.set_on_encode(on_encode)
     encoder.encode(frame)
     encoder.release()
-    assert on_encoded_called
+    assert on_encode_called
 
 
 @pytest.mark.skipif(
@@ -154,17 +155,48 @@ def test_videotoolbox():
     frame.base_height = 480
     frame.timestamp = timedelta(microseconds=1234567)
 
-    on_encoded_called = False
+    on_encode_called = False
 
-    def on_encoded(encoded_image):
-        nonlocal on_encoded_called
+    def on_encode(encoded_image):
+        nonlocal on_encode_called
         assert encoded_image.data.size > 0
         assert encoded_image.timestamp == frame.timestamp
         assert encoded_image.rid == frame.rid
-        on_encoded_called = True
+        on_encode_called = True
 
-    encoder.set_on_encoded(on_encoded)
+    encoder.set_on_encode(on_encode)
     encoder.encode(frame)
     time.sleep(1)
     encoder.release()
-    assert on_encoded_called
+    assert on_encode_called
+
+
+def test_aom():
+    encoder = create_aom_video_encoder()
+    settings = VideoEncoder.Settings()
+    settings.codec_type = VideoCodecType.H264
+    settings.width = 640
+    settings.height = 480
+    settings.bitrate = 1000000
+    success = encoder.init(settings)
+    assert success
+    frame = VideoFrame()
+    frame.i420_buffer = VideoFrameBufferI420.create(640, 360)
+    frame.format = ImageFormat.I420
+    frame.base_width = 640
+    frame.base_height = 480
+    frame.timestamp = timedelta(microseconds=1234567)
+
+    on_encode_called = False
+
+    def on_encode(encoded_image):
+        nonlocal on_encode_called
+        assert encoded_image.data.size > 0
+        assert encoded_image.timestamp == frame.timestamp
+        assert encoded_image.rid == frame.rid
+        on_encode_called = True
+
+    encoder.set_on_encode(on_encode)
+    encoder.encode(frame)
+    encoder.release()
+    assert on_encode_called

libdatachannel_py-2025.1.0.dev6/VERSION

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