webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h - Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc ('k') | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

index f75a1588029f1a642408f32660175b341e39c27a..777ac1ba368c5546000ba1b78601549d3689357b 100644

--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h

@@ -12,10 +12,10 @@

#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_

#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_

+#include <memory>

#include <string>

#include <vector>

-#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"

namespace webrtc {

@@ -110,8 +110,8 @@ class SimulcastEncoderAdapter : public VP8Encoder {

bool Initialized() const;

- rtc::scoped_ptr<VideoEncoderFactory> factory_;

- rtc::scoped_ptr<TemporalLayersFactory> screensharing_tl_factory_;

+ std::unique_ptr<VideoEncoderFactory> factory_;

+ std::unique_ptr<TemporalLayersFactory> screensharing_tl_factory_;

VideoCodec codec_;

std::vector<StreamInfo> streaminfos_;

EncodedImageCallback* encoded_complete_callback_;