add missed merges (#47)

GetStream · Nov 28, 2024 · a802e1c · a802e1c
1 parent 25e8120
commit a802e1c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h
@@ -290,6 +290,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
     }
     return send_codec()->rtx_time;
   }
+
  private:
   struct ChangedSenderParameters {
     // These optionals are unset if not changed.
@@ -734,9 +735,6 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
         rtc::scoped_refptr<webrtc::FrameTransformerInterface>
             frame_transformer);
 
-    void StartStream();
-    void StopStream();
-
     void SetLocalSsrc(uint32_t local_ssrc);
     void UpdateRtxSsrc(uint32_t ssrc);
     void StartReceiveStream();

diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
@@ -1649,6 +1649,7 @@ if (is_ios || is_mac) {
           "objc/components/video_codec/RTCVideoEncoderH264.h",
           "objc/components/video_frame_buffer/RTCCVPixelBuffer.h",
           "objc/helpers/RTCDispatcher.h",
+          "objc/helpers/RTCYUVHelper.h",
           # Added for Simulcast support
           "objc/components/video_codec/RTCVideoEncoderFactorySimulcast.h",
           "objc/api/video_codec/RTCVideoEncoderSimulcast.h",

diff --git a/sdk/objc/api/peerconnection/RTCAudioDeviceModule.h b/sdk/objc/api/peerconnection/RTCAudioDeviceModule.h
@@ -39,8 +39,8 @@ RTC_OBJC_EXPORT
 // Executes low-level API's in sequence to switch the device
 // Use outputDevice / inputDevice property unless you need to know if setting the device is
 // successful.
-- (BOOL)trySetOutputDevice:(nullable RTCIODevice *)device;
-- (BOOL)trySetInputDevice:(nullable RTCIODevice *)device;
+- (BOOL)trySetOutputDevice:(nullable RTC_OBJC_TYPE(RTCIODevice) *)device;
+- (BOOL)trySetInputDevice:(nullable RTC_OBJC_TYPE(RTCIODevice) *)device;
 
 - (BOOL)setDevicesUpdatedHandler: (nullable RTCOnAudioDevicesDidUpdate) handler;
 

diff --git a/sdk/objc/native/src/audio/audio_device_ios.mm b/sdk/objc/native/src/audio/audio_device_ios.mm
@@ -62,16 +62,6 @@
 const UInt16 kFixedPlayoutDelayEstimate = 30;
 const UInt16 kFixedRecordDelayEstimate = 30;
 
-enum AudioDeviceMessageType : uint32_t {
-  kMessageTypeInterruptionBegin,
-  kMessageTypeInterruptionEnd,
-  kMessageTypeValidRouteChange,
-  kMessageTypeCanPlayOrRecordChange,
-  kMessageTypePlayoutGlitchDetected,
-  kMessageOutputVolumeChange,
-  kMessageTypeAudioWillRecord,
-};
-
 using ios::CheckAndLogError;
 
 #if !defined(NDEBUG)