OLD | NEW |
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 |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "webrtc/base/logging.h" | 24 #include "webrtc/base/logging.h" |
25 #include "webrtc/base/networkroute.h" | 25 #include "webrtc/base/networkroute.h" |
26 #include "webrtc/base/optional.h" | 26 #include "webrtc/base/optional.h" |
27 #include "webrtc/base/sigslot.h" | 27 #include "webrtc/base/sigslot.h" |
28 #include "webrtc/base/socket.h" | 28 #include "webrtc/base/socket.h" |
29 #include "webrtc/base/window.h" | 29 #include "webrtc/base/window.h" |
30 #include "webrtc/config.h" | 30 #include "webrtc/config.h" |
31 #include "webrtc/media/base/codec.h" | 31 #include "webrtc/media/base/codec.h" |
32 #include "webrtc/media/base/mediaconstants.h" | 32 #include "webrtc/media/base/mediaconstants.h" |
33 #include "webrtc/media/base/streamparams.h" | 33 #include "webrtc/media/base/streamparams.h" |
| 34 // TODO(nisse): Temporarily; to be replaced with a forward declaration |
| 35 // of webrtc::VideoFrame when dependency on cricket::VideoFrame is deleted. |
| 36 #include "webrtc/media/base/videoframe.h" |
34 #include "webrtc/media/base/videosinkinterface.h" | 37 #include "webrtc/media/base/videosinkinterface.h" |
35 #include "webrtc/media/base/videosourceinterface.h" | 38 #include "webrtc/media/base/videosourceinterface.h" |
36 // TODO(juberti): re-evaluate this include | 39 // TODO(juberti): re-evaluate this include |
37 #include "webrtc/pc/audiomonitor.h" | 40 #include "webrtc/pc/audiomonitor.h" |
38 | 41 |
39 namespace rtc { | 42 namespace rtc { |
40 class RateLimiter; | 43 class RateLimiter; |
41 class Timing; | 44 class Timing; |
42 } | 45 } |
43 | 46 |
44 namespace webrtc { | 47 namespace webrtc { |
45 class AudioSinkInterface; | 48 class AudioSinkInterface; |
46 } | 49 } |
47 | 50 |
48 namespace cricket { | 51 namespace cricket { |
49 | 52 |
50 class AudioSource; | 53 class AudioSource; |
51 class ScreencastId; | 54 class ScreencastId; |
52 class VideoCapturer; | 55 class VideoCapturer; |
53 class VideoFrame; | |
54 struct RtpHeader; | 56 struct RtpHeader; |
55 struct VideoFormat; | 57 struct VideoFormat; |
56 | 58 |
57 const int kScreencastDefaultFps = 5; | 59 const int kScreencastDefaultFps = 5; |
58 | 60 |
59 template <class T> | 61 template <class T> |
60 static std::string ToStringIfSet(const char* key, const rtc::Optional<T>& val) { | 62 static std::string ToStringIfSet(const char* key, const rtc::Optional<T>& val) { |
61 std::string str; | 63 std::string str; |
62 if (val) { | 64 if (val) { |
63 str = key; | 65 str = key; |
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1132 // Signal when the media channel is ready to send the stream. Arguments are: | 1134 // Signal when the media channel is ready to send the stream. Arguments are: |
1133 // writable(bool) | 1135 // writable(bool) |
1134 sigslot::signal1<bool> SignalReadyToSend; | 1136 sigslot::signal1<bool> SignalReadyToSend; |
1135 // Signal for notifying that the remote side has closed the DataChannel. | 1137 // Signal for notifying that the remote side has closed the DataChannel. |
1136 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 1138 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; |
1137 }; | 1139 }; |
1138 | 1140 |
1139 } // namespace cricket | 1141 } // namespace cricket |
1140 | 1142 |
1141 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1143 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
OLD | NEW |