OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 #import "RTCMediaConstraints.h" | 11 #import "RTCMediaConstraints.h" |
12 | 12 |
13 #include "webrtc/api/mediaconstraintsinterface.h" | 13 #include "webrtc/api/mediaconstraintsinterface.h" |
14 #include "webrtc/base/scoped_ptr.h" | 14 #include "webrtc/base/scoped_ptr.h" |
15 | 15 |
| 16 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 |
| 17 |
16 namespace webrtc { | 18 namespace webrtc { |
17 | 19 |
18 class MediaConstraints : public MediaConstraintsInterface { | 20 class MediaConstraints : public MediaConstraintsInterface { |
19 public: | 21 public: |
20 virtual ~MediaConstraints(); | 22 virtual ~MediaConstraints(); |
21 MediaConstraints(); | 23 MediaConstraints(); |
22 MediaConstraints( | 24 MediaConstraints( |
23 const MediaConstraintsInterface::Constraints& mandatory, | 25 const MediaConstraintsInterface::Constraints& mandatory, |
24 const MediaConstraintsInterface::Constraints& optional); | 26 const MediaConstraintsInterface::Constraints& optional); |
25 virtual const Constraints& GetMandatory() const; | 27 virtual const Constraints& GetMandatory() const; |
(...skipping 13 matching lines...) Expand all Loading... |
39 | 41 |
40 /** | 42 /** |
41 * A MediaConstraints representation of this RTCMediaConstraints object. This is | 43 * A MediaConstraints representation of this RTCMediaConstraints object. This is |
42 * needed to pass to the underlying C++ APIs. | 44 * needed to pass to the underlying C++ APIs. |
43 */ | 45 */ |
44 - (rtc::scoped_ptr<webrtc::MediaConstraints>)nativeConstraints; | 46 - (rtc::scoped_ptr<webrtc::MediaConstraints>)nativeConstraints; |
45 | 47 |
46 /** Return a native Constraints object representing these constraints */ | 48 /** Return a native Constraints object representing these constraints */ |
47 + (webrtc::MediaConstraintsInterface::Constraints) | 49 + (webrtc::MediaConstraintsInterface::Constraints) |
48 nativeConstraintsForConstraints: | 50 nativeConstraintsForConstraints: |
49 (NSDictionary<NSString *, NSString *> *)constraints; | 51 (NSDictionary *)constraints; |
| 52 // (NSDictionary<NSString *, NSString *> *)constraints; |
50 | 53 |
51 @end | 54 @end |
52 | 55 |
53 NS_ASSUME_NONNULL_END | 56 NS_ASSUME_NONNULL_END |
OLD | NEW |