From 9fa1060608cf3fa776a92240059ca3115347892a Mon Sep 17 00:00:00 2001 From: melpon Date: Thu, 28 Jul 2022 21:06:18 +0900 Subject: [PATCH 1/6] 2022.8.0 --- CHANGES.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 6719c91b..f6e0932d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2022.8.0 (2022-07-28) + - [CHANGE] Intel Media SDK を利用したハードウェアエンコーダ/デコーダを削除 - @melpon - [ADD] oneVPL を利用したハードウェアエンコーダ/デコーダを追加 diff --git a/VERSION b/VERSION index 566ecfaf..c33935ec 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -SORA_CPP_SDK_VERSION=2022.7.8 +SORA_CPP_SDK_VERSION=2022.8.0 WEBRTC_BUILD_VERSION=m103.5060.5.0 BOOST_VERSION=1.79.0 CMAKE_VERSION=3.23.1 From 0f0c88abe7eb2df911633e9973f05ca6e00390f8 Mon Sep 17 00:00:00 2001 From: melpon Date: Tue, 8 Nov 2022 22:13:41 +0900 Subject: [PATCH 2/6] =?UTF-8?q?Lyra=20=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=82=92=E6=8C=87=E5=AE=9A=E5=8F=AF=E8=83=BD=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 3 +++ include/sora/sora_signaling.h | 1 + src/sora_signaling.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fae03ac9..3cc74640 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,9 @@ ## develop +- [ADD] Lyra パラメータを指定可能にする + - @melpon + ## 2022.16.0 (2022-11-08) - [CHANGE] Boost.Filesystem への依存を追加 diff --git a/include/sora/sora_signaling.h b/include/sora/sora_signaling.h index f9f3c840..c860a84f 100644 --- a/include/sora/sora_signaling.h +++ b/include/sora/sora_signaling.h @@ -65,6 +65,7 @@ struct SoraSignalingConfig { bool audio = true; std::string video_codec_type = ""; std::string audio_codec_type = ""; + boost::json::value audio_codec_lyra_params; int video_bit_rate = 0; int audio_bit_rate = 0; boost::json::value metadata; diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp index a700a7b4..e13ad692 100644 --- a/src/sora_signaling.cpp +++ b/src/sora_signaling.cpp @@ -291,7 +291,8 @@ void SoraSignaling::DoSendConnect(bool redirect) { if (!config_.audio) { m["audio"] = false; } else if (config_.audio && config_.audio_codec_type.empty() && - config_.audio_bit_rate == 0) { + config_.audio_bit_rate == 0 && + config_.audio_codec_lyra_params.is_null()) { m["audio"] = true; } else { m["audio"] = boost::json::object(); @@ -301,9 +302,8 @@ void SoraSignaling::DoSendConnect(bool redirect) { if (config_.audio_bit_rate != 0) { m["audio"].as_object()["bit_rate"] = config_.audio_bit_rate; } - if (config_.audio_codec_type == "LYRA") { - m["audio"].as_object()["lyra_params"] = boost::json::object(); - m["audio"].as_object()["lyra_params"].as_object()["version"] = "1.2.0"; + if (!config_.audio_codec_lyra_params.is_null()) { + m["audio"].as_object()["lyra_params"] = config_.audio_codec_lyra_params; } } From 5b37c24ea93dffb0cc9c84ba527b77ad6776bdbf Mon Sep 17 00:00:00 2001 From: melpon Date: Tue, 8 Nov 2022 22:15:55 +0900 Subject: [PATCH 3/6] =?UTF-8?q?2022.17.0=20=E3=83=AA=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 ++ VERSION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 3cc74640..900b9815 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2022.17.0 (2022-11-08) + - [ADD] Lyra パラメータを指定可能にする - @melpon diff --git a/VERSION b/VERSION index 427b29ae..153ce472 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -SORA_CPP_SDK_VERSION=2022.16.0 +SORA_CPP_SDK_VERSION=2022.17.0 WEBRTC_BUILD_VERSION=m107.5304.4.1 BOOST_VERSION=1.80.0 CMAKE_VERSION=3.23.1 From f677bc7ab51169ca8659f0c208d6274448e329d0 Mon Sep 17 00:00:00 2001 From: voluntas Date: Sat, 2 Dec 2023 00:01:56 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 9bff1492..f5622f3c 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ -SORA_CPP_SDK_VERSION=2023.16.0 -WEBRTC_BUILD_VERSION=m119.6045.2.1 +SORA_CPP_SDK_VERSION=2023.16.1 +WEBRTC_BUILD_VERSION=m119.6045.2.2 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.27.7 BAZEL_VERSION=5.3.2 From ed22908567b6c6df728b48d1091b6fbe848919b0 Mon Sep 17 00:00:00 2001 From: voluntas Date: Sat, 2 Dec 2023 00:04:08 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 18d0c4ea..368d7c7e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,12 @@ ## develop +## 2023.16.1 (2023-12-02) + +- [FIX] WebRTC を m119.6045.2.2 に上げる + - iOS の非公開 API を利用していたため、App Store でリジェクトされてしまうのを修正 + - @voluntas + ## 2023.16.0 (2023-11-19) - [ADD] SRTP keying material を取得する機能を実装 From 6009017c463e4f14b177d163cc9577007e09021a Mon Sep 17 00:00:00 2001 From: voluntas Date: Sat, 2 Dec 2023 02:03:40 +0900 Subject: [PATCH 6/6] =?UTF-8?q?setuptools=20=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eed88475..30411bbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,7 +110,7 @@ jobs: with: path: "/private/var/tmp/_bazel_${{ steps.env.outputs.user }}" key: bazel-${{ matrix.name }}-v2 - - run: pip3 install numpy + - run: pip3 install numpy setuptools - run: python3 run.py --test --package ${{ matrix.name }} - name: Get package name run: |