trunk/src/media/video/capture/android/video_capture_device_android.h - Issue 84393002: Revert 236927 "Reorganize media::VideoCapture* types"

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: trunk/src/media/video/capture/android/video_capture_device_android.h

Issue 84393002: Revert 236927 "Reorganize media::VideoCapture* types" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 1 month 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: trunk/src/media/video/capture/android/video_capture_device_android.h

===================================================================

--- trunk/src/media/video/capture/android/video_capture_device_android.h (revision 236934)

+++ trunk/src/media/video/capture/android/video_capture_device_android.h (working copy)

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

static bool RegisterVideoCaptureDevice(JNIEnv* env);

// VideoCaptureDevice implementation.

- virtual void AllocateAndStart(const VideoCaptureParams& params,

- scoped_ptr<Client> client) OVERRIDE;

+ virtual void AllocateAndStart(

+ const VideoCaptureCapability& capture_format,

+ scoped_ptr<Client> client) OVERRIDE;

virtual void StopAndDeAllocate() OVERRIDE;

// Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable.

@@ -72,7 +73,7 @@

scoped_ptr<VideoCaptureDevice::Client> client_;

Name device_name_;

- VideoCaptureFormat capture_format_;

+ VideoCaptureCapability current_settings_;

// Java VideoCaptureAndroid instance.

base::android::ScopedJavaGlobalRef<jobject> j_capture_;