| 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 "WebRTC/RTCMediaConstraints.h" | 11 #import "WebRTC/RTCMediaConstraints.h" |
| 12 | 12 |
| 13 #include <memory> |
| 14 |
| 13 #include "webrtc/api/mediaconstraintsinterface.h" | 15 #include "webrtc/api/mediaconstraintsinterface.h" |
| 14 #include "webrtc/base/scoped_ptr.h" | 16 #include "webrtc/base/scoped_ptr.h" |
| 15 | 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( |
| (...skipping 11 matching lines...) Expand all Loading... |
| 34 | 36 |
| 35 | 37 |
| 36 NS_ASSUME_NONNULL_BEGIN | 38 NS_ASSUME_NONNULL_BEGIN |
| 37 | 39 |
| 38 @interface RTCMediaConstraints () | 40 @interface RTCMediaConstraints () |
| 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 - (std::unique_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<NSString *, NSString *> *)constraints; |
| 50 | 52 |
| 51 @end | 53 @end |
| 52 | 54 |
| 53 NS_ASSUME_NONNULL_END | 55 NS_ASSUME_NONNULL_END |
| OLD | NEW |