| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ | 5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ |
| 6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ | 6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 std::list<base::Closure> photo_requests_queue_; | 130 std::list<base::Closure> photo_requests_queue_; |
| 131 | 131 |
| 132 base::TimeTicks expected_next_frame_time_; | 132 base::TimeTicks expected_next_frame_time_; |
| 133 base::TimeTicks first_ref_time_; | 133 base::TimeTicks first_ref_time_; |
| 134 base::TimeDelta frame_interval_; | 134 base::TimeDelta frame_interval_; |
| 135 | 135 |
| 136 // List of |photo_callbacks_| in flight, being served in Java side. | 136 // List of |photo_callbacks_| in flight, being served in Java side. |
| 137 base::Lock photo_callbacks_lock_; | 137 base::Lock photo_callbacks_lock_; |
| 138 std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_; | 138 std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_; |
| 139 | 139 |
| 140 gfx::Size next_photo_resolution_; | |
| 141 | |
| 142 const VideoCaptureDeviceDescriptor device_descriptor_; | 140 const VideoCaptureDeviceDescriptor device_descriptor_; |
| 143 VideoCaptureFormat capture_format_; | 141 VideoCaptureFormat capture_format_; |
| 144 | 142 |
| 145 // Java VideoCaptureAndroid instance. | 143 // Java VideoCaptureAndroid instance. |
| 146 base::android::ScopedJavaLocalRef<jobject> j_capture_; | 144 base::android::ScopedJavaLocalRef<jobject> j_capture_; |
| 147 | 145 |
| 148 base::WeakPtrFactory<VideoCaptureDeviceAndroid> weak_ptr_factory_; | 146 base::WeakPtrFactory<VideoCaptureDeviceAndroid> weak_ptr_factory_; |
| 149 | 147 |
| 150 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid); | 148 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid); |
| 151 }; | 149 }; |
| 152 | 150 |
| 153 } // namespace media | 151 } // namespace media |
| 154 | 152 |
| 155 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ | 153 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ |
| OLD | NEW |