OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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_CALL_VIDEO_CONFIG_H_ | 11 #ifndef WEBRTC_CALL_VIDEO_CONFIG_H_ |
12 #define WEBRTC_CALL_VIDEO_CONFIG_H_ | 12 #define WEBRTC_CALL_VIDEO_CONFIG_H_ |
13 | 13 |
14 #include <string> | 14 #include <string> |
15 #include <vector> | 15 #include <vector> |
16 | 16 |
| 17 #include "webrtc/api/optional.h" |
17 #include "webrtc/common_types.h" | 18 #include "webrtc/common_types.h" |
18 #include "webrtc/rtc_base/basictypes.h" | 19 #include "webrtc/rtc_base/basictypes.h" |
19 #include "webrtc/rtc_base/optional.h" | |
20 #include "webrtc/rtc_base/refcount.h" | 20 #include "webrtc/rtc_base/refcount.h" |
21 #include "webrtc/rtc_base/scoped_ref_ptr.h" | 21 #include "webrtc/rtc_base/scoped_ref_ptr.h" |
22 #include "webrtc/typedefs.h" | 22 #include "webrtc/typedefs.h" |
23 | 23 |
24 namespace webrtc { | 24 namespace webrtc { |
25 | 25 |
26 struct VideoStream { | 26 struct VideoStream { |
27 VideoStream(); | 27 VideoStream(); |
28 ~VideoStream(); | 28 ~VideoStream(); |
29 std::string ToString() const; | 29 std::string ToString() const; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 | 148 |
149 private: | 149 private: |
150 // Access to the copy constructor is private to force use of the Copy() | 150 // Access to the copy constructor is private to force use of the Copy() |
151 // method for those exceptional cases where we do use it. | 151 // method for those exceptional cases where we do use it. |
152 VideoEncoderConfig(const VideoEncoderConfig&); | 152 VideoEncoderConfig(const VideoEncoderConfig&); |
153 }; | 153 }; |
154 | 154 |
155 } // namespace webrtc | 155 } // namespace webrtc |
156 | 156 |
157 #endif // WEBRTC_CALL_VIDEO_CONFIG_H_ | 157 #endif // WEBRTC_CALL_VIDEO_CONFIG_H_ |
OLD | NEW |