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

Side by Side Diff: talk/media/sctp/sctpdataengine.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanups after merge Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. and Robin Seggelmann 3 * Copyright 2012 Google Inc. and Robin Seggelmann
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 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 // This is that amount that we've observed. 977 // This is that amount that we've observed.
978 const int kSctpOverhead = 76; 978 const int kSctpOverhead = 76;
979 if (buffer->size() > (kSctpOverhead + kSctpMtu)) { 979 if (buffer->size() > (kSctpOverhead + kSctpMtu)) {
980 LOG(LS_ERROR) << debug_name_ << "->OnPacketFromSctpToNetwork(...): " 980 LOG(LS_ERROR) << debug_name_ << "->OnPacketFromSctpToNetwork(...): "
981 << "SCTP seems to have made a packet that is bigger " 981 << "SCTP seems to have made a packet that is bigger "
982 << "than its official MTU: " << buffer->size() 982 << "than its official MTU: " << buffer->size()
983 << " vs max of " << kSctpMtu 983 << " vs max of " << kSctpMtu
984 << " even after adding " << kSctpOverhead 984 << " even after adding " << kSctpOverhead
985 << " extra SCTP overhead"; 985 << " extra SCTP overhead";
986 } 986 }
987 MediaChannel::SendPacket(buffer); 987 MediaChannel::SendPacket(buffer, rtc::PacketOptions());
988 } 988 }
989 989
990 bool SctpDataMediaChannel::SendQueuedStreamResets() { 990 bool SctpDataMediaChannel::SendQueuedStreamResets() {
991 if (!sent_reset_streams_.empty() || queued_reset_streams_.empty()) 991 if (!sent_reset_streams_.empty() || queued_reset_streams_.empty())
992 return true; 992 return true;
993 993
994 LOG(LS_VERBOSE) << "SendQueuedStreamResets[" << debug_name_ << "]: Sending [" 994 LOG(LS_VERBOSE) << "SendQueuedStreamResets[" << debug_name_ << "]: Sending ["
995 << ListStreams(queued_reset_streams_) << "], Open: [" 995 << ListStreams(queued_reset_streams_) << "], Open: ["
996 << ListStreams(open_streams_) << "], Sent: [" 996 << ListStreams(open_streams_) << "], Sent: ["
997 << ListStreams(sent_reset_streams_) << "]"; 997 << ListStreams(sent_reset_streams_) << "]";
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 } 1037 }
1038 case MSG_SCTPOUTBOUNDPACKET: { 1038 case MSG_SCTPOUTBOUNDPACKET: {
1039 rtc::scoped_ptr<OutboundPacketMessage> pdata( 1039 rtc::scoped_ptr<OutboundPacketMessage> pdata(
1040 static_cast<OutboundPacketMessage*>(msg->pdata)); 1040 static_cast<OutboundPacketMessage*>(msg->pdata));
1041 OnPacketFromSctpToNetwork(pdata->data().get()); 1041 OnPacketFromSctpToNetwork(pdata->data().get());
1042 break; 1042 break;
1043 } 1043 }
1044 } 1044 }
1045 } 1045 }
1046 } // namespace cricket 1046 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698