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

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

Issue 1646253004: Split out dscp option from VideoOptions to new struct MediaChannelOptions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. 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 | « webrtc/media/base/videoengine_unittest.h ('k') | webrtc/media/webrtc/nullwebrtcvideoengine.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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 if (!channel) { 357 if (!channel) {
358 LOG(LS_ERROR) << "SendThresholdCallback: Failed to get channel for socket " 358 LOG(LS_ERROR) << "SendThresholdCallback: Failed to get channel for socket "
359 << sock; 359 << sock;
360 return 0; 360 return 0;
361 } 361 }
362 channel->OnSendThresholdCallback(); 362 channel->OnSendThresholdCallback();
363 return 0; 363 return 0;
364 } 364 }
365 365
366 SctpDataMediaChannel::SctpDataMediaChannel(rtc::Thread* thread) 366 SctpDataMediaChannel::SctpDataMediaChannel(rtc::Thread* thread)
367 : worker_thread_(thread), 367 : DataMediaChannel(MediaChannelOptions()),
368 worker_thread_(thread),
368 local_port_(kSctpDefaultPort), 369 local_port_(kSctpDefaultPort),
369 remote_port_(kSctpDefaultPort), 370 remote_port_(kSctpDefaultPort),
370 sock_(NULL), 371 sock_(NULL),
371 sending_(false), 372 sending_(false),
372 receiving_(false), 373 receiving_(false),
373 debug_name_("SctpDataMediaChannel") { 374 debug_name_("SctpDataMediaChannel") {
374 } 375 }
375 376
376 SctpDataMediaChannel::~SctpDataMediaChannel() { 377 SctpDataMediaChannel::~SctpDataMediaChannel() {
377 CloseSctpSocket(); 378 CloseSctpSocket();
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 } 1045 }
1045 case MSG_SCTPOUTBOUNDPACKET: { 1046 case MSG_SCTPOUTBOUNDPACKET: {
1046 rtc::scoped_ptr<OutboundPacketMessage> pdata( 1047 rtc::scoped_ptr<OutboundPacketMessage> pdata(
1047 static_cast<OutboundPacketMessage*>(msg->pdata)); 1048 static_cast<OutboundPacketMessage*>(msg->pdata));
1048 OnPacketFromSctpToNetwork(pdata->data().get()); 1049 OnPacketFromSctpToNetwork(pdata->data().get());
1049 break; 1050 break;
1050 } 1051 }
1051 } 1052 }
1052 } 1053 }
1053 } // namespace cricket 1054 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/base/videoengine_unittest.h ('k') | webrtc/media/webrtc/nullwebrtcvideoengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698