zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/

Browse Source 
BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1738863002

Cr-Commit-Position: refs/heads/master@{#11836}
This commit is contained in:
kwiberg
2016-03-02 01:01:11 -08:00
committed by Commit bot
parent 4eb1ddd817
commit e065fcf9a9
18 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_capture/linux/video_capture_linux.h
View File

@ -11,6 +11,8 @@
#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_
#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_
#include <memory>
#include "webrtc/base/platform_thread.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/video_capture/video_capture_impl.h"
@ -39,8 +41,8 @@ private:
bool AllocateVideoBuffers();
bool DeAllocateVideoBuffers();
// TODO(pbos): Stop using scoped_ptr and resetting the thread.
rtc::scoped_ptr<rtc::PlatformThread> _captureThread;
// TODO(pbos): Stop using unique_ptr and resetting the thread.
std::unique_ptr<rtc::PlatformThread> _captureThread;
CriticalSectionWrapper* _captureCritSect;
int32_t _deviceId;