add missed merges (#47)

# Conflicts:
#	sdk/objc/native/src/audio/audio_device_ios.mm

Author: santhoshvai

media/engine/webrtc_video_engine.h

@@ -286,6 +286,7 @@ class WebRtcVideoSendChannel : public MediaChannelUtil,
     }
     return send_codec()->rtx_time;
   }
+
  private:
   struct ChangedSenderParameters {
     // These optionals are unset if not changed.
@@ -719,9 +720,6 @@ class WebRtcVideoReceiveChannel : public MediaChannelUtil,
     void SetDepacketizerToDecoderFrameTransformer(
         scoped_refptr<FrameTransformerInterface> frame_transformer);
 
-    void StartStream();
-    void StopStream();
-
     void SetLocalSsrc(uint32_t local_ssrc);
     void UpdateRtxSsrc(uint32_t ssrc);
     void StartReceiveStream();

sdk/BUILD.gn

@@ -1574,6 +1574,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",

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;