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

Unified Diff: media/capture/video/android/video_capture_device_factory_android.h

Issue 2286303003: Video capture Android: enable unittests for Camera2 API (Closed)
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: media/capture/video/android/video_capture_device_factory_android.h
diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/media/capture/video/android/video_capture_device_factory_android.h
index 400b8b43135c908ad4702455464c3538173255cf..1b0c999760b07d73ae9612a40e0b8319a8b70836 100644
--- a/media/capture/video/android/video_capture_device_factory_android.h
+++ b/media/capture/video/android/video_capture_device_factory_android.h
@@ -24,7 +24,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
int id,
jlong nativeVideoCaptureDeviceAndroid);
- VideoCaptureDeviceFactoryAndroid() {}
+ VideoCaptureDeviceFactoryAndroid() : test_mode_(false) {}
~VideoCaptureDeviceFactoryAndroid() override {}
std::unique_ptr<VideoCaptureDevice> CreateDevice(
@@ -34,7 +34,13 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device,
VideoCaptureFormats* supported_formats) override;
+ static bool IsLegacyOrDeprecatedDevice(const std::string& device_id);
+ void ConfigureForTesting() { test_mode_ = true; }
+
private:
+ // Switch to indicate that all created Java capturers will be in test mode.
+ bool test_mode_;
+
DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);
};
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698