Skip to content

Commit

Permalink
Merge branch 'release/2024.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
voluntas committed Jan 26, 2024
2 parents 45471b5 + 861c1e6 commit 110ba78
Show file tree
Hide file tree
Showing 69 changed files with 8,976 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
Language: Cpp
BasedOnStyle: Chromium
ReflowComments: false
---
Language: ObjC
BasedOnStyle: Chromium
ReflowComments: false
34 changes: 34 additions & 0 deletions .github/actions/download/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: download-artifact

description: Download Artifact

inputs:
platform:
description: Platform
required: true

runs:
using: composite
steps:
- uses: actions/download-artifact@v3
with:
name: ${{ inputs.platform }}.env
path: ${{ inputs.platform }}.env
- name: Env to output
shell: bash
run: |
sed -i 's/\r//g' ${{ inputs.platform }}.env/sorac.env
source ${{ inputs.platform }}.env/sorac.env
echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
echo "sumomo_package_name=$sumomo_PACKAGE_NAME" >> $GITHUB_OUTPUT
echo "$PACKAGE_NAME/$PACKAGE_NAME" >> package_paths.env
echo "$SUMOMO_PACKAGE_NAME/$SUMOMO_PACKAGE_NAME" >> package_paths.env
id: env
- uses: actions/download-artifact@v3
with:
name: ${{ steps.env.outputs.package_name }}
path: ${{ steps.env.outputs.package_name }}
- uses: actions/download-artifact@v3
with:
name: ${{ steps.env.outputs.sumomo_package_name }}
path: ${{ steps.env.outputs.sumomo_package_name }}
82 changes: 82 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: build-workflow

on:
push:
paths-ignore:
- "doc/**"
- "**.md"
- "LICENSE"
- "NOTICE"

jobs:
build-unix:
strategy:
fail-fast: false
matrix:
m:
- name: macos_arm64
runs-on: macos-13
linux: false
- name: ubuntu-20.04_x86_64
runs-on: ubuntu-20.04
linux: true
- name: ubuntu-22.04_x86_64
runs-on: ubuntu-22.04
linux: true
name: Build sora-c-sdk for ${{ matrix.m.name }}
runs-on: ${{ matrix.m.runs-on }}
steps:
- uses: actions/checkout@v4
- run: |
sudo apt-get update
sudo apt-get install -y libpulse-dev
if: matrix.m.linux == true
- run: python3 run.py --sumomo --package ${{ matrix.m.name }}
- name: Get package name
run: |
source _package/${{ matrix.m.name }}/release/sorac.env
echo "name=${PACKAGE_NAME}" >> $GITHUB_OUTPUT
echo "sumomo_name=${SUMOMO_PACKAGE_NAME}" >> $GITHUB_OUTPUT
id: package_name
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: ${{ steps.package_name.outputs.name }}
path: _package/${{ matrix.m.name }}/release/${{ steps.package_name.outputs.name }}
- name: Upload Sumomo Artifact
uses: actions/upload-artifact@v3
with:
name: ${{ steps.package_name.outputs.sumomo_name }}
path: _package/${{ matrix.m.name }}/release/${{ steps.package_name.outputs.sumomo_name }}
- name: Upload Environment
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.m.name }}.env
path: _package/${{ matrix.m.name }}/release/sorac.env
create-release:
name: Create Release
if: contains(github.ref, 'tags/202')
needs:
- build-unix
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/download
with:
platform: macos_arm64
- uses: ./.github/actions/download
with:
platform: ubuntu-20.04_x86_64
- uses: ./.github/actions/download
with:
platform: ubuntu-22.04_x86_64
- name: Env to output
run: |
echo "package_paths<<EOF" >> $GITHUB_OUTPUT
cat package_paths.env >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
id: env
- name: Release
uses: softprops/action-gh-release@v1
with:
files: ${{ steps.env.outputs.package_paths }}
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/_source
/_build
/_install
/_package
/run.sh
/libopenh264-*.so
/libopenh264-*.dylib
/cacert.pem
41 changes: 41 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"configurations": [
{
"name": "Release",
"includePath": [
"${workspaceFolder}/include",
"${workspaceFolder}/_source/libdatachannel/include",
"${workspaceFolder}/_source/libdatachannel/deps/json/include",
"${workspaceFolder}/_source/libdatachannel/deps/plog/include",
"${workspaceFolder}/_source/opus/include",

"${workspaceFolder}/_build/ubuntu-20.04_x86_64/release/sorac",
"${workspaceFolder}/_build/ubuntu-20.04_x86_64/release/sorac/proto/sorac",
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/mbedtls/include",
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/openh264/include",
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libjpeg-turbo/include",
"${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/libyuv/include",

"${workspaceFolder}/_build/macos_arm64/release/sorac",
"${workspaceFolder}/_build/macos_arm64/release/sorac/proto/sorac",
"${workspaceFolder}/_install/macos_arm64/release/mbedtls/include",
"${workspaceFolder}/_install/macos_arm64/release/openh264/include",
"${workspaceFolder}/_install/macos_arm64/release/libjpeg-turbo/include",
"${workspaceFolder}/_install/macos_arm64/release/libyuv/include"
],
"defines": [
"JSONIF_USE_NLOHMANN_JSON",
"USE_MBEDTLS",
"RTC_ENABLE_WEBSOCKET",
"RTC_ENABLE_MEDIA",
"__Userspace__",
"SCTP_SIMPLE_ALLOCATOR",
"SCTP_PROCESS_LEVEL_LOCKS"
],
"compilerArgs": [],
"cStandard": "c17",
"cppStandard": "c++20"
}
],
"version": 4
}
102 changes: 102 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
"flake8.args": ["--max-line-length=120"],
"autopep8.args": ["--max-line-length", "120", "--experimental"],
"[python]": {
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file"
},
"[c]": {
"editor.formatOnSave": true
},
"[cpp]": {
"editor.formatOnSave": true
},
"[objective-c]": {
"editor.formatOnSave": true
},
"[objective-cpp]": {
"editor.formatOnSave": true
},
"files.associations": {
"*.cs": "csharp",
"CMakeLists.txt": "cmake",
"array": "cpp",
"atomic": "cpp",
"hash_map": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"ostream": "cpp",
"ranges": "cpp",
"shared_mutex": "cpp",
"span": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"typeinfo": "cpp",
"valarray": "cpp",
"variant": "cpp",
"any": "cpp",
"unistd.h": "c",
"recorder.h": "c",
"__mutex_base": "cpp",
"sorac.h": "c",
"soracp.json.c.h": "c"
}
}
57 changes: 57 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# 変更履歴

- CHANGE
- 下位互換のない変更
- UPDATE
- 下位互換がある変更
- ADD
- 下位互換がある追加
- FIX
- バグ修正

## develop

## 2024.1.0

**祝いリリース**

- [ADD] Sora 2023.2.x 対応
- @melpon
- [ADD] Ubuntu 22.04 x86_64 対応
- @melpon
- [ADD] macOS arm64 対応
- @melpon
- [ADD] データチャネル対応
- @melpon
- [ADD] ロール sendonly 対応
- @melpon
- [ADD] データチャネルメッセージング対応
- @melpon
- [ADD] データチャネルシグナリング対応
- @melpon
- [ADD] 複数グナリング対応
- @melpon
- [ADD] シグナリングリダイレクト対応
- @melpon
- [ADD] シグナリング通知対応
- @melpon
- [ADD] プッシュ通知対応
- @melpon
- [ADD] サイマルキャスト対応
- @melpon
- [ADD] OpenH264 対応
- @melpon
- [ADD] macOS Video Toolbox 対応
- H.265 (HEVC) ハードウェアアクセラレーターエンコーダー
- H.264 (AVC) ハードウェアアクセラレーターエンコーダー
- @melpon
- [ADD] サンプル sumomo 追加
- @melpon
- [ADD] Reduced-Size RTCP 対応
- @melpon
- [ADD] RTCP CNAME 対応
- @melpon
- [ADD] SCTP Zero Checksum 対応
- @melpon
- [ADD] TURN-UDP 対応
- @melpon
Loading

0 comments on commit 110ba78

Please sign in to comment.