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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 bool got_first_frame_; | 97 bool got_first_frame_; |
98 base::TimeTicks expected_next_frame_time_; | 98 base::TimeTicks expected_next_frame_time_; |
99 base::TimeTicks first_ref_time_; | 99 base::TimeTicks first_ref_time_; |
100 base::TimeDelta frame_interval_; | 100 base::TimeDelta frame_interval_; |
101 std::unique_ptr<VideoCaptureDevice::Client> client_; | 101 std::unique_ptr<VideoCaptureDevice::Client> client_; |
102 | 102 |
103 // List of |photo_callbacks_| in flight, being served in Java side. | 103 // List of |photo_callbacks_| in flight, being served in Java side. |
104 base::Lock photo_callbacks_lock_; | 104 base::Lock photo_callbacks_lock_; |
105 std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_; | 105 std::list<std::unique_ptr<TakePhotoCallback>> photo_callbacks_; |
106 | 106 |
| 107 gfx::Size next_photo_resolution_; |
| 108 |
107 Name device_name_; | 109 Name device_name_; |
108 VideoCaptureFormat capture_format_; | 110 VideoCaptureFormat capture_format_; |
109 | 111 |
110 // Java VideoCaptureAndroid instance. | 112 // Java VideoCaptureAndroid instance. |
111 base::android::ScopedJavaLocalRef<jobject> j_capture_; | 113 base::android::ScopedJavaLocalRef<jobject> j_capture_; |
112 | 114 |
113 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid); | 115 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid); |
114 }; | 116 }; |
115 | 117 |
116 } // namespace media | 118 } // namespace media |
117 | 119 |
118 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ | 120 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_ |
OLD | NEW |