| Index: device/capture/video/android/video_capture_device_factory_android.cc
|
| diff --git a/media/capture/video/android/video_capture_device_factory_android.cc b/device/capture/video/android/video_capture_device_factory_android.cc
|
| similarity index 87%
|
| rename from media/capture/video/android/video_capture_device_factory_android.cc
|
| rename to device/capture/video/android/video_capture_device_factory_android.cc
|
| index 3a65bda12e8b71c4b2c3f9573b7ba0a5b5feb5bb..6bbc0269486c73ad5f08bdfdfbaa48a8febaf8fb 100644
|
| --- a/media/capture/video/android/video_capture_device_factory_android.cc
|
| +++ b/device/capture/video/android/video_capture_device_factory_android.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/capture/video/android/video_capture_device_factory_android.h"
|
| +#include "device/capture/video/android/video_capture_device_factory_android.h"
|
|
|
| #include <utility>
|
|
|
| @@ -10,13 +10,13 @@
|
| #include "base/android/jni_string.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/stringprintf.h"
|
| +#include "device/capture/video/android/video_capture_device_android.h"
|
| #include "jni/VideoCaptureFactory_jni.h"
|
| -#include "media/capture/video/android/video_capture_device_android.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| using base::android::ScopedJavaLocalRef;
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // static
|
| ScopedJavaLocalRef<jobject>
|
| @@ -105,7 +105,7 @@ void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
|
|
|
| VideoPixelFormat pixel_format =
|
| media::PIXEL_FORMAT_UNKNOWN;
|
| - switch (media::Java_VideoCaptureFactory_getCaptureFormatPixelFormat(
|
| + switch (Java_VideoCaptureFactory_getCaptureFormatPixelFormat(
|
| env, format.obj())) {
|
| case VideoCaptureDeviceAndroid::ANDROID_IMAGE_FORMAT_YV12:
|
| pixel_format = media::PIXEL_FORMAT_YV12;
|
| @@ -117,12 +117,10 @@ void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
|
| continue;
|
| }
|
| VideoCaptureFormat capture_format(
|
| - gfx::Size(media::Java_VideoCaptureFactory_getCaptureFormatWidth(
|
| - env, format.obj()),
|
| - media::Java_VideoCaptureFactory_getCaptureFormatHeight(
|
| - env, format.obj())),
|
| - media::Java_VideoCaptureFactory_getCaptureFormatFramerate(env,
|
| - format.obj()),
|
| + gfx::Size(
|
| + Java_VideoCaptureFactory_getCaptureFormatWidth(env, format.obj()),
|
| + Java_VideoCaptureFactory_getCaptureFormatHeight(env, format.obj())),
|
| + Java_VideoCaptureFactory_getCaptureFormatFramerate(env, format.obj()),
|
| pixel_format);
|
| capture_formats->push_back(capture_format);
|
| DVLOG(1) << device.display_name << " "
|
| @@ -137,4 +135,4 @@ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
|
| return new VideoCaptureDeviceFactoryAndroid();
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|