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

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

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last 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/libjingle_p2p_unittest.isolate ('k') | webrtc/media/engine/webrtcvoiceengine.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 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 11 #ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
12 #define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 12 #define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/basictypes.h" 17 #include "webrtc/base/basictypes.h"
18 #include "webrtc/base/buffer.h" 18 #include "webrtc/base/buffer.h"
19 #include "webrtc/base/dscp.h" 19 #include "webrtc/base/dscp.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/optional.h" 21 #include "webrtc/base/optional.h"
22 #include "webrtc/base/sigslot.h" 22 #include "webrtc/base/sigslot.h"
23 #include "webrtc/base/socket.h" 23 #include "webrtc/base/socket.h"
24 #include "webrtc/base/window.h" 24 #include "webrtc/base/window.h"
25 #include "webrtc/media/base/codec.h" 25 #include "webrtc/media/base/codec.h"
26 #include "webrtc/media/base/constants.h" 26 #include "webrtc/media/base/constants.h"
27 #include "webrtc/media/base/streamparams.h" 27 #include "webrtc/media/base/streamparams.h"
28 #include "webrtc/media/base/videosinkinterface.h" 28 #include "webrtc/media/base/videosinkinterface.h"
29 // TODO(juberti): re-evaluate this include 29 // TODO(juberti): re-evaluate this include
30 #include "talk/session/media/audiomonitor.h" 30 #include "webrtc/pc/audiomonitor.h"
31 31
32 namespace rtc { 32 namespace rtc {
33 class Buffer; 33 class Buffer;
34 class RateLimiter; 34 class RateLimiter;
35 class Timing; 35 class Timing;
36 } 36 }
37 37
38 namespace webrtc { 38 namespace webrtc {
39 class AudioSinkInterface; 39 class AudioSinkInterface;
40 } 40 }
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 // Signal when the media channel is ready to send the stream. Arguments are: 1111 // Signal when the media channel is ready to send the stream. Arguments are:
1112 // writable(bool) 1112 // writable(bool)
1113 sigslot::signal1<bool> SignalReadyToSend; 1113 sigslot::signal1<bool> SignalReadyToSend;
1114 // Signal for notifying that the remote side has closed the DataChannel. 1114 // Signal for notifying that the remote side has closed the DataChannel.
1115 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1115 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1116 }; 1116 };
1117 1117
1118 } // namespace cricket 1118 } // namespace cricket
1119 1119
1120 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ 1120 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/libjingle_p2p_unittest.isolate ('k') | webrtc/media/engine/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698