Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: talk/app/webrtc/datachannel.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/datachannel.h ('k') | talk/app/webrtc/java/jni/androidmediacodeccommon.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/datachannel.h" 28 #include "talk/app/webrtc/datachannel.h"
29 29
30 #include <string> 30 #include <string>
31 31
32 #include "talk/app/webrtc/mediastreamprovider.h" 32 #include "talk/app/webrtc/mediastreamprovider.h"
33 #include "talk/app/webrtc/sctputils.h" 33 #include "talk/app/webrtc/sctputils.h"
34 #include "talk/media/sctp/sctpdataengine.h"
35 #include "webrtc/base/logging.h" 34 #include "webrtc/base/logging.h"
36 #include "webrtc/base/refcount.h" 35 #include "webrtc/base/refcount.h"
36 #include "webrtc/media/sctp/sctpdataengine.h"
37 37
38 namespace webrtc { 38 namespace webrtc {
39 39
40 static size_t kMaxQueuedReceivedDataBytes = 16 * 1024 * 1024; 40 static size_t kMaxQueuedReceivedDataBytes = 16 * 1024 * 1024;
41 static size_t kMaxQueuedSendDataBytes = 16 * 1024 * 1024; 41 static size_t kMaxQueuedSendDataBytes = 16 * 1024 * 1024;
42 42
43 enum { 43 enum {
44 MSG_CHANNELREADY, 44 MSG_CHANNELREADY,
45 }; 45 };
46 46
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 QueueControlMessage(buffer); 646 QueueControlMessage(buffer);
647 } else { 647 } else {
648 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send" 648 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send"
649 << " the CONTROL message, send_result = " << send_result; 649 << " the CONTROL message, send_result = " << send_result;
650 Close(); 650 Close();
651 } 651 }
652 return retval; 652 return retval;
653 } 653 }
654 654
655 } // namespace webrtc 655 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/datachannel.h ('k') | talk/app/webrtc/java/jni/androidmediacodeccommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698