From 1f521326c1f8a71e397b8f3a1aac13b42d253d44 Mon Sep 17 00:00:00 2001 From: kira1928 Date: Wed, 19 Jun 2024 07:55:48 +0000 Subject: [PATCH] enable network --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 3 ++- xlive/.gitignore | 3 +++ xlive/configure_script.sh | 6 +++--- xlive/dev_build.sh | 28 +++++++++++++++++++++------- 5 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 xlive/.gitignore diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index eb25cd01ace7a..33bee73a0406d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ && apt-get -y install git iproute2 procps lsb-release \ - && apt-get -y install nasm build-essential gdb \ + && apt-get -y install libx265-dev mingw-w64 nasm build-essential gdb \ && apt-get autoremove -y \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7db5429ce043e..4a2405b5f9d8e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,7 +8,8 @@ }, "extensions": [ "ms-vscode.cpptools-extension-pack", - "foxundermoon.shell-format" + "foxundermoon.shell-format", + "github.vscode-github-actions" ] } }, diff --git a/xlive/.gitignore b/xlive/.gitignore new file mode 100644 index 0000000000000..763e431195bc7 --- /dev/null +++ b/xlive/.gitignore @@ -0,0 +1,3 @@ +*.flv +*.mp4 +*.dat \ No newline at end of file diff --git a/xlive/configure_script.sh b/xlive/configure_script.sh index af1d6169150d9..1a4111c458682 100644 --- a/xlive/configure_script.sh +++ b/xlive/configure_script.sh @@ -6,18 +6,18 @@ --disable-encoders \ --disable-decoders \ --enable-decoder='h264,aac,hevc' \ - --enable-encoder='aac,libx265' \ + --enable-encoder='aac' \ --enable-parser='h264,aac,mp3' \ --enable-demuxer='flv,h264,aac,mp3,live_flv' \ --enable-muxer='flv,mp4' \ - --enable-protocol='file,pipe' \ + --enable-protocol='file,pipe,http' \ --enable-bsf='h264_mp4toannexb,aac_adtstoasc' \ --disable-avdevice \ --disable-swscale \ --disable-postproc \ --disable-doc \ --disable-runtime-cpudetect \ - --disable-network \ + --enable-network \ --enable-gpl \ --enable-version3 \ --enable-avcodec \ diff --git a/xlive/dev_build.sh b/xlive/dev_build.sh index ce25e1bf5aa8d..f01d98421161c 100644 --- a/xlive/dev_build.sh +++ b/xlive/dev_build.sh @@ -1,11 +1,25 @@ #!/bin/bash - -if [ ! -f "./ffmpeg" ]; then - ./configure_script.sh \ - --enable-debug=3 \ - --disable-optimizations \ - --enable-pthreads \ - --disable-stripping +set -x +SCRIPT_DIR=$(dirname "$0") +if [ "$1" = "windows" ]; then + if [ ! -f "./ffmpeg.exe" ]; then + $SCRIPT_DIR/configure_script.sh \ + --target-os=mingw32 \ + --arch=x86_64 \ + --cross-prefix=x86_64-w64-mingw32- \ + --enable-debug=3 \ + --disable-optimizations \ + --enable-w32threads \ + --disable-stripping + fi +else + if [ ! -f "./ffmpeg" ]; then + $SCRIPT_DIR/configure_script.sh \ + --enable-debug=3 \ + --disable-optimizations \ + --enable-pthreads \ + --disable-stripping + fi fi make -j$(nproc) \ No newline at end of file