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

Side by Side Diff: talk/media/base/mediachannel.h

Issue 1500633002: Refactor handling of AudioOptions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years 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/media/base/fakemediaengine.h ('k') | talk/media/base/mediaengine.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 2004 Google Inc. 3 * Copyright 2004 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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 546
547 // |network_interface_| can be accessed from the worker_thread and 547 // |network_interface_| can be accessed from the worker_thread and
548 // from any MediaEngine threads. This critical section is to protect accessing 548 // from any MediaEngine threads. This critical section is to protect accessing
549 // of network_interface_ object. 549 // of network_interface_ object.
550 rtc::CriticalSection network_interface_crit_; 550 rtc::CriticalSection network_interface_crit_;
551 NetworkInterface* network_interface_; 551 NetworkInterface* network_interface_;
552 }; 552 };
553 553
554 enum SendFlags { 554 enum SendFlags {
555 SEND_NOTHING, 555 SEND_NOTHING,
556 SEND_RINGBACKTONE,
557 SEND_MICROPHONE 556 SEND_MICROPHONE
558 }; 557 };
559 558
560 // The stats information is structured as follows: 559 // The stats information is structured as follows:
561 // Media are represented by either MediaSenderInfo or MediaReceiverInfo. 560 // Media are represented by either MediaSenderInfo or MediaReceiverInfo.
562 // Media contains a vector of SSRC infos that are exclusively used by this 561 // Media contains a vector of SSRC infos that are exclusively used by this
563 // media. (SSRCs shared between media streams can't be represented.) 562 // media. (SSRCs shared between media streams can't be represented.)
564 563
565 // Information about an SSRC. 564 // Information about an SSRC.
566 // This data may be locally recorded, or received in an RTCP SR or RR. 565 // This data may be locally recorded, or received in an RTCP SR or RR.
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 // Signal when the media channel is ready to send the stream. Arguments are: 1203 // Signal when the media channel is ready to send the stream. Arguments are:
1205 // writable(bool) 1204 // writable(bool)
1206 sigslot::signal1<bool> SignalReadyToSend; 1205 sigslot::signal1<bool> SignalReadyToSend;
1207 // Signal for notifying that the remote side has closed the DataChannel. 1206 // Signal for notifying that the remote side has closed the DataChannel.
1208 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1207 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1209 }; 1208 };
1210 1209
1211 } // namespace cricket 1210 } // namespace cricket
1212 1211
1213 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1212 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/base/fakemediaengine.h ('k') | talk/media/base/mediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698