Skip to content

Commit a802e1c

Browse files
authored
add missed merges (#47)
1 parent 25e8120 commit a802e1c

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

media/engine/webrtc_video_engine.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
290290
}
291291
return send_codec()->rtx_time;
292292
}
293+
293294
private:
294295
struct ChangedSenderParameters {
295296
// These optionals are unset if not changed.
@@ -734,9 +735,6 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
734735
rtc::scoped_refptr<webrtc::FrameTransformerInterface>
735736
frame_transformer);
736737

737-
void StartStream();
738-
void StopStream();
739-
740738
void SetLocalSsrc(uint32_t local_ssrc);
741739
void UpdateRtxSsrc(uint32_t ssrc);
742740
void StartReceiveStream();

sdk/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,7 @@ if (is_ios || is_mac) {
16491649
"objc/components/video_codec/RTCVideoEncoderH264.h",
16501650
"objc/components/video_frame_buffer/RTCCVPixelBuffer.h",
16511651
"objc/helpers/RTCDispatcher.h",
1652+
"objc/helpers/RTCYUVHelper.h",
16521653
# Added for Simulcast support
16531654
"objc/components/video_codec/RTCVideoEncoderFactorySimulcast.h",
16541655
"objc/api/video_codec/RTCVideoEncoderSimulcast.h",

sdk/objc/api/peerconnection/RTCAudioDeviceModule.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ RTC_OBJC_EXPORT
3939
// Executes low-level API's in sequence to switch the device
4040
// Use outputDevice / inputDevice property unless you need to know if setting the device is
4141
// successful.
42-
- (BOOL)trySetOutputDevice:(nullable RTCIODevice *)device;
43-
- (BOOL)trySetInputDevice:(nullable RTCIODevice *)device;
42+
- (BOOL)trySetOutputDevice:(nullable RTC_OBJC_TYPE(RTCIODevice) *)device;
43+
- (BOOL)trySetInputDevice:(nullable RTC_OBJC_TYPE(RTCIODevice) *)device;
4444

4545
- (BOOL)setDevicesUpdatedHandler: (nullable RTCOnAudioDevicesDidUpdate) handler;
4646

sdk/objc/native/src/audio/audio_device_ios.mm

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@
6262
const UInt16 kFixedPlayoutDelayEstimate = 30;
6363
const UInt16 kFixedRecordDelayEstimate = 30;
6464

65-
enum AudioDeviceMessageType : uint32_t {
66-
kMessageTypeInterruptionBegin,
67-
kMessageTypeInterruptionEnd,
68-
kMessageTypeValidRouteChange,
69-
kMessageTypeCanPlayOrRecordChange,
70-
kMessageTypePlayoutGlitchDetected,
71-
kMessageOutputVolumeChange,
72-
kMessageTypeAudioWillRecord,
73-
};
74-
7565
using ios::CheckAndLogError;
7666

7767
#if !defined(NDEBUG)

0 commit comments

Comments
 (0)