trainingsample 0.2.9__tar.gz → 0.2.11__tar.gz

{trainingsample-0.2.9 → trainingsample-0.2.11}/.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-codecs-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
+        key: opencv-static-4.12.0-codecs-jasper-ffmpeg-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
 
     - name: Install build dependencies
       run: |
@@ -51,7 +51,7 @@ jobs:
 
         sudo apt-get update
         # Install basic LLVM for opencv-rust bindings codegen
-        sudo apt-get install -y clang libclang-dev llvm-dev cmake curl wget software-properties-common
+        sudo apt-get install -y clang libclang-dev llvm-dev cmake curl wget software-properties-common nasm yasm pkg-config
 
         # For Ubuntu 22.04, use the default LLVM 14 instead of PPA to avoid restart issues
         if [ "${{ matrix.os }}" = "ubuntu-22.04" ]; then
@@ -84,7 +84,6 @@ jobs:
         echo "LLVM config at: $(which llvm-config-14 2>/dev/null || which llvm-config-18 2>/dev/null)"
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -105,7 +104,7 @@ jobs:
         # OpenCV static linking configuration
         OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
         OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
-        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=stdc++
+        OPENCV_LINK_LIBS: static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,static=stdc++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
 
     - name: Upload wheels
@@ -131,19 +130,18 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-codecs-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
+        key: opencv-static-4.12.0-codecs-jasper-ffmpeg-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
 
     - name: Install build dependencies
       run: |
         # Install LLVM for opencv-rust bindings codegen (no need for system OpenCV anymore)
-        brew install llvm cmake
+        brew install llvm cmake nasm pkg-config
         # Set up LLVM environment for opencv-rust bindings (keg-only installation)
         echo "LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib" >> $GITHUB_ENV
         echo "LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config" >> $GITHUB_ENV
         echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -159,7 +157,7 @@ jobs:
         # OpenCV static linking configuration
         OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
         OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
-        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,framework=Accelerate,dylib=c++
+        OPENCV_LINK_LIBS: static=opencv_world,static=avformat,static=avcodec,static=avfilter,static=swresample,static=swscale,static=avutil,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,framework=Accelerate,dylib=c++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
     - name: Upload wheels
       uses: actions/upload-artifact@v4

{trainingsample-0.2.9 → trainingsample-0.2.11}/Cargo.lock

@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.9"
+version = "0.2.11"
 dependencies = [
  "anyhow",
  "criterion",

{trainingsample-0.2.9 → trainingsample-0.2.11}/Cargo.toml

@@ -38,7 +38,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 edition = "2021"
 license = "MIT"
 name = "trainingsample"
-version = "0.2.9"
+version = "0.2.11"
 readme = "README.md"
 
 [profile.release]

{trainingsample-0.2.9 → trainingsample-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainingsample
-Version: 0.2.9
+Version: 0.2.11
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{trainingsample-0.2.9 → trainingsample-0.2.11}/pyproject.toml

@@ -14,7 +14,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 license = {text = "MIT"}
 name = "trainingsample"
 requires-python = ">=3.11"
-version = "0.2.9"
+version = "0.2.11"
 
 [project.optional-dependencies]
 dev = ["pytest>=6.0", "pytest-benchmark", "maturin>=1.0,<2.0", "pre-commit"]

{trainingsample-0.2.9 → trainingsample-0.2.11}/scripts/build-opencv-static.sh

@@ -5,12 +5,18 @@ set -euo pipefail
 # This eliminates the need for users to install OpenCV system packages
 
 OPENCV_VERSION="4.12.0"
+FFMPEG_VERSION="6.1.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 BUILD_DIR="${PROJECT_ROOT}/opencv-build-tmp"
 INSTALL_DIR="${PROJECT_ROOT}/third_party/opencv-static"
 SIGNATURE_FILE="${INSTALL_DIR}/build_signature.txt"
-BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-no-itt-no-openjpeg"
+BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-jasper-ffmpeg-no-itt-no-openjpeg"
+
+FFMPEG_BUILD_DIR="${PROJECT_ROOT}/ffmpeg-build-tmp"
+FFMPEG_INSTALL_DIR="${PROJECT_ROOT}/third_party/ffmpeg-static"
+FFMPEG_SIGNATURE_FILE="${FFMPEG_INSTALL_DIR}/build_signature.txt"
+FFMPEG_BUILD_SIGNATURE="ffmpeg-${FFMPEG_VERSION}-static-core"
 
 echo "Building static OpenCV ${OPENCV_VERSION}..."
 echo "Install directory: ${INSTALL_DIR}"
@@ -26,7 +32,96 @@ if [ -d "${INSTALL_DIR}/lib" ] && [ -f "${INSTALL_DIR}/lib/libopencv_world.a" ]
     rm -rf "${INSTALL_DIR}"
 fi
 
-# Create build directory
+# Build FFmpeg static libraries (minimal feature set for decoding common formats)
+build_ffmpeg() {
+    echo "Ensuring static FFmpeg ${FFMPEG_VERSION} is available..."
+    if [ -d "${FFMPEG_INSTALL_DIR}/lib" ] && [ -f "${FFMPEG_INSTALL_DIR}/lib/libavformat.a" ] && [ -f "${FFMPEG_SIGNATURE_FILE}" ]; then
+        if grep -qx "${FFMPEG_BUILD_SIGNATURE}" "${FFMPEG_SIGNATURE_FILE}"; then
+            echo "Static FFmpeg already built at ${FFMPEG_INSTALL_DIR} (signature match)"
+            return
+        fi
+
+        echo "Existing FFmpeg bundle does not match desired configuration. Rebuilding..."
+        rm -rf "${FFMPEG_INSTALL_DIR}"
+    fi
+
+    mkdir -p "${FFMPEG_BUILD_DIR}"
+    cd "${FFMPEG_BUILD_DIR}"
+
+    if [ ! -d "ffmpeg-${FFMPEG_VERSION}" ]; then
+        echo "Downloading FFmpeg ${FFMPEG_VERSION}..."
+        curl -L "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2" \
+            -o "ffmpeg-${FFMPEG_VERSION}.tar.bz2"
+        tar -xjf "ffmpeg-${FFMPEG_VERSION}.tar.bz2"
+    fi
+
+    cd "ffmpeg-${FFMPEG_VERSION}"
+
+    echo "Configuring FFmpeg build..."
+    PKG_CONFIG_PATH="${FFMPEG_INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
+    export PKG_CONFIG_PATH
+
+    ./configure \
+        --prefix="${FFMPEG_INSTALL_DIR}" \
+        --pkg-config-flags="--static" \
+        --extra-cflags="-fPIC" \
+        --extra-cxxflags="-fPIC" \
+        --extra-ldflags="-fPIC" \
+        --enable-static \
+        --disable-shared \
+        --disable-doc \
+        --disable-debug \
+        --disable-autodetect \
+        --disable-hwaccels \
+        --disable-vulkan \
+        --disable-cuvid \
+        --disable-nvenc \
+        --disable-nvdec \
+        --disable-vaapi \
+        --disable-vdpau \
+        --disable-d3d11va \
+        --disable-dxva2 \
+        --disable-alsa \
+        --disable-sdl2 \
+        --disable-libxcb \
+        --disable-iconv \
+        --disable-libdrm \
+        --disable-network \
+        --disable-avdevice \
+        --disable-postproc \
+        --disable-programs \
+        --enable-swscale \
+        --enable-swresample \
+        --enable-avcodec \
+        --enable-avformat \
+        --enable-avutil \
+        --enable-decoder=h264,hevc,mpeg4,vp8,vp9 \
+        --enable-parser=h264,hevc,mpeg4video,vp8,vp9 \
+        --enable-demuxer=mov,matroska,ogg,webm,image2 \
+        --enable-muxer=null \
+        --enable-protocol=file,data,pipe \
+        --enable-bsf=h264_mp4toannexb \
+        --enable-filter=scale || {
+            echo "FFmpeg configure failed"
+            exit 1
+        }
+
+    echo "Building FFmpeg..."
+    make -j"$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)"
+    echo "Installing FFmpeg..."
+    make install
+
+    printf '%s\n' "${FFMPEG_BUILD_SIGNATURE}" > "${FFMPEG_SIGNATURE_FILE}"
+
+    cd "${PROJECT_ROOT}"
+    rm -rf "${FFMPEG_BUILD_DIR}"
+    echo "FFmpeg build complete!"
+}
+
+# Ensure FFmpeg is present before building OpenCV
+build_ffmpeg
+
+# Create build directory for OpenCV
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
@@ -40,6 +135,7 @@ fi
 
 # Configure CMake build
 echo "Configuring CMake build..."
+export PKG_CONFIG_PATH="${FFMPEG_INSTALL_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
 cmake -S "opencv-${OPENCV_VERSION}" \
       -B build \
       -DCMAKE_BUILD_TYPE=Release \
@@ -52,11 +148,13 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -DBUILD_TIFF=ON \
       -DBUILD_WEBP=ON \
       -DBUILD_ZLIB=ON \
+      -DBUILD_JASPER=ON \
       -DWITH_JPEG=ON \
       -DWITH_PNG=ON \
       -DWITH_TIFF=ON \
       -DWITH_WEBP=ON \
       -DWITH_ZLIB=ON \
+      -DWITH_JASPER=ON \
       -DBUILD_TESTS=OFF \
       -DBUILD_PERF_TESTS=OFF \
       -DBUILD_EXAMPLES=OFF \
@@ -66,7 +164,8 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -DWITH_OPENCL=OFF \
       -DWITH_CUDA=OFF \
       -DWITH_OPENJPEG=OFF \
-      -DWITH_FFMPEG=OFF \
+      -DWITH_FFMPEG=ON \
+      -DOPENCV_FFMPEG_USE_FIND_LIBS=ON \
       -DWITH_GSTREAMER=OFF \
       -DWITH_V4L=OFF \
       -DWITH_GTK=OFF \
@@ -94,6 +193,7 @@ declare -a CODEC_MAPPINGS=(
     "liblibtiff.a:libtiff.a"
     "liblibwebp.a:libwebp.a"
     "libzlib.a:libz.a"
+    "liblibjasper.a:libjasper.a"
 )
 
 for mapping in "${CODEC_MAPPINGS[@]}"; do
@@ -111,6 +211,26 @@ for mapping in "${CODEC_MAPPINGS[@]}"; do
     ln -sf "${CANONICAL_NAME}" "${INSTALL_DIR}/lib/${LINK_NAME}"
 done
 
+# Copy FFmpeg static archives
+declare -a FFMPEG_ARCHIVES=(
+    "libavcodec.a"
+    "libavfilter.a"
+    "libavformat.a"
+    "libavutil.a"
+    "libswresample.a"
+    "libswscale.a"
+)
+
+for archive in "${FFMPEG_ARCHIVES[@]}"; do
+    if [ ! -f "${FFMPEG_INSTALL_DIR}/lib/${archive}" ]; then
+        echo "ERROR: FFmpeg archive ${archive} not found in ${FFMPEG_INSTALL_DIR}/lib"
+        ls "${FFMPEG_INSTALL_DIR}/lib"
+        exit 1
+    fi
+
+    cp -f "${FFMPEG_INSTALL_DIR}/lib/${archive}" "${INSTALL_DIR}/lib/${archive}"
+done
+
 # Verify installation - check both lib and lib64 (manylinux uses lib64)
 if [ -d "${INSTALL_DIR}/lib64" ]; then
     # Move from lib64 to lib for consistency (copy to handle reruns safely)
@@ -133,6 +253,13 @@ REQUIRED_ARCHIVES=(
     "libtiff.a"
     "libwebp.a"
     "libz.a"
+    "libjasper.a"
+    "libavcodec.a"
+    "libavfilter.a"
+    "libavformat.a"
+    "libavutil.a"
+    "libswresample.a"
+    "libswscale.a"
 )
 
 for archive in "${REQUIRED_ARCHIVES[@]}"; do