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

Unified Diff: webrtc/modules/video_capture/android/device_info_android.h

Issue 1347083003: Remove the video capture module on Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed Android Java files Created 5 years, 3 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
« no previous file with comments | « webrtc/modules/video_capture/BUILD.gn ('k') | webrtc/modules/video_capture/android/device_info_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_capture/android/device_info_android.h
diff --git a/webrtc/modules/video_capture/android/device_info_android.h b/webrtc/modules/video_capture/android/device_info_android.h
deleted file mode 100644
index 581312bcb31d99478da3a1d72ce90d7b1628ef6d..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_capture/android/device_info_android.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_
-
-#include <jni.h>
-
-#include "webrtc/modules/video_capture/device_info_impl.h"
-#include "webrtc/modules/video_capture/video_capture_impl.h"
-
-namespace webrtc
-{
-namespace videocapturemodule
-{
-
-class DeviceInfoAndroid : public DeviceInfoImpl {
- public:
- static void Initialize(JNIEnv* env);
- static void DeInitialize();
-
- DeviceInfoAndroid(int32_t id);
- virtual ~DeviceInfoAndroid();
-
- // Set |*index| to the index of the camera matching |deviceUniqueIdUTF8|, or
- // return false if no match.
- bool FindCameraIndex(const char* deviceUniqueIdUTF8, size_t* index);
-
- virtual int32_t Init();
- virtual uint32_t NumberOfDevices();
- virtual int32_t GetDeviceName(
- uint32_t deviceNumber,
- char* deviceNameUTF8,
- uint32_t deviceNameLength,
- char* deviceUniqueIdUTF8,
- uint32_t deviceUniqueIdUTF8Length,
- char* productUniqueIdUTF8 = 0,
- uint32_t productUniqueIdUTF8Length = 0);
- virtual int32_t CreateCapabilityMap(const char* deviceUniqueIdUTF8);
-
- virtual int32_t DisplayCaptureSettingsDialogBox(
- const char* /*deviceUniqueIdUTF8*/,
- const char* /*dialogTitleUTF8*/,
- void* /*parentWindow*/,
- uint32_t /*positionX*/,
- uint32_t /*positionY*/) { return -1; }
- virtual int32_t GetOrientation(const char* deviceUniqueIdUTF8,
- VideoRotation& orientation);
-
- // Populate |min_mfps| and |max_mfps| with the closest supported range of the
- // device to |max_fps_to_match|.
- void GetMFpsRange(const char* deviceUniqueIdUTF8,
- int max_fps_to_match,
- int* min_mfps,
- int* max_mfps);
-
- private:
- enum { kExpectedCaptureDelay = 190};
-};
-
-} // namespace videocapturemodule
-} // namespace webrtc
-
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_
« no previous file with comments | « webrtc/modules/video_capture/BUILD.gn ('k') | webrtc/modules/video_capture/android/device_info_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698