Reason for revert: Breaks user code. Said code needs to stop using scoped_ptr! Original issue's description: > Remove webrtc/base/scoped_ptr.h > > BUG=webrtc:5520 > > NOTRY=True > > Committed: https://crrev.com/65fc62e9dd8a8716db625aaef76ab92f542ecc5a > Cr-Commit-Position: refs/heads/master@{#12684} TBR=tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5520 Review-Url: https://codereview.webrtc.org/1965063003 Cr-Commit-Position: refs/heads/master@{#12686}
56 lines
1.6 KiB
Objective-C
56 lines
1.6 KiB
Objective-C
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "WebRTC/RTCMediaConstraints.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "webrtc/api/mediaconstraintsinterface.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class MediaConstraints : public MediaConstraintsInterface {
|
|
public:
|
|
virtual ~MediaConstraints();
|
|
MediaConstraints();
|
|
MediaConstraints(
|
|
const MediaConstraintsInterface::Constraints& mandatory,
|
|
const MediaConstraintsInterface::Constraints& optional);
|
|
virtual const Constraints& GetMandatory() const;
|
|
virtual const Constraints& GetOptional() const;
|
|
|
|
private:
|
|
MediaConstraintsInterface::Constraints mandatory_;
|
|
MediaConstraintsInterface::Constraints optional_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
NS_ASSUME_NONNULL_BEGIN
|
|
|
|
@interface RTCMediaConstraints ()
|
|
|
|
/**
|
|
* A MediaConstraints representation of this RTCMediaConstraints object. This is
|
|
* needed to pass to the underlying C++ APIs.
|
|
*/
|
|
- (std::unique_ptr<webrtc::MediaConstraints>)nativeConstraints;
|
|
|
|
/** Return a native Constraints object representing these constraints */
|
|
+ (webrtc::MediaConstraintsInterface::Constraints)
|
|
nativeConstraintsForConstraints:
|
|
(NSDictionary<NSString *, NSString *> *)constraints;
|
|
|
|
@end
|
|
|
|
NS_ASSUME_NONNULL_END
|