Index: media/video/capture/android/video_capture_device_android.h |
diff --git a/media/video/capture/android/video_capture_device_android.h b/media/video/capture/android/video_capture_device_android.h |
index c9ab5d78dacb93dbfd698db57f3eab3af937cd55..3039a795ab4e266a24b4bae56e4040d5c0f0f6d0 100644 |
--- a/media/video/capture/android/video_capture_device_android.h |
+++ b/media/video/capture/android/video_capture_device_android.h |
@@ -29,9 +29,8 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice { |
static bool RegisterVideoCaptureDevice(JNIEnv* env); |
// VideoCaptureDevice implementation. |
- virtual void AllocateAndStart( |
- const VideoCaptureCapability& capture_format, |
- scoped_ptr<Client> client) OVERRIDE; |
+ virtual void AllocateAndStart(const VideoCaptureParams& params, |
+ scoped_ptr<Client> client) OVERRIDE; |
virtual void StopAndDeAllocate() OVERRIDE; |
// Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable. |
@@ -73,7 +72,7 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice { |
scoped_ptr<VideoCaptureDevice::Client> client_; |
Name device_name_; |
- VideoCaptureCapability current_settings_; |
+ VideoCaptureFormat capture_format_; |
// Java VideoCaptureAndroid instance. |
base::android::ScopedJavaGlobalRef<jobject> j_capture_; |