refactor: 清理死代码和优化日志级别

- 删除未使用的函数和常量 - create_public_key_message (rustdesk/connection) - decode_audio_packet, AudioPacketHeader (web/audio_ws) - io_error_to_hid_error, close_device, close_all_devices (hid) - shutdown_rx (rustdesk/mod) - CONNECT_TIMEOUT_MS, RESP_ERR_SEND_FAILED - 调整日志级别 - Session lagged: warn -> debug - 移除 H264 NAL trace 日志 - 移除 Frame distribution lagged trace 日志 - 移除 absolute mouse report trace 日志 - 优化 broadcast channel 缓冲区大小 8 -> 16 - 修复条件编译 - static_files.rs: 添加 debug_assertions 条件
2026-01-28 16:41:52 +08:00 · 2026-01-02 01:48:44 +08:00
parent 13516d5cbd
commit 0fc5be21c6
22 changed files with 255 additions and 141 deletions
--- a/build/cross/Dockerfile.aarch64
+++ b/build/cross/Dockerfile.aarch64
@@ -3,6 +3,10 @@

 FROM debian:12

+# Set Rustup mirrors (Aliyun)
+ENV RUSTUP_UPDATE_ROOT=https://mirrors.aliyun.com/rustup/rustup \
+    RUSTUP_DIST_SERVER=https://mirrors.aliyun.com/rustup
+
 # Install Rust toolchain
 RUN apt-get update && apt-get install -y --no-install-recommends \
    curl \
@@ -24,24 +28,25 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    git \
    libclang-dev \
    llvm \
+    protobuf-compiler \
+    mold \
+    meson \
+    ninja-build \
+    wget \
    gcc-aarch64-linux-gnu \
    g++-aarch64-linux-gnu \
    libc6-dev-arm64-cross \
    && rm -rf /var/lib/apt/lists/*

-# Install ARM64 development libraries
+# Install ARM64 development libraries (without system ffmpeg)
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    libssl-dev:arm64 \
    libasound2-dev:arm64 \
    libv4l-dev:arm64 \
    libudev-dev:arm64 \
    zlib1g-dev:arm64 \
    libjpeg62-turbo-dev:arm64 \
    libyuv-dev:arm64 \
-    libavcodec-dev:arm64 \
-    libavformat-dev:arm64 \
-    libavutil-dev:arm64 \
-    libswscale-dev:arm64 \
-    libswresample-dev:arm64 \
    libx264-dev:arm64 \
    libx265-dev:arm64 \
    libvpx-dev:arm64 \
@@ -54,13 +59,106 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    libxdmcp-dev:arm64 \
    && rm -rf /var/lib/apt/lists/*

+# Download and build FFmpeg with RKMPP support
+RUN mkdir -p /tmp/ffmpeg-build && cd /tmp/ffmpeg-build \
+    && wget -q https://files.mofeng.run/src/image/other/ffmpeg.tar.gz \
+    && tar -xzf ffmpeg.tar.gz \
+    && cd ffmpeg \
+    # Build RKMPP
+    && mkdir -p rkmpp/build && cd rkmpp/build \
+    && cmake .. \
+        -DCMAKE_SYSTEM_NAME=Linux \
+        -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
+        -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \
+        -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \
+        -DCMAKE_INSTALL_PREFIX=/usr/aarch64-linux-gnu \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_TEST=OFF \
+    && make -j$(nproc) \
+    && make install \
+    && cd ../.. \
+    # Build RKRGA - create cross file for meson
+    && echo '[binaries]' > /tmp/aarch64-cross.txt \
+    && echo "c = 'aarch64-linux-gnu-gcc'" >> /tmp/aarch64-cross.txt \
+    && echo "cpp = 'aarch64-linux-gnu-g++'" >> /tmp/aarch64-cross.txt \
+    && echo "ar = 'aarch64-linux-gnu-ar'" >> /tmp/aarch64-cross.txt \
+    && echo "strip = 'aarch64-linux-gnu-strip'" >> /tmp/aarch64-cross.txt \
+    && echo "pkgconfig = 'pkg-config'" >> /tmp/aarch64-cross.txt \
+    && echo '[host_machine]' >> /tmp/aarch64-cross.txt \
+    && echo "system = 'linux'" >> /tmp/aarch64-cross.txt \
+    && echo "cpu_family = 'aarch64'" >> /tmp/aarch64-cross.txt \
+    && echo "cpu = 'aarch64'" >> /tmp/aarch64-cross.txt \
+    && echo "endian = 'little'" >> /tmp/aarch64-cross.txt \
+    && cd rkrga \
+    && meson setup build --prefix=/usr/aarch64-linux-gnu --libdir=lib \
+        --cross-file=/tmp/aarch64-cross.txt \
+        --buildtype=release \
+        -Dcpp_args=-fpermissive \
+        -Dlibdrm=false \
+        -Dlibrga_demo=false \
+    && ninja -C build \
+    && ninja -C build install \
+    && cd .. \
+    # Create pkg-config wrapper for cross-compilation
+    && echo '#!/bin/sh' > /tmp/aarch64-pkg-config \
+    && echo 'export PKG_CONFIG_LIBDIR=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig' >> /tmp/aarch64-pkg-config \
+    && echo 'export PKG_CONFIG_PATH=""' >> /tmp/aarch64-pkg-config \
+    && echo 'export PKG_CONFIG_SYSROOT_DIR=""' >> /tmp/aarch64-pkg-config \
+    && echo 'exec pkg-config "$@"' >> /tmp/aarch64-pkg-config \
+    && chmod +x /tmp/aarch64-pkg-config \
+    # Build FFmpeg with RKMPP
+    && cd ffmpeg-rockchip \
+    && ./configure \
+        --prefix=/usr/aarch64-linux-gnu \
+        --cross-prefix=aarch64-linux-gnu- \
+        --arch=aarch64 \
+        --target-os=linux \
+        --enable-cross-compile \
+        --pkg-config=/tmp/aarch64-pkg-config \
+        --enable-gpl \
+        --enable-version3 \
+        --enable-shared \
+        --disable-static \
+        --enable-libdrm \
+        --enable-rkmpp \
+        --enable-rkrga \
+        --enable-libv4l2 \
+        --enable-libx264 \
+        --enable-libx265 \
+        --enable-libvpx \
+        --enable-vaapi \
+        --enable-v4l2-m2m \
+        --disable-programs \
+        --disable-doc \
+        --disable-htmlpages \
+        --disable-manpages \
+        --disable-podpages \
+        --disable-txtpages \
+        --disable-network \
+        --disable-protocols \
+        --disable-debug \
+        --disable-decoder=mjpeg \
+        --disable-decoder=mjpegb \
+    && make -j$(nproc) \
+    && make install \
+    && cd / \
+    && rm -rf /tmp/ffmpeg-build /tmp/aarch64-cross.txt /tmp/aarch64-pkg-config
+
 # Add Rust target
 RUN rustup target add aarch64-unknown-linux-gnu

+# Create symlink for mold to work with cross-compiler
+RUN ln -s /usr/bin/mold /usr/bin/aarch64-linux-gnu-ld.mold
+
 # Configure environment for cross-compilation
+# Use PKG_CONFIG_LIBDIR to completely replace default search paths
+# This ensures we use our custom-built FFmpeg instead of system FFmpeg
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
    CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
    CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
    AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar \
-    PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig \
-    PKG_CONFIG_ALLOW_CROSS=1
+    PKG_CONFIG_LIBDIR=/usr/aarch64-linux-gnu/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig \
+    PKG_CONFIG_PATH="" \
+    PKG_CONFIG_ALLOW_CROSS=1 \
+    RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -C link-arg=-fuse-ld=mold"
--- a/build/cross/Dockerfile.armv7
+++ b/build/cross/Dockerfile.armv7
@@ -3,6 +3,10 @@

 FROM debian:12

+# Set Rustup mirrors (Aliyun)
+ENV RUSTUP_UPDATE_ROOT=https://mirrors.aliyun.com/rustup/rustup \
+    RUSTUP_DIST_SERVER=https://mirrors.aliyun.com/rustup
+
 # Install Rust toolchain
 RUN apt-get update && apt-get install -y --no-install-recommends \
    curl \
@@ -24,24 +28,25 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    git \
    libclang-dev \
    llvm \
+    protobuf-compiler \
+    mold \
+    meson \
+    ninja-build \
+    wget \
    gcc-arm-linux-gnueabihf \
    g++-arm-linux-gnueabihf \
    libc6-dev-armhf-cross \
    && rm -rf /var/lib/apt/lists/*

-# Install ARMv7 development libraries
+# Install ARMv7 development libraries (without system ffmpeg)
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    libssl-dev:armhf \
    libasound2-dev:armhf \
    libv4l-dev:armhf \
    libudev-dev:armhf \
    zlib1g-dev:armhf \
    libjpeg62-turbo-dev:armhf \
    libyuv-dev:armhf \
-    libavcodec-dev:armhf \
-    libavformat-dev:armhf \
-    libavutil-dev:armhf \
-    libswscale-dev:armhf \
-    libswresample-dev:armhf \
    libx264-dev:armhf \
    libx265-dev:armhf \
    libvpx-dev:armhf \
@@ -54,13 +59,106 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    libxdmcp-dev:armhf \
    && rm -rf /var/lib/apt/lists/*

+# Download and build FFmpeg with RKMPP support
+RUN mkdir -p /tmp/ffmpeg-build && cd /tmp/ffmpeg-build \
+    && wget -q https://files.mofeng.run/src/image/other/ffmpeg.tar.gz \
+    && tar -xzf ffmpeg.tar.gz \
+    && cd ffmpeg \
+    # Build RKMPP
+    && mkdir -p rkmpp/build && cd rkmpp/build \
+    && cmake .. \
+        -DCMAKE_SYSTEM_NAME=Linux \
+        -DCMAKE_SYSTEM_PROCESSOR=arm \
+        -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc \
+        -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ \
+        -DCMAKE_INSTALL_PREFIX=/usr/arm-linux-gnueabihf \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_SHARED_LIBS=ON \
+        -DBUILD_TEST=OFF \
+    && make -j$(nproc) \
+    && make install \
+    && cd ../.. \
+    # Build RKRGA - create cross file for meson
+    && echo '[binaries]' > /tmp/armhf-cross.txt \
+    && echo "c = 'arm-linux-gnueabihf-gcc'" >> /tmp/armhf-cross.txt \
+    && echo "cpp = 'arm-linux-gnueabihf-g++'" >> /tmp/armhf-cross.txt \
+    && echo "ar = 'arm-linux-gnueabihf-ar'" >> /tmp/armhf-cross.txt \
+    && echo "strip = 'arm-linux-gnueabihf-strip'" >> /tmp/armhf-cross.txt \
+    && echo "pkgconfig = 'pkg-config'" >> /tmp/armhf-cross.txt \
+    && echo '[host_machine]' >> /tmp/armhf-cross.txt \
+    && echo "system = 'linux'" >> /tmp/armhf-cross.txt \
+    && echo "cpu_family = 'arm'" >> /tmp/armhf-cross.txt \
+    && echo "cpu = 'armv7'" >> /tmp/armhf-cross.txt \
+    && echo "endian = 'little'" >> /tmp/armhf-cross.txt \
+    && cd rkrga \
+    && meson setup build --prefix=/usr/arm-linux-gnueabihf --libdir=lib \
+        --cross-file=/tmp/armhf-cross.txt \
+        --buildtype=release \
+        -Dcpp_args=-fpermissive \
+        -Dlibdrm=false \
+        -Dlibrga_demo=false \
+    && ninja -C build \
+    && ninja -C build install \
+    && cd .. \
+    # Create pkg-config wrapper for cross-compilation
+    && echo '#!/bin/sh' > /tmp/armhf-pkg-config \
+    && echo 'export PKG_CONFIG_LIBDIR=/usr/arm-linux-gnueabihf/lib/pkgconfig:/usr/lib/arm-linux-gnueabihf/pkgconfig' >> /tmp/armhf-pkg-config \
+    && echo 'export PKG_CONFIG_PATH=""' >> /tmp/armhf-pkg-config \
+    && echo 'export PKG_CONFIG_SYSROOT_DIR=""' >> /tmp/armhf-pkg-config \
+    && echo 'exec pkg-config "$@"' >> /tmp/armhf-pkg-config \
+    && chmod +x /tmp/armhf-pkg-config \
+    # Build FFmpeg with RKMPP
+    && cd ffmpeg-rockchip \
+    && ./configure \
+        --prefix=/usr/arm-linux-gnueabihf \
+        --cross-prefix=arm-linux-gnueabihf- \
+        --arch=arm \
+        --target-os=linux \
+        --enable-cross-compile \
+        --pkg-config=/tmp/armhf-pkg-config \
+        --enable-gpl \
+        --enable-version3 \
+        --enable-shared \
+        --disable-static \
+        --enable-libdrm \
+        --enable-rkmpp \
+        --enable-rkrga \
+        --enable-libv4l2 \
+        --enable-libx264 \
+        --enable-libx265 \
+        --enable-libvpx \
+        --enable-vaapi \
+        --enable-v4l2-m2m \
+        --disable-programs \
+        --disable-doc \
+        --disable-htmlpages \
+        --disable-manpages \
+        --disable-podpages \
+        --disable-txtpages \
+        --disable-network \
+        --disable-protocols \
+        --disable-debug \
+        --disable-decoder=mjpeg \
+        --disable-decoder=mjpegb \
+    && make -j$(nproc) \
+    && make install \
+    && cd / \
+    && rm -rf /tmp/ffmpeg-build /tmp/armhf-cross.txt /tmp/armhf-pkg-config
+
 # Add Rust target
 RUN rustup target add armv7-unknown-linux-gnueabihf

+# Create symlink for mold to work with cross-compiler
+RUN ln -s /usr/bin/mold /usr/bin/arm-linux-gnueabihf-ld.mold
+
 # Configure environment for cross-compilation
+# Use PKG_CONFIG_LIBDIR to completely replace default search paths
+# This ensures we use our custom-built FFmpeg instead of system FFmpeg
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
    CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc \
    CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ \
    AR_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar \
-    PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig \
-    PKG_CONFIG_ALLOW_CROSS=1
+    PKG_CONFIG_LIBDIR=/usr/arm-linux-gnueabihf/lib/pkgconfig:/usr/lib/arm-linux-gnueabihf/pkgconfig \
+    PKG_CONFIG_PATH="" \
+    PKG_CONFIG_ALLOW_CROSS=1 \
+    RUSTFLAGS="-C linker=arm-linux-gnueabihf-gcc -C link-arg=-fuse-ld=mold"
--- a/build/cross/Dockerfile.x86_64
+++ b/build/cross/Dockerfile.x86_64
@@ -3,6 +3,10 @@

 FROM debian:12

+# Set Rustup mirrors (Aliyun)
+ENV RUSTUP_UPDATE_ROOT=https://mirrors.aliyun.com/rustup/rustup \
+    RUSTUP_DIST_SERVER=https://mirrors.aliyun.com/rustup
+
 # Install Rust toolchain
 RUN apt-get update && apt-get install -y --no-install-recommends \
    curl \
@@ -22,6 +26,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    git \
    libclang-dev \
    llvm \
+    protobuf-compiler \
+    libssl-dev \
+    mold \
    # Core system libraries
    libasound2-dev \
    libv4l-dev \
@@ -55,3 +62,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

 # Add Rust target
 RUN rustup target add x86_64-unknown-linux-gnu
+
+# Configure mold as the linker
+ENV RUSTFLAGS="-C link-arg=-fuse-ld=mold"