media/video/capture/linux/video_capture_device_linux.h - Issue 197873014: Revert of Implement ScopedFD in terms of ScopedGeneric.

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: media/video/capture/linux/video_capture_device_linux.h

Issue 197873014: Revert of Implement ScopedFD in terms of ScopedGeneric. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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:

Index: media/video/capture/linux/video_capture_device_linux.h

diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h

index 6a8dcee126163e987cdbd1eb8961b3b05da2b9c2..4cc1597a8bcb81530cca27e662bea026762568e8 100644

--- a/media/video/capture/linux/video_capture_device_linux.h

+++ b/media/video/capture/linux/video_capture_device_linux.h

@@ -13,7 +13,6 @@

#include <string>

#include "base/file_util.h"

-#include "base/files/scoped_file.h"

#include "base/threading/thread.h"

#include "media/video/capture/video_capture_device.h"

#include "media/video/capture/video_capture_types.h"

@@ -61,7 +60,8 @@

InternalState state_;

scoped_ptr<VideoCaptureDevice::Client> client_;

Name device_name_;

- base::ScopedFD device_fd_; // File descriptor for the opened camera device.

+ int device_fd_; // File descriptor for the opened camera device.

+ file_util::ScopedFD device_fd_closer_;

base::Thread v4l2_thread_; // Thread used for reading data from the device.

Buffer* buffer_pool_;

int buffer_pool_size_; // Number of allocated buffers.