commit 1112c30e1e5f5c7b4b517c4954ef3f15b989a996
author mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Sep 23 20:34:45 2013 +0000
committer mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Sep 23 20:34:45 2013 +0000
tree 5cf94d08e6c39cb56eba39bd1b9b0b9a8329eba5
parent e2af622edf68ca7613cc60d93ade19e44ff84770

Update libjingle to 53057474.

R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2274004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4818 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/media/base/mediachannel.h

diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index c73d20a..7431bc1 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -33,6 +33,7 @@
 
 #include "talk/base/basictypes.h"
 #include "talk/base/buffer.h"
+#include "talk/base/dscp.h"
 #include "talk/base/logging.h"
 #include "talk/base/sigslot.h"
 #include "talk/base/socket.h"
@@ -414,8 +415,12 @@
   class NetworkInterface {
    public:
     enum SocketType { ST_RTP, ST_RTCP };
-    virtual bool SendPacket(talk_base::Buffer* packet) = 0;
-    virtual bool SendRtcp(talk_base::Buffer* packet) = 0;
+    virtual bool SendPacket(
+        talk_base::Buffer* packet,
+        talk_base::DiffServCodePoint dscp = talk_base::DSCP_NO_CHANGE) = 0;
+    virtual bool SendRtcp(
+        talk_base::Buffer* packet,
+        talk_base::DiffServCodePoint dscp = talk_base::DSCP_NO_CHANGE) = 0;
     virtual int SetOption(SocketType type, talk_base::Socket::Option opt,
                           int option) = 0;
     virtual ~NetworkInterface() {}
@@ -862,10 +867,12 @@
 };
 
 enum DataMessageType {
-  // TODO(pthatcher):  Make this enum match the SCTP PPIDs that WebRTC uses?
-  DMT_CONTROL = 0,
-  DMT_BINARY = 1,
-  DMT_TEXT = 2,
+  // Chrome-Internal use only.  See SctpDataMediaChannel for the actual PPID
+  // values.
+  DMT_NONE = 0,
+  DMT_CONTROL = 1,
+  DMT_BINARY = 2,
+  DMT_TEXT = 3,
 };
 
 // Info about data received in DataMediaChannel.  For use in