Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: device/capture/video/android/video_capture_device_factory_android.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « device/capture/video/android/video_capture_device_factory_android.h ('k') | device/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698