Index: remoting/codec/video_encoder_helper.h |
diff --git a/remoting/codec/video_encoder_helper.h b/remoting/codec/video_encoder_helper.h |
index 65e4acc0d123d90ca35d7797e358348100087213..5e7f50402eaf874959a5b73f745e7bc46a5de9f5 100644 |
--- a/remoting/codec/video_encoder_helper.h |
+++ b/remoting/codec/video_encoder_helper.h |
@@ -5,8 +5,9 @@ |
#ifndef REMOTING_CODEC_VIDEO_ENCODER_HELPER_H_ |
#define REMOTING_CODEC_VIDEO_ENCODER_HELPER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
namespace webrtc { |
@@ -26,15 +27,17 @@ class VideoEncoderHelper { |
// list, frame shape if any) initialized based on the supplied |frame|. |
// Screen width and height will be set iff |frame|'s size differs from that |
// of the previously-supplied frame. |
- scoped_ptr<VideoPacket> CreateVideoPacket(const webrtc::DesktopFrame& frame); |
+ std::unique_ptr<VideoPacket> CreateVideoPacket( |
+ const webrtc::DesktopFrame& frame); |
// Returns a new VideoPacket with the common fields populated from |frame|, |
// but the updated rects overridden by |updated_region|. This is useful for |
// encoders which alter the updated region e.g. by expanding it to macroblock |
// boundaries. |
- scoped_ptr<VideoPacket> CreateVideoPacketWithUpdatedRegion( |
+ std::unique_ptr<VideoPacket> CreateVideoPacketWithUpdatedRegion( |
const webrtc::DesktopFrame& frame, |
const webrtc::DesktopRegion& updated_region); |
+ |
private: |
// The most recent screen size. Used to detect screen size changes. |
webrtc::DesktopSize screen_size_; |