commit c1aeaf0dc37d96f31c92f893f4e30e7a5f7cc2b7
author stefan <stefan@webrtc.org> Thu Oct 15 07:26:07 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 15 14:26:17 2015 +0000
tree bae8335df9007b063b355378e72f82b95e41eb1f
parent 543b6ca30a43eeb069c699291460ce6bacc7959d

Wire up packet_id / send time callbacks to webrtc via libjingle.

BUG=webrtc:4173

Review URL: https://codereview.webrtc.org/1363573002

Cr-Commit-Position: refs/heads/master@{#10289}

talk/media/base/mediachannel.h

diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index 05d56cf..900c51a 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -504,12 +504,10 @@
   class NetworkInterface {
    public:
     enum SocketType { ST_RTP, ST_RTCP };
-    virtual bool SendPacket(
-        rtc::Buffer* packet,
-        rtc::DiffServCodePoint dscp = rtc::DSCP_NO_CHANGE) = 0;
-    virtual bool SendRtcp(
-        rtc::Buffer* packet,
-        rtc::DiffServCodePoint dscp = rtc::DSCP_NO_CHANGE) = 0;
+    virtual bool SendPacket(rtc::Buffer* packet,
+                            const rtc::PacketOptions& options) = 0;
+    virtual bool SendRtcp(rtc::Buffer* packet,
+                          const rtc::PacketOptions& options) = 0;
     virtual int SetOption(SocketType type, rtc::Socket::Option opt,
                           int option) = 0;
     virtual ~NetworkInterface() {}
@@ -553,12 +551,12 @@
   }
 
   // Base method to send packet using NetworkInterface.
-  bool SendPacket(rtc::Buffer* packet) {
-    return DoSendPacket(packet, false);
+  bool SendPacket(rtc::Buffer* packet, const rtc::PacketOptions& options) {
+    return DoSendPacket(packet, false, options);
   }
 
-  bool SendRtcp(rtc::Buffer* packet) {
-    return DoSendPacket(packet, true);
+  bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options) {
+    return DoSendPacket(packet, true, options);
   }
 
   int SetOption(NetworkInterface::SocketType type,
@@ -587,13 +585,15 @@
   }
 
  private:
-  bool DoSendPacket(rtc::Buffer* packet, bool rtcp) {
+  bool DoSendPacket(rtc::Buffer* packet,
+                    bool rtcp,
+                    const rtc::PacketOptions& options) {
     rtc::CritScope cs(&network_interface_crit_);
     if (!network_interface_)
       return false;
 
-    return (!rtcp) ? network_interface_->SendPacket(packet) :
-                     network_interface_->SendRtcp(packet);
+    return (!rtcp) ? network_interface_->SendPacket(packet, options)
+                   : network_interface_->SendRtcp(packet, options);
   }
 
   // |network_interface_| can be accessed from the worker_thread and