Fix missing RTC_OBJC_TYPE macro#174
Merged
hiroshihorie merged 1 commit intowebrtc-sdk:m125_releasefrom Jun 25, 2025
Merged
Conversation
hiroshihorie
approved these changes
Jun 25, 2025
Member
hiroshihorie
left a comment
There was a problem hiding this comment.
Oops missed that one! Thanks ✅
RTC_OBJC_TYPE macro (#171)RTC_OBJC_TYPE macro (#171)
RTC_OBJC_TYPE macro (#171)RTC_OBJC_TYPE macro
hiroshihorie
added a commit
that referenced
this pull request
Jul 10, 2025
commit 47b4b71 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jul 10 17:01:34 2025 +0900 Simplify AudioCustomProcessingAdapter commit 09ec011 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jul 10 15:26:06 2025 +0900 Fix typo commit 70272d0 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jul 1 16:41:23 2025 +0900 Revert LK prefix commit 81a78b6 Merge: 316d768 bfcfa65 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jun 29 19:57:16 2025 +0900 Merge branch 'm125_release' into hiroshi/livekit-m125-adm-audioengine commit bfcfa65 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jun 29 19:55:16 2025 +0900 Fix audio frame sample rate (#175) Fix audio frame sample rate when no senders are attached commit 0df968e Author: Harsh Shandilya <122249239+harshs-dyte@users.noreply.github.com> Date: Wed Jun 25 22:49:45 2025 +0530 Fix missing `RTC_OBJC_TYPE` macro (#174) Specifying the `rtc_objc_prefix` flag fails the build for these symbols since the macro wasn't applied to them. commit 316d768 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jun 24 16:53:10 2025 +0900 Change workaround sleep time to 0.1 sec commit daeb79d Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat May 24 01:05:49 2025 +0900 Audio device symbols commit 6e5f1c6 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat May 24 00:50:03 2025 +0900 Fix logging commit 6a49562 Merge: 212f078 ed96590 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jun 24 15:35:31 2025 +0900 Merge branch 'm125_release' into hiroshi/livekit-m125-adm-audioengine commit 212f078 Merge: a58a087 7ec4c03 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu May 22 10:56:54 2025 +0900 Merge branch 'm125_release' into hiroshi/livekit-m125-adm-audioengine commit a58a087 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu May 15 15:36:56 2025 +0900 macOS device patch 1 Format Log device name Default patch 1 Engine start bug workaround Change sleep time Restart engine only if stopped Patch Default device update count Recreate on device change commit a1bb19a Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat May 3 15:13:47 2025 +0900 Move back device config timing commit 6566dd4 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat May 3 00:11:51 2025 +0900 Rollback logic commit fa864f3 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri May 2 23:37:38 2025 +0900 Only update state if apply succeeds commit 9f27f86 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri May 2 23:37:01 2025 +0900 Move set device logic earlier commit 21ee7f0 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Apr 10 23:56:28 2025 +0800 input mixer mute mode commit e114436 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Apr 3 18:25:09 2025 +0800 Unmute on stop recording commit a940515 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Mar 29 00:19:40 2025 +0800 Inline input output node check commit 07ae103 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 27 17:48:32 2025 +0800 Specify adm type on pc init commit adfee74 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 27 18:01:05 2025 +0800 Simplify pc factory init p3 commit 68ef845 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Mar 26 02:41:46 2025 +0800 Don't mute when removing audio stream commit 081cc0f Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Apr 3 15:19:46 2025 +0800 Revert "Engine state transition" This reverts commit 821c91a. commit e6614c9 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 20 18:06:37 2025 +0800 Fix state check commit 584715e Merge: 3c0a82e 1d5d3b8 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 20 16:24:33 2025 +0800 Merge branch 'm125_release' into hiroshi/livekit-m125-adm-audioengine commit 3c0a82e Merge: 821c91a 762d567 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 20 16:21:45 2025 +0800 Merge branch 'hiroshi/livekit-m125-adm-audioengine-fix-stop-crash' into hiroshi/livekit-m125-adm-audioengine commit 762d567 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 20 16:19:44 2025 +0800 setMicrophoneMuted commit 1d91e93 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 13 01:16:12 2025 +0900 Metal renderer scale patch commit 9dbf95c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Mar 11 23:39:42 2025 +0900 Safe node detach commit 821c91a Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Mar 9 00:49:56 2025 +0900 Engine state transition Squashed: Rename AudioEngineState Refactor engine observer Refactor EngineStateTransition Move EngineStateTransition Refactor EngineState State as class commit 0b84894 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Mar 7 19:33:08 2025 +0900 adm return error code commit b1074f3 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 6 05:57:11 2025 +0900 propagate error codes commit 01f1554 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Mar 6 05:18:29 2025 +0900 Fix buffer state check commit 4a5ac4c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Mar 5 18:29:27 2025 +0900 Fix device format error crash & return error Squashed: Buffer checks only when modify state success Create converter only when required Catch output device errors also Return error if input not available Define error codes ApplyEngineState ModifyEngineState commit a890367 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Feb 18 19:33:38 2025 +0900 set vp enabled property commit e2a567b Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Feb 17 18:07:46 2025 +0900 Explicit Int16 conversion commit fa4cddc Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Feb 15 03:36:28 2025 +0900 set audio device buffer from rtc format commit 6732a8c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Feb 14 16:59:58 2025 +0900 Fix input mixer connection count commit 37f9711 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Feb 10 20:59:53 2025 +0900 Initial unmute for restart mute mode commit 24117ac Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Feb 10 10:22:29 2025 +0900 Refactor commit cbccb5d Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Feb 9 17:54:35 2025 +0900 is microphone muted property commit d8903c8 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Feb 9 13:38:17 2025 +0900 is engine running property commit 712009d Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Feb 9 00:27:48 2025 +0900 Fix state getters commit 4f65581 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Feb 10 21:15:38 2025 +0900 Simplify logic commit 40e7d20 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Feb 8 20:21:43 2025 +0900 Mute mode commit 2fd53d6 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Feb 8 00:31:41 2025 +0900 Fix audio frame sample rate when no senders commit 1b4bcce Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Feb 7 22:03:45 2025 +0900 apm mute / unmute commit 0b96f9a Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Feb 3 20:12:00 2025 +0900 Update io node connection methods commit 1460fb4 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jan 31 02:29:52 2025 +0900 Catch exception at start commit fbb0ed7 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jan 30 12:17:44 2025 +0900 Fix engine state commit 1c01168 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jan 30 04:12:13 2025 +0900 Disable apm option manipulation for ios mac commit 2ba3fd6 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Jan 29 18:37:01 2025 +0900 macos device logic commit 7f0aadb Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jan 28 15:52:17 2025 +0900 Start fail workaround commit 151ac87 Merge: 83551f3 0397078 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jan 28 11:42:46 2025 +0900 Merge branch 'hiroshi/livekit-m125' into hiroshi/livekit-m125-adm-audioengine commit 0397078 Merge: bbe4412 844bafa Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jan 28 11:41:47 2025 +0900 Merge branch 'm125_release' into hiroshi/livekit-m125 commit 83551f3 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jan 28 11:36:18 2025 +0900 Update delegate nullable node for output commit 85a0628 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Jan 27 13:04:14 2025 +0900 Fix build commit d9c7165 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jan 26 17:02:28 2025 +0900 Mac device commit 261126c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jan 26 16:49:29 2025 +0900 AGC & AEC available commit 78c9425 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jan 26 08:54:06 2025 +0900 Engine reconfigure commit 536e8ff Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jan 24 00:29:33 2025 +0900 Mac aec off by default AudioOptions initially false commit 7ece395 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Jan 25 07:06:43 2025 +0900 bypass & agc commit 591eb97 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jan 24 05:06:52 2025 +0900 Re-wire manual audio input commit 917c720 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jan 23 23:41:20 2025 +0900 Squashed commit of the following: commit 98dc0ac Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jan 23 03:27:20 2025 +0900 Rendering fix commit 345f8b7 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Jan 23 00:41:35 2025 +0900 Manual rendering commit be003d5 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Jan 22 12:03:18 2025 +0900 RTCAudioDeviceModuleDelegate commit 2babb14 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jan 17 16:18:39 2025 +0900 Squashed recent improvements Pre initialize mode Pre initialize logic Persistent Checks Fix buffer logic Patch default input_mute state Buffer checks Start buffer on enable Delay estimate 0 Stop engine on interrupt Pass should_resume Silence warning Correct session config Fix state Start logic Misc Rem ses Rem ses2 State helper Minor patch Simplify Change stop create order Working state Ref State helpers commit 235da97 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jan 14 15:52:32 2025 +0900 Squashed recent progress commit 6ba820c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Dec 31 01:57:09 2024 +0900 Squashed recent progress Fix adm selection Fixes Revert adm selection in audio_device_impl Rename IsManualRenderingMode Simplify pcm buffer delegate Fixes Fixes Ducking config Strip manual rendering logic Runtime-ducking config Fix compile Fix start recording Connect output Buffer logic Enable output when input is enabled commit 49ca1ee Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Dec 22 04:32:07 2024 +0700 Check AGC commit 5bbeb48 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Dec 21 14:15:31 2024 +0700 Debug print audio graph commit 631126f Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Dec 20 23:24:42 2024 +0700 Fix macOS vp commit e07b814 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Dec 17 12:28:55 2024 +0700 Clean up imports commit 1bdb158 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Dec 11 12:35:12 2024 +0700 Muted talker detection commit 0324b22 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Dec 16 21:11:45 2024 +0700 Rename AudioDeviceSink commit ed22ffb Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Dec 17 01:11:23 2024 +0700 Move to private method commit db00fe4 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Dec 11 00:16:55 2024 +0700 Other audio ducking commit a7282bd Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Dec 5 15:27:34 2024 +0700 AudioEngine commit d31187b Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Thu Dec 5 15:26:38 2024 +0700 Connect voice engine mute to adm commit 3df68d4 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Oct 11 20:41:44 2024 +0900 Revert "Stop recording on mute (turn off mic indicator) (#55)" This reverts commit c0209ef. commit bbe4412 Merge: 0aca080 f5243e3 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jan 17 09:43:21 2025 +0900 Merge branch 'm125_release' into hiroshi/livekit-m125 commit 0aca080 Merge: d29d62c b99fd2c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Dec 9 17:12:33 2024 +0700 Merge branch 'm125_release' into hiroshi/livekit-m125 commit d29d62c Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Oct 19 17:12:57 2024 +0900 Remove duplicate RTCCameraVideoCapturer init methods commit f50e159 Merge: 9742a13 cd6792e Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Oct 19 16:57:24 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 9742a13 Merge: 7c29b54 c38ce7f Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sat Oct 19 16:25:03 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 7c29b54 Merge: 6902a18 0ae5688 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Oct 18 04:34:17 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 6902a18 Merge: 00fd89c 7662c43 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Sep 24 03:14:40 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 00fd89c Merge: bd25079 3c17c96 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Mon Sep 23 18:42:48 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit bd25079 Merge: f8f9dc1 cdc3bba Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Sep 17 11:24:07 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit f8f9dc1 Merge: 67cf254 c852b0e Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Aug 21 01:36:38 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 67cf254 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Aug 14 01:48:35 2024 +0900 Prefix RTCDevice category commit d05816e Merge: 634b7d0 6bb47f5 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Wed Aug 14 01:27:36 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 634b7d0 Merge: 07d9a46 d1b814a Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jul 16 15:19:04 2024 +0800 Merge branch 'm125_release' into livekit-prefixed-m125 commit d1b814a Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun Jul 14 01:45:07 2024 +0900 Allow to pass in capture session to RTCCameraVideoCapturer commit 07d9a46 Merge: b6d07b8 7ddfc43 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Tue Jul 9 15:06:55 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit b6d07b8 Merge: 8b1c7f3 432a28b Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jun 21 04:52:40 2024 +0900 Merge branch 'm125_release' into livekit-prefixed-m125 commit 8b1c7f3 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jun 14 18:07:04 2024 +0900 LK prefixed framework commit aeef504 Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jun 14 16:53:16 2024 +0900 Network monitor always enabled commit fd6c13d Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jun 14 18:10:54 2024 +0900 Fix missing headers and Metal linking commit b1f993d Author: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Fri Jun 14 16:58:13 2024 +0900 Fix missing RTC_OBJC_TYPE macros
cloudwebrtc
pushed a commit
that referenced
this pull request
Mar 12, 2026
`SckHelper` in `modules/desktop_capture/mac/screen_capturer_sck.mm` is not wrapped with `RTC_OBJC_TYPE()`. When building with `rtc_objc_prefix`, this class is not renamed, causing ObjC runtime collisions if another copy of WebRTC is linked into the same binary. For context, there were previous omissions covered by these PRs: - #100 - #171 - #174
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Specifying the
rtc_objc_prefixflag fails the build for these symbols since the macro wasn't applied to them.