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

Unified Diff: webrtc/modules/video_capture/android/video_capture_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
Index: webrtc/modules/video_capture/android/video_capture_android.h
diff --git a/webrtc/modules/video_capture/android/video_capture_android.h b/webrtc/modules/video_capture/android/video_capture_android.h
deleted file mode 100644
index 8c1e7d3c8bafae7741de3a50a025a78c168c1c44..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_capture/android/video_capture_android.h
+++ /dev/null
@@ -1,50 +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_VIDEO_CAPTURE_ANDROID_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_VIDEO_CAPTURE_ANDROID_H_
-
-#include <jni.h>
-
-#include "webrtc/modules/video_capture/android/device_info_android.h"
-#include "webrtc/modules/video_capture/video_capture_impl.h"
-
-namespace webrtc {
-namespace videocapturemodule {
-
-class VideoCaptureAndroid : public VideoCaptureImpl {
- public:
- VideoCaptureAndroid(const int32_t id);
- virtual int32_t Init(const int32_t id, const char* deviceUniqueIdUTF8);
-
- virtual int32_t StartCapture(const VideoCaptureCapability& capability);
- virtual int32_t StopCapture();
- virtual bool CaptureStarted();
- virtual int32_t CaptureSettings(VideoCaptureCapability& settings);
- virtual int32_t SetCaptureRotation(VideoRotation rotation);
-
- int32_t OnIncomingFrame(uint8_t* videoFrame,
- size_t videoFrameLength,
- int32_t degrees,
- int64_t captureTime = 0);
-
- protected:
- virtual ~VideoCaptureAndroid();
-
- DeviceInfoAndroid _deviceInfo;
- jobject _jCapturer; // Global ref to Java VideoCaptureAndroid object.
- VideoCaptureCapability _captureCapability;
- VideoRotation _rotation;
- bool _captureStarted;
-};
-
-} // namespace videocapturemodule
-} // namespace webrtc
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_VIDEO_CAPTURE_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698