commit d64719d8954262fee94e7615422f3d027dc1ae6b
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 01 00:00:07 2013
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Aug 01 00:00:07 2013
tree be44e3a28ec2db5932ec505d85522e69b05dcc14
parent d3ae3c7b1fc08152e54775c6eae0a716c6383be2

Update libjingle to 50191337.

R=mallinath@webrtc.org

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

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

talk/session/media/channel.h

diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 9bac965..eccadd3 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -595,9 +595,9 @@
     return static_cast<DataMediaChannel*>(BaseChannel::media_channel());
   }
 
-  bool SendData(const SendDataParams& params,
-                const talk_base::Buffer& payload,
-                SendDataResult* result);
+  virtual bool SendData(const SendDataParams& params,
+                        const talk_base::Buffer& payload,
+                        SendDataResult* result);
 
   void StartMediaMonitor(int cms);
   void StopMediaMonitor();
@@ -612,9 +612,8 @@
                    const talk_base::Buffer&>
       SignalDataReceived;
   // Signal for notifying when the channel becomes ready to send data.
-  // That occurs when the channel is enabled, the transport is writable and
-  // both local and remote descriptions are set.
-  // TODO(perkj): Signal this per SSRC stream.
+  // That occurs when the channel is enabled, the transport is writable,
+  // both local and remote descriptions are set, and the channel is unblocked.
   sigslot::signal1<bool> SignalReadyToSendData;
 
  private:
@@ -647,6 +646,8 @@
     const talk_base::Buffer payload;
   };
 
+  typedef talk_base::TypedMessageData<bool> DataChannelReadyToSendMessageData;
+
   // overrides from BaseChannel
   virtual const ContentInfo* GetFirstContent(const SessionDescription* sdesc);
   // If data_channel_type_ is DCT_NONE, set it.  Otherwise, check that
@@ -674,6 +675,7 @@
   void OnDataReceived(
       const ReceiveDataParams& params, const char* data, size_t len);
   void OnDataChannelError(uint32 ssrc, DataMediaChannel::Error error);
+  void OnDataChannelReadyToSend(bool writable);
   void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
 
   talk_base::scoped_ptr<DataMediaMonitor> media_monitor_;