Chromium Code Reviews| 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/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "jni/VideoCaptureFactory_jni.h" | 10 #include "jni/VideoCaptureFactory_jni.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 env, format.obj())) { | 109 env, format.obj())) { |
| 110 case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_YV12: | 110 case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_YV12: |
| 111 pixel_format = media::PIXEL_FORMAT_YV12; | 111 pixel_format = media::PIXEL_FORMAT_YV12; |
| 112 break; | 112 break; |
| 113 case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_NV21: | 113 case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_NV21: |
| 114 pixel_format = media::PIXEL_FORMAT_NV21; | 114 pixel_format = media::PIXEL_FORMAT_NV21; |
| 115 break; | 115 break; |
| 116 default: | 116 default: |
| 117 break; | 117 break; |
| 118 } | 118 } |
| 119 if (pixel_format == media::PIXEL_FORMAT_UNKNOWN) | |
|
tommi (sloooow) - chröme
2015/07/03 08:52:41
could we continue on the default label of the swit
| |
| 120 continue; | |
| 119 VideoCaptureFormat capture_format( | 121 VideoCaptureFormat capture_format( |
| 120 gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(env, | 122 gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(env, |
| 121 format.obj()), | 123 format.obj()), |
| 122 media::Java_VideoCaptureFactory_getCaptureFormatHeight(env, | 124 media::Java_VideoCaptureFactory_getCaptureFormatHeight(env, |
| 123 format.obj())), | 125 format.obj())), |
| 124 media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env, | 126 media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env, |
| 125 format.obj()), | 127 format.obj()), |
| 126 pixel_format); | 128 pixel_format); |
| 127 capture_formats->push_back(capture_format); | 129 capture_formats->push_back(capture_format); |
| 128 DVLOG(1) << device.name() << " " | 130 DVLOG(1) << device.name() << " " |
| 129 << VideoCaptureFormat::ToString(capture_format); | 131 << VideoCaptureFormat::ToString(capture_format); |
| 130 } | 132 } |
| 131 } | 133 } |
| 132 | 134 |
| 133 // static | 135 // static |
| 134 VideoCaptureDeviceFactory* | 136 VideoCaptureDeviceFactory* |
| 135 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( | 137 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( |
| 136 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { | 138 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { |
| 137 return new VideoCaptureDeviceFactoryAndroid(); | 139 return new VideoCaptureDeviceFactoryAndroid(); |
| 138 } | 140 } |
| 139 | 141 |
| 140 } // namespace media | 142 } // namespace media |
| OLD | NEW |