| 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 #include "webrtc/media/base/videoframe.h" |
| 34 #include "webrtc/media/base/videosinkinterface.h" | 35 #include "webrtc/media/base/videosinkinterface.h" |
| 35 #include "webrtc/media/base/videosourceinterface.h" | 36 #include "webrtc/media/base/videosourceinterface.h" |
| 36 // TODO(juberti): re-evaluate this include | 37 // TODO(juberti): re-evaluate this include |
| 37 #include "webrtc/pc/audiomonitor.h" | 38 #include "webrtc/pc/audiomonitor.h" |
| 38 | 39 |
| 39 namespace rtc { | 40 namespace rtc { |
| 40 class RateLimiter; | 41 class RateLimiter; |
| 41 class Timing; | 42 class Timing; |
| 42 } | 43 } |
| 43 | 44 |
| 44 namespace webrtc { | 45 namespace webrtc { |
| 45 class AudioSinkInterface; | 46 class AudioSinkInterface; |
| 46 } | 47 } |
| 47 | 48 |
| 48 namespace cricket { | 49 namespace cricket { |
| 49 | 50 |
| 50 class AudioSource; | 51 class AudioSource; |
| 51 class ScreencastId; | 52 class ScreencastId; |
| 52 class VideoCapturer; | 53 class VideoCapturer; |
| 54 // TODO(nisse): For some reason, forward declaration doens't work when |
| 55 // the definition is a "using" alias. |
| 56 #if 0 |
| 53 class VideoFrame; | 57 class VideoFrame; |
| 58 #endif |
| 54 struct RtpHeader; | 59 struct RtpHeader; |
| 55 struct VideoFormat; | 60 struct VideoFormat; |
| 56 | 61 |
| 57 const int kScreencastDefaultFps = 5; | 62 const int kScreencastDefaultFps = 5; |
| 58 | 63 |
| 59 template <class T> | 64 template <class T> |
| 60 static std::string ToStringIfSet(const char* key, const rtc::Optional<T>& val) { | 65 static std::string ToStringIfSet(const char* key, const rtc::Optional<T>& val) { |
| 61 std::string str; | 66 std::string str; |
| 62 if (val) { | 67 if (val) { |
| 63 str = key; | 68 str = key; |
| (...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1130 // Signal when the media channel is ready to send the stream. Arguments are: | 1135 // Signal when the media channel is ready to send the stream. Arguments are: |
| 1131 // writable(bool) | 1136 // writable(bool) |
| 1132 sigslot::signal1<bool> SignalReadyToSend; | 1137 sigslot::signal1<bool> SignalReadyToSend; |
| 1133 // Signal for notifying that the remote side has closed the DataChannel. | 1138 // Signal for notifying that the remote side has closed the DataChannel. |
| 1134 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; | 1139 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; |
| 1135 }; | 1140 }; |
| 1136 | 1141 |
| 1137 } // namespace cricket | 1142 } // namespace cricket |
| 1138 | 1143 |
| 1139 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1144 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
| OLD | NEW |