Skip to content

Commit

Permalink
Remove FFmpeg4 support, for libsrt 1.5.3 does not support it.
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jun 19, 2024
1 parent 26be8e4 commit 9496d99
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 109 deletions.
53 changes: 1 addition & 52 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ jobs:
base: 'Dockerfile.base'
base2: ['Dockerfile.base', 'Dockerfile.base2']
base3: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3']
base4: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base4']
base50: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base50']
base51: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base51']
base999999: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base4', 'Dockerfile.base50', 'Dockerfile.base51', 'Dockerfile.base999999']
base999999: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base50', 'Dockerfile.base51', 'Dockerfile.base999999']
################################################################
# The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
# Generate variables like:
Expand All @@ -40,7 +39,6 @@ jobs:
base: ${{ steps.filter.outputs.base }}
base2: ${{ steps.filter.outputs.base2 }}
base3: ${{ steps.filter.outputs.base3 }}
base4: ${{ steps.filter.outputs.base4 }}
base50: ${{ steps.filter.outputs.base50 }}
base51: ${{ steps.filter.outputs.base51 }}
base999999: ${{ steps.filter.outputs.base999999 }}
Expand Down Expand Up @@ -190,54 +188,6 @@ jobs:
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}-base3
runs-on: ubuntu-20.04

docker-base4:
needs:
- docker-base3
- envs
if: ${{ always() && needs.envs.outputs.base4 == 'true' }}
steps:
################################################################
- name: Covert output to env
run: |
echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
################################################################
- name: Checkout repository
uses: actions/checkout@v3
################################################################
# See https://github.com/crazy-max/ghaction-docker-buildx#moved-to-docker-organization
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
################################################################
- name: Login docker hub
uses: docker/login-action@v2
with:
username: "${{ secrets.DOCKER_USERNAME }}"
password: "${{ secrets.DOCKER_PASSWORD }}"
- name: Build and push to docker registry
run: |
docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
--output "type=image,push=true" \
-t ossrs/srs:${SRS_TAG}-base4 \
-f Dockerfile.base4 .
################################################################
- name: Login aliyun hub
uses: docker/login-action@v2
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: "${{ secrets.ACR_USERNAME }}"
password: "${{ secrets.ACR_PASSWORD }}"
- name: Copy to Aliyun registry
uses: akhilerm/[email protected]
with:
src: ossrs/srs:${{ env.SRS_TAG }}-base4
dst: |
registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}-base4
runs-on: ubuntu-20.04

docker-base50:
needs:
- docker-base3
Expand Down Expand Up @@ -336,7 +286,6 @@ jobs:

docker-base999999:
needs:
- docker-base4
- docker-base50
- docker-base51
- envs
Expand Down
54 changes: 0 additions & 54 deletions Dockerfile.base4

This file was deleted.

1 change: 0 additions & 1 deletion Dockerfile.base50
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ RUN FFOPTIONS=""; if [[ $TARGETPLATFORM != 'linux/arm/v7' ]]; then \
RUN cp /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg5 && \
cp /usr/local/bin/ffprobe /usr/local/bin/ffprobe5
RUN ls -lh /usr/local/bin/*

1 change: 0 additions & 1 deletion Dockerfile.base51
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,3 @@ RUN FFOPTIONS=""; if [[ $TARGETPLATFORM != 'linux/arm/v7' ]]; then \
RUN cp /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg5-hevc-over-rtmp && \
cp /usr/local/bin/ffprobe /usr/local/bin/ffprobe5-hevc-over-rtmp
RUN ls -lh /usr/local/bin/*

1 change: 0 additions & 1 deletion Dockerfile.base999999
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ ADD Roboto-Regular.ttf NotoSansSC-Regular.ttf /usr/local/share/fonts/

# Copy all FFmpeg versions and cmake and other tools in /usr/local.
COPY --from=build51 /usr/local /usr/local
COPY --from=build4 /usr/local/bin/ffmpeg4 /usr/local/bin/ffprobe4 /usr/local/bin/
COPY --from=build50 /usr/local/bin/ffmpeg5 /usr/local/bin/ffprobe5 /usr/local/bin/

# Note that for armv7, the ffmpeg5-hevc-over-rtmp is actually ffmpeg5.
Expand Down

0 comments on commit 9496d99

Please sign in to comment.