| Index: device/capture/content/android/screen_capture_machine_android.h
|
| diff --git a/media/capture/content/android/screen_capture_machine_android.h b/device/capture/content/android/screen_capture_machine_android.h
|
| similarity index 73%
|
| rename from media/capture/content/android/screen_capture_machine_android.h
|
| rename to device/capture/content/android/screen_capture_machine_android.h
|
| index 84bf1c71378d03049ee345776971907614eb8921..c2c2166ac8ae92d57812cf773c6c436c10108294 100644
|
| --- a/media/capture/content/android/screen_capture_machine_android.h
|
| +++ b/device/capture/content/android/screen_capture_machine_android.h
|
| @@ -2,19 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
| -#define MEDIA_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
| +#ifndef DEVICE_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
| +#define DEVICE_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
|
|
| #include <jni.h>
|
| #include <memory>
|
|
|
| #include "base/android/scoped_java_ref.h"
|
| -#include "media/capture/content/screen_capture_device_core.h"
|
| +#include "device/capture/capture_export.h"
|
| +#include "device/capture/content/screen_capture_device_core.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // ScreenCaptureMachineAndroid captures 32bit RGB or YUV420 triplanar.
|
| -class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
| +class CAPTURE_EXPORT ScreenCaptureMachineAndroid : public VideoCaptureMachine {
|
| public:
|
| ScreenCaptureMachineAndroid();
|
| ~ScreenCaptureMachineAndroid() override;
|
| @@ -23,7 +24,7 @@ class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
| static base::android::ScopedJavaLocalRef<jobject>
|
| createScreenCaptureMachineAndroid(jlong nativeScreenCaptureMachineAndroid);
|
|
|
| - // Implement org.chromium.media.ScreenCapture.nativeOnRGBAFrameAvailable.
|
| + // Implement org.chromium.device.ScreenCapture.nativeOnRGBAFrameAvailable.
|
| void OnRGBAFrameAvailable(JNIEnv* env,
|
| jobject obj,
|
| jobject buf,
|
| @@ -33,7 +34,7 @@ class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
| jint width,
|
| jint height,
|
| jlong timestamp);
|
| - // Implement org.chromium.media.ScreenCapture.nativeOnI420FrameAvailable.
|
| + // Implement org.chromium.device.ScreenCapture.nativeOnI420FrameAvailable.
|
| void OnI420FrameAvailable(JNIEnv* env,
|
| jobject obj,
|
| jobject y_buffer,
|
| @@ -48,11 +49,11 @@ class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
| jint height,
|
| jlong timestamp);
|
|
|
| - // Implement org.chromium.media.ScreenCapture.nativeOnActivityResult.
|
| + // Implement org.chromium.device.ScreenCapture.nativeOnActivityResult.
|
| void OnActivityResult(JNIEnv* env, jobject obj, jboolean result);
|
|
|
| // VideoCaptureMachine overrides.
|
| - void Start(const scoped_refptr<media::ThreadSafeCaptureOracle>& oracle_proxy,
|
| + void Start(const scoped_refptr<ThreadSafeCaptureOracle>& oracle_proxy,
|
| const media::VideoCaptureParams& params,
|
| const base::Callback<void(bool)> callback) override;
|
| void Stop(const base::Closure& callback) override;
|
| @@ -60,7 +61,7 @@ class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
|
|
| private:
|
| // Makes all the decisions about which frames to copy, and how.
|
| - scoped_refptr<media::ThreadSafeCaptureOracle> oracle_proxy_;
|
| + scoped_refptr<ThreadSafeCaptureOracle> oracle_proxy_;
|
|
|
| // Cache the last frame for possible refreshing.
|
| scoped_refptr<VideoFrame> lastFrame_;
|
| @@ -71,6 +72,6 @@ class ScreenCaptureMachineAndroid : public media::VideoCaptureMachine {
|
| DISALLOW_COPY_AND_ASSIGN(ScreenCaptureMachineAndroid);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
| +#endif // DEVICE_CAPTURE_CONTENT_ANDROID_SCREEN_CAPTURE_MACHINE_ANDROID_H_
|
|
|