commit 4da058c0ddfee9041c04461dc50d15c766a8bcd4
author zhihuang <zhihuang@webrtc.org> Wed Feb 08 10:41:20 2017 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 08 18:41:20 2017 +0000
tree 0ef0e11155701aa95c3542e87a07d319bb2359bf
parent bb46b95dbea0857651c32883efc02bbac0f90c09

Create an Obj-C wrapper of the RtpReceiverObserverInterface.

Create the RTCRtpReceiverDelegate which is a wrapper over
webrtc::RtpReceiverObserverInterface.
The callback will be called whenever the first rtp packet is received.

Related CL: https://codereview.webrtc.org/2531333003/

BUG=webrtc:6742

Review-Url: https://codereview.webrtc.org/2641923003
Cr-Commit-Position: refs/heads/master@{#16501}

webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver+Private.h

diff --git a/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver+Private.h
index 14b68fa..3dc0285 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver+Private.h
@@ -14,6 +14,20 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+namespace webrtc {
+
+class RtpReceiverDelegateAdapter : public RtpReceiverObserverInterface {
+ public:
+  RtpReceiverDelegateAdapter(RTCRtpReceiver* receiver);
+
+  void OnFirstPacketReceived(cricket::MediaType media_type) override;
+
+ private:
+  __weak RTCRtpReceiver* receiver_;
+};
+
+}  // namespace webrtc
+
 @interface RTCRtpReceiver ()
 
 @property(nonatomic, readonly)
@@ -24,6 +38,8 @@
     (rtc::scoped_refptr<webrtc::RtpReceiverInterface>)nativeRtpReceiver
     NS_DESIGNATED_INITIALIZER;
 
++ (RTCRtpMediaType)mediaTypeForNativeMediaType:(cricket::MediaType)nativeMediaType;
+
 @end
 
 NS_ASSUME_NONNULL_END

webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver.mm

diff --git a/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver.mm b/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver.mm
index 46c0e65..ee10005 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCRtpReceiver.mm
@@ -17,10 +17,31 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 
+namespace webrtc {
+
+RtpReceiverDelegateAdapter::RtpReceiverDelegateAdapter(
+    RTCRtpReceiver *receiver) {
+  RTC_CHECK(receiver);
+  receiver_ = receiver;
+}
+
+void RtpReceiverDelegateAdapter::OnFirstPacketReceived(
+    cricket::MediaType media_type) {
+  RTCRtpMediaType packet_media_type =
+      [RTCRtpReceiver mediaTypeForNativeMediaType:media_type];
+  RTCRtpReceiver *receiver = receiver_;
+  [receiver.delegate rtpReceiver:receiver didReceiveFirstPacketForMediaType:packet_media_type];
+}
+
+}  // namespace webrtc
+
 @implementation RTCRtpReceiver {
   rtc::scoped_refptr<webrtc::RtpReceiverInterface> _nativeRtpReceiver;
+  std::unique_ptr<webrtc::RtpReceiverDelegateAdapter> _observer;
 }
 
+@synthesize delegate = _delegate;
+
 - (NSString *)receiverId {
   return [NSString stringForStdString:_nativeRtpReceiver->id()];
 }
@@ -81,8 +102,22 @@
     _nativeRtpReceiver = nativeRtpReceiver;
     RTCLogInfo(
         @"RTCRtpReceiver(%p): created receiver: %@", self, self.description);
+    _observer.reset(new webrtc::RtpReceiverDelegateAdapter(self));
+    _nativeRtpReceiver->SetObserver(_observer.get());
   }
   return self;
 }
 
++ (RTCRtpMediaType)mediaTypeForNativeMediaType:
+    (cricket::MediaType)nativeMediaType {
+  switch (nativeMediaType) {
+    case cricket::MEDIA_TYPE_AUDIO:
+      return RTCRtpMediaTypeAudio;
+    case cricket::MEDIA_TYPE_VIDEO:
+      return RTCRtpMediaTypeVideo;
+    case cricket::MEDIA_TYPE_DATA:
+      return RTCRtpMediaTypeData;
+  }
+}
+
 @end