Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AirenSoft/OvenMediaEngine
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.15.0
Choose a base ref
...
head repository: AirenSoft/OvenMediaEngine
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release
Choose a head ref

Commits on Oct 27, 2022

  1. Add ability to disable custom library paths at build

    When one builds OME against shared system libraries they might not use
    `/opt/ovenmediaengine/lib` at all. In that case not disabling it
    completly can be a security risk.
    hashworks committed Oct 27, 2022
    Copy the full SHA
    fb5cf4c View commit details

Commits on Jan 22, 2023

  1. Fix typo

    Baw-Appie authored Jan 22, 2023
    Copy the full SHA
    bba1a30 View commit details

Commits on Jan 31, 2023

  1. Update Dockerfile

    dimiden committed Jan 31, 2023
    Copy the full SHA
    b139cb5 View commit details

Commits on Feb 1, 2023

  1. Fixed typo

    dimiden committed Feb 1, 2023
    Copy the full SHA
    ecde8cc View commit details
  2. Fixed an issue where logs are displayed as error level when status co…

    …de is 2xx instead of 200.
    dimiden committed Feb 1, 2023
    Copy the full SHA
    8aa5288 View commit details
  3. Copy the full SHA
    de9ccfe View commit details
  4. Copy the full SHA
    691748d View commit details

Commits on Feb 7, 2023

  1. Copy the full SHA
    0e9b89e View commit details

Commits on Feb 8, 2023

  1. Copy the full SHA
    42f70f4 View commit details
  2. Copy the full SHA
    86e3953 View commit details
  3. Copy the full SHA
    5250410 View commit details
  4. Copy the full SHA
    b703eb8 View commit details
  5. Copy the full SHA
    d56ff5d View commit details
  6. Merge pull request #1004 from Baw-Appie/patch-1

    Fix typo in docs
    getroot authored Feb 8, 2023
    Copy the full SHA
    15f9c5b View commit details

Commits on Feb 9, 2023

  1. Added debug log

    getroot committed Feb 9, 2023
    Copy the full SHA
    7fa09c7 View commit details
  2. Copy the full SHA
    5c6fe95 View commit details
  3. Copy the full SHA
    4376d66 View commit details

Commits on Feb 10, 2023

  1. Adjust timestamp from SRT

    getroot committed Feb 10, 2023
    Copy the full SHA
    2ebc6a0 View commit details
  2. Added track selection by Encode Name.

    Keukhan committed Feb 10, 2023
    Copy the full SHA
    c423adb View commit details
  3. Fixed a crash when recording failed.

    Keukhan committed Feb 10, 2023
    Copy the full SHA
    900cc0a View commit details
  4. Copy the full SHA
    583b552 View commit details
  5. Copy the full SHA
    34741fc View commit details
  6. Copy the full SHA
    c46fceb View commit details
  7. Fixed crash in transcoder when using multi-audio

    Keukhan committed Feb 10, 2023
    Copy the full SHA
    7963829 View commit details

Commits on Feb 13, 2023

  1. Merge pull request #1020 from Baw-Appie/patch-2

    Update install_nvidia_driver.sh for Ubuntu Server
    Keukhan authored Feb 13, 2023
    Copy the full SHA
    0d4395d View commit details
  2. Changed the term trackName to variantName

    Keukhan committed Feb 13, 2023
    Copy the full SHA
    615ee90 View commit details
  3. Added comment

    Keukhan committed Feb 13, 2023
    Copy the full SHA
    44d85e3 View commit details
  4. GITBOOK-338: No subject

    Keukhan authored and gitbook-bot committed Feb 13, 2023
    Copy the full SHA
    308a41d View commit details
  5. GITBOOK-340: Title changed

    Keukhan authored and gitbook-bot committed Feb 13, 2023
    Copy the full SHA
    b63258b View commit details
  6. Copy the full SHA
    2eb5f6a View commit details
  7. GITBOOK-342: Example updated

    Keukhan authored and gitbook-bot committed Feb 13, 2023
    Copy the full SHA
    af7d0af View commit details
  8. Copy the full SHA
    d982b99 View commit details
  9. Copy the full SHA
    5429188 View commit details
  10. Copy the full SHA
    8ac132d View commit details
  11. Merge pull request #928 from hashworks/build/disableCustomLibraryPaths

    Add ability to disable custom library paths at build
    dimiden authored Feb 13, 2023
    Copy the full SHA
    73efd6f View commit details
  12. Copy the full SHA
    9973d77 View commit details

Commits on Feb 14, 2023

  1. Create codeql.yml

    getroot authored Feb 14, 2023
    Copy the full SHA
    71007c3 View commit details
  2. Delete codeql.yml

    getroot authored Feb 14, 2023
    Copy the full SHA
    a393868 View commit details
  3. Create c-cpp.yml

    getroot authored Feb 14, 2023
    Copy the full SHA
    105e247 View commit details
  4. Delete c-cpp.yml

    getroot authored Feb 14, 2023
    Copy the full SHA
    c2739ed View commit details

Commits on Feb 15, 2023

  1. Update content

    lee-hammer99 committed Feb 15, 2023
    Copy the full SHA
    6188af1 View commit details

Commits on Feb 16, 2023

  1. Update README.md

    getroot authored Feb 16, 2023
    Copy the full SHA
    0a9be88 View commit details
  2. Update README.md

    getroot authored Feb 16, 2023
    Copy the full SHA
    d19a1fa View commit details

Commits on Feb 17, 2023

  1. Edit typo and sentence

    lee-hammer99 authored Feb 17, 2023
    Copy the full SHA
    3906620 View commit details
  2. Copy the full SHA
    d7b1632 View commit details
  3. Copy the full SHA
    1b163bd View commit details
  4. Copy the full SHA
    ba8cb36 View commit details

Commits on Feb 20, 2023

  1. Fixed typo

    Keukhan committed Feb 20, 2023
    Copy the full SHA
    c499872 View commit details
  2. Support IPv6 URL

    dimiden committed Feb 20, 2023
    Copy the full SHA
    389c47f View commit details
  3. Copy the full SHA
    188a86e View commit details
Showing 1,067 changed files with 72,170 additions and 39,995 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
labels:
assignees: ''

---
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

59 changes: 0 additions & 59 deletions .github/ISSUE_TEMPLATE/help.md

This file was deleted.

84 changes: 84 additions & 0 deletions .github/workflows/docker-image-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Release Docker Image CI

on:
release:
types: [published]
workflow_dispatch:

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
attestations: write
id-token: write
steps:
- name: Notify to Slack
uses: slackapi/slack-github-action@v1.26.0
with:
payload: |
{
"branch": "${{ github.ref_name }}",
"tag": "${{ env.TAG }}",
"state": "Started"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_STATE_NOTIFICATION_SLACK_WEBHOOK_URL }}
- name: Check out the repo
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: airensoft/ovenmediaengine
tags: |
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}.{{patch}}
- name: Build and push
id: push
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: |
linux/amd64
linux/arm64
- name: Replace newlines with pipe in tags
id: clean_tags
run: |
cleaned_tags=$(echo "${{ steps.meta.outputs.tags }}" | sed ':a;N;$!ba;s/\n/|/g')
echo "::set-output name=cleaned_tags::$cleaned_tags"
- name: Notify to Slack
if: always()
uses: slackapi/slack-github-action@v1.26.0
with:
payload: |
{
"branch": "${{ github.ref_name }}",
"tag": "${{ steps.clean_tags.outputs.cleaned_tags }}",
"state": "${{ job.status }}"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_STATE_NOTIFICATION_SLACK_WEBHOOK_URL }}
75 changes: 75 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Docker Image CI

on:
push:
branches:
- master
workflow_dispatch:

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
TAG: 'airensoft/ovenmediaengine:dev'

jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
attestations: write
id-token: write
steps:
- name: Notify to Slack
uses: slackapi/slack-github-action@v1.26.0
with:
payload: |
{
"branch": "${{ github.ref_name }}",
"tag": "${{ env.TAG }}",
"state": "Started"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_STATE_NOTIFICATION_SLACK_WEBHOOK_URL }}
- name: Check out the repo
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
id: push
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ env.TAG }}
platforms: |
linux/amd64
linux/arm64
- name: Notify to Slack
if: always()
uses: slackapi/slack-github-action@v1.26.0
with:
payload: |
{
"branch": "${{ github.ref_name }}",
"tag": "${{ env.TAG }}",
"state": "${{ job.status }}"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_STATE_NOTIFICATION_SLACK_WEBHOOK_URL }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ src/projects/main/git_info.h
*.cxxflags
*.files
*.includes
.qtc_clangd

*.o
*.d
16 changes: 6 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 AS base
FROM ubuntu:22.04 AS base

## Install libraries by package
ENV DEBIAN_FRONTEND=noninteractive
@@ -8,9 +8,8 @@ FROM base AS build

WORKDIR /tmp

ARG OME_VERSION=v0.15.0
ARG OME_VERSION=v0.17.2
ARG STRIP=TRUE
ARG GPU=FALSE

ENV PREFIX=/opt/ovenmediaengine
ENV TEMP_DIR=/tmp/ome
@@ -23,12 +22,7 @@ RUN \

## Install dependencies
RUN \
if [ "$GPU" = "TRUE" ] ; then \
${TEMP_DIR}/misc/install_nvidia_docker_image.sh ; \
${TEMP_DIR}/misc/prerequisites.sh --enable-nvc ; \
else \
${TEMP_DIR}/misc/prerequisites.sh ; \
fi
${TEMP_DIR}/misc/prerequisites.sh

## Build OvenMediaEngine
RUN \
@@ -48,12 +42,14 @@ RUN \
cp ../misc/conf_examples/Logger.xml ${PREFIX}/bin/origin_conf/Logger.xml && \
cp ../misc/conf_examples/Edge.xml ${PREFIX}/bin/edge_conf/Server.xml && \
cp ../misc/conf_examples/Logger.xml ${PREFIX}/bin/edge_conf/Logger.xml && \
rm -rf ${DIR}
cp ../misc/install_nvidia_driver.sh ${PREFIX}/bin/install_nvidia_driver.sh && \
rm -rf ${TEMP_DIR}

FROM base AS release

WORKDIR /opt/ovenmediaengine/bin
EXPOSE 80/tcp 8080/tcp 8090/tcp 1935/tcp 3333/tcp 3334/tcp 4000-4005/udp 10000-10010/udp 9000/tcp
COPY --from=build /opt/ovenmediaengine /opt/ovenmediaengine

# Default run as Origin mode
CMD ["/opt/ovenmediaengine/bin/OvenMediaEngine", "-c", "origin_conf"]
78 changes: 78 additions & 0 deletions Dockerfile.cuda
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Instruction: Build OvenMediaEngine with CUDA support
# Usage:
# $ docker build -t airensoft/ovenmediaengine_nv:dev -f Dockerfile.cuda .
# $ docker run -it --gpus all airensoft/ovenmediaengine_nv:dev

FROM nvidia/cuda:11.4.3-devel-ubuntu20.04 AS base
# FROM nvidia/cuda:12.2.0-devel-ubuntu20.04 AS base

## Install libraries by package
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y tzdata sudo curl

FROM base AS build

WORKDIR /tmp

ARG OME_VERSION=master
ARG STRIP=TRUE

ENV PREFIX=/opt/ovenmediaengine
ENV TEMP_DIR=/tmp/ome

ENV NVIDIA_VISIBLE_DEVICES=all
ENV NVIDIA_REQUIRE_CUDA=cuda>=11.4
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video,compat32
# TConfigure ldconfig to find the cuda and nvml libraries
RUN echo "/usr/local/cuda-11.4/targets/x86_64-linux/lib/stubs" > /etc/ld.so.conf.d/000_cuda.conf | ldconfig
# RUN echo "/usr/local/cuda-12.2/targets/x86_64-linux/lib/stubs" > /etc/ld.so.conf.d/000_cuda.conf | ldconfig

## Download OvenMediaEngine
RUN \
mkdir -p ${TEMP_DIR} && \
cd ${TEMP_DIR} && \
curl -sLf https://github.com/AirenSoft/OvenMediaEngine/archive/${OME_VERSION}.tar.gz | tar -xz --strip-components=1

## Install dependencies
RUN \
${TEMP_DIR}/misc/prerequisites.sh --enable-nvc

## Build OvenMediaEngine
RUN \
cd ${TEMP_DIR}/src && \
make release -j$(nproc)

RUN \
if [ "$STRIP" = "TRUE" ] ; then strip ${TEMP_DIR}/src/bin/RELEASE/OvenMediaEngine ; fi

## Make running environment
RUN \
cd ${TEMP_DIR}/src && \
mkdir -p ${PREFIX}/bin/origin_conf && \
mkdir -p ${PREFIX}/bin/edge_conf && \
cp ./bin/RELEASE/OvenMediaEngine ${PREFIX}/bin/ && \
cp ../misc/conf_examples/Origin.xml ${PREFIX}/bin/origin_conf/Server.xml && \
cp ../misc/conf_examples/Logger.xml ${PREFIX}/bin/origin_conf/Logger.xml && \
cp ../misc/conf_examples/Edge.xml ${PREFIX}/bin/edge_conf/Server.xml && \
cp ../misc/conf_examples/Logger.xml ${PREFIX}/bin/edge_conf/Logger.xml && \
rm -rf ${TEMP_DIR}

## Make Release Image
FROM nvidia/cuda:11.4.3-runtime-ubuntu20.04 AS release
# FROM nvidia/cuda:12.2.0-runtime-ubuntu20.04 AS release

## Install libraries by package
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y tzdata sudo

WORKDIR /opt/ovenmediaengine/bin
EXPOSE 80/tcp 8080/tcp 8090/tcp 1935/tcp 3333/tcp 3334/tcp 4000-4005/udp 10000-10010/udp 9000/tcp
COPY --from=build /opt/ovenmediaengine /opt/ovenmediaengine

ENV NVIDIA_VISIBLE_DEVICES=all
ENV NVIDIA_REQUIRE_CUDA=cuda>=11.4
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video,compat32

# Default run as Origin mode
CMD ["/opt/ovenmediaengine/bin/OvenMediaEngine", "-c", "origin_conf"]

Loading