media/capture/content/thread_safe_capture_oracle.h - Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components

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/capture/content/thread_safe_capture_oracle.h

Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable warning 4267 in Win capture.gyp (probs. lost in the previous relanding). Rebase Created 4 years, 6 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 | « media/capture/content/smooth_event_sampler.h ('k') | media/capture/content/thread_safe_capture_oracle.cc » ('j') | media/capture/video/win/filter_base_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/content/thread_safe_capture_oracle.h

diff --git a/media/capture/content/thread_safe_capture_oracle.h b/media/capture/content/thread_safe_capture_oracle.h

index c4d4a8d80dbafd01742b57d00cee0734bcbe1208..f54315bc8b39e51c0442c8799520524c38bf5957 100644

--- a/media/capture/content/thread_safe_capture_oracle.h

+++ b/media/capture/content/thread_safe_capture_oracle.h

@@ -9,8 +9,8 @@

#include <string>

#include "base/memory/ref_counted.h"

-#include "media/base/media_export.h"

#include "media/base/video_frame.h"

+#include "media/capture/capture_export.h"

#include "media/capture/content/video_capture_oracle.h"

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

@@ -27,7 +27,7 @@ class VideoFrame;

// the VideoCaptureOracle, which decides which frames to capture, and a

// VideoCaptureDevice::Client, which allocates and receives the captured

// frames, in a lock to synchronize state between the two.

-class MEDIA_EXPORT ThreadSafeCaptureOracle

+class CAPTURE_EXPORT ThreadSafeCaptureOracle

: public base::RefCountedThreadSafe<ThreadSafeCaptureOracle> {

public:

ThreadSafeCaptureOracle(std::unique_ptr<VideoCaptureDevice::Client> client,