| Index: remoting/codec/video_encoder_vpx.h
|
| diff --git a/remoting/codec/video_encoder_vpx.h b/remoting/codec/video_encoder_vpx.h
|
| index 35d5f670e51513890c15be12ec92d8eb151ba1df..95a9bd660f10796658a20f33c0720e3001270b54 100644
|
| --- a/remoting/codec/video_encoder_vpx.h
|
| +++ b/remoting/codec/video_encoder_vpx.h
|
| @@ -27,8 +27,8 @@ namespace remoting {
|
| class VideoEncoderVpx : public VideoEncoder {
|
| public:
|
| // Create encoder for the specified protocol.
|
| - static scoped_ptr<VideoEncoderVpx> CreateForVP8();
|
| - static scoped_ptr<VideoEncoderVpx> CreateForVP9();
|
| + static std::unique_ptr<VideoEncoderVpx> CreateForVP8();
|
| + static std::unique_ptr<VideoEncoderVpx> CreateForVP9();
|
|
|
| ~VideoEncoderVpx() override;
|
|
|
| @@ -37,7 +37,8 @@ class VideoEncoderVpx : public VideoEncoder {
|
| // VideoEncoder interface.
|
| void SetLosslessEncode(bool want_lossless) override;
|
| void SetLosslessColor(bool want_lossless) override;
|
| - scoped_ptr<VideoPacket> Encode(const webrtc::DesktopFrame& frame) override;
|
| + std::unique_ptr<VideoPacket> Encode(
|
| + const webrtc::DesktopFrame& frame) override;
|
|
|
| private:
|
| explicit VideoEncoderVpx(bool use_vp9);
|
| @@ -74,11 +75,11 @@ class VideoEncoderVpx : public VideoEncoder {
|
| base::TimeTicks timestamp_base_;
|
|
|
| // VPX image and buffer to hold the actual YUV planes.
|
| - scoped_ptr<vpx_image_t> image_;
|
| - scoped_ptr<uint8_t[]> image_buffer_;
|
| + std::unique_ptr<vpx_image_t> image_;
|
| + std::unique_ptr<uint8_t[]> image_buffer_;
|
|
|
| // Active map used to optimize out processing of un-changed macroblocks.
|
| - scoped_ptr<uint8_t[]> active_map_;
|
| + std::unique_ptr<uint8_t[]> active_map_;
|
| webrtc::DesktopSize active_map_size_;
|
|
|
| // True if the codec wants unchanged frames to finish topping-off with.
|
|
|