From 35a471e018e3ab950290a93aa62e6e255ba68694 Mon Sep 17 00:00:00 2001 From: torikizi Date: Fri, 22 Sep 2023 00:15:27 +0900 Subject: [PATCH 1/6] =?UTF-8?q?MacAudioOutputHelper=20=E3=81=A7=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E5=87=A6=E7=90=86=E3=82=92=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A4=E3=83=B3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mac/mac_audio_output_helper.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mac/mac_audio_output_helper.mm b/src/mac/mac_audio_output_helper.mm index 3bad0f78..065d37f5 100644 --- a/src/mac/mac_audio_output_helper.mm +++ b/src/mac/mac_audio_output_helper.mm @@ -108,9 +108,9 @@ - (void)audioSession:(RTC_OBJC_TYPE(RTCAudioSession) *)audioSession } MacAudioOutputHelper::~MacAudioOutputHelper() { - // あった方が良いと思ったが、 libwebrtc のサンプルにないので消しておく - // RTC_OBJC_TYPE(RTCAudioSession)* session = [RTC_OBJC_TYPE(RTCAudioSession) sharedInstance]; - // [session removeDelegate:adapter_]; + // libwebrtc のサンプルにないが、あった方が良いのでここで removeDelegate を呼ぶ + RTC_OBJC_TYPE(RTCAudioSession)* session = [RTC_OBJC_TYPE(RTCAudioSession) sharedInstance]; + [session removeDelegate:adapter_]; adapter_ = nil; } From 7ad0c0a976e7a6b879810950850f53950360dd29 Mon Sep 17 00:00:00 2001 From: torikizi Date: Mon, 25 Sep 2023 10:52:41 +0900 Subject: [PATCH 2/6] =?UTF-8?q?CHANGES=20=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2c727bcb..78e225bc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,10 @@ - [UPDATE] WebRTC を m117.5938.2.0 に上げる - @melpon @miosakuma +- [FIX] `MacAudioOutputHelper` でコメントアウトしていた処理をコメントインする + - 当初 libwebrtc のサンプルにはない処理で、消していた処理を復活させる + - アプリの起動中に `MacAudioOutputHelper` を作成、削除を繰り返しても問題ないようにする + - @torikizi ## 2023.13.1 (2023-09-12) @@ -27,15 +31,15 @@ ## 2023.12.1 (2023-09-10) - [FIX] V4L2VideoCapturer でデバイス名の指定が無視されていたのを修正 - - @melpon + - @melpon - [FIX] Android で動かすために必要な libwebrtc の初期化処理を追加 - - @melpon + - @melpon ## 2023.12.0 (2023-09-08) - [CHANGE] MacCapturer の解放前に明示的に Stop() 関数を呼ぶ必要があるようになる - @melpon -- [FIX] iOS で MacCapturer の解放時に10秒間固まることがあるのを修正 +- [FIX] iOS で MacCapturer の解放時に 10 秒間固まることがあるのを修正 - @melpon - [FIX] Android キャプチャラのエラーハンドリングを厳密にする - @melpon From 1f0a62140e20065390ddf9837d89dd2b62945132 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Thu, 28 Sep 2023 17:27:57 +0900 Subject: [PATCH 3/6] Revert "Merge pull request #30 from shiguredo/renovate/macos-13.x" This reverts commit ec49e286c24e17bbd038e5d510a0c836304c77bf, reversing changes made to 4b18cb7647b3dae13e7c8ead280ccf59a97e76ea. --- .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 40308cda..e5911b0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: - macos_arm64 - ios name: Build sora-cpp-sdk for ${{ matrix.name }} - runs-on: macos-13 + runs-on: macos-12 steps: - uses: actions/checkout@v4 - name: Env to output From dad0c2e04c6f0dbf979dab0db7466eff26a37438 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Thu, 28 Sep 2023 17:30:09 +0900 Subject: [PATCH 4/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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5e45d238..95b515a2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,8 +11,6 @@ ## develop -- [UPDATE] GitHub Actions の macOS を 13 に上げる - - @voluntas - [UPDATE] Boost を 1.83.0 に上げる - @voluntas - [UPDATE] WebRTC を m117.5938.2.0 に上げる From 4f5a3e208922811dbb0ffd2419ac92098793dbc7 Mon Sep 17 00:00:00 2001 From: torikizi Date: Mon, 2 Oct 2023 09:59:36 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AE=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mac/mac_audio_output_helper.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mac/mac_audio_output_helper.mm b/src/mac/mac_audio_output_helper.mm index 065d37f5..83e5aa4d 100644 --- a/src/mac/mac_audio_output_helper.mm +++ b/src/mac/mac_audio_output_helper.mm @@ -108,7 +108,6 @@ - (void)audioSession:(RTC_OBJC_TYPE(RTCAudioSession) *)audioSession } MacAudioOutputHelper::~MacAudioOutputHelper() { - // libwebrtc のサンプルにないが、あった方が良いのでここで removeDelegate を呼ぶ RTC_OBJC_TYPE(RTCAudioSession)* session = [RTC_OBJC_TYPE(RTCAudioSession) sharedInstance]; [session removeDelegate:adapter_]; adapter_ = nil; From c018fc157892f9577186fb270b0e0f7d4eba7779 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Mon, 2 Oct 2023 14:03:17 +0900 Subject: [PATCH 6/6] =?UTF-8?q?2023.14.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 8886fc7c..f8d56edb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,8 @@ ## develop +## 2023.14.0 (2023-10-02) + - [UPDATE] Boost を 1.83.0 に上げる - @voluntas - [UPDATE] WebRTC を m117.5938.2.0 に上げる diff --git a/VERSION b/VERSION index 3b2212f0..2eb678e8 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -SORA_CPP_SDK_VERSION=2023.13.1 +SORA_CPP_SDK_VERSION=2023.14.0 WEBRTC_BUILD_VERSION=m117.5938.2.0 BOOST_VERSION=1.83.0 CMAKE_VERSION=3.26.4