| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "media/video/capture/android/video_capture_device_factory_android.h" | 5 #include "media/video/capture/android/video_capture_device_factory_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
| 8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 } | 113 } |
| 114 VideoCaptureFormat capture_format( | 114 VideoCaptureFormat capture_format( |
| 115 gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(env, | 115 gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(env, |
| 116 format.obj()), | 116 format.obj()), |
| 117 media::Java_VideoCaptureFactory_getCaptureFormatHeight(env, | 117 media::Java_VideoCaptureFactory_getCaptureFormatHeight(env, |
| 118 format.obj())), | 118 format.obj())), |
| 119 media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env, | 119 media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env, |
| 120 format.obj()), | 120 format.obj()), |
| 121 pixel_format); | 121 pixel_format); |
| 122 capture_formats->push_back(capture_format); | 122 capture_formats->push_back(capture_format); |
| 123 DVLOG(1) << device.name() << " resolution: " | 123 DVLOG(1) << device.name() << " " << capture_format.ToString(); |
| 124 << capture_format.frame_size.ToString() << ", fps: " | |
| 125 << capture_format.frame_rate << ", pixel format: " | |
| 126 << capture_format.pixel_format; | |
| 127 } | 124 } |
| 128 } | 125 } |
| 129 | 126 |
| 130 } // namespace media | 127 } // namespace media |
| OLD | NEW |