| Index: media/video/capture/video_capture_device.cc
|
| diff --git a/media/video/capture/video_capture_device.cc b/media/video/capture/video_capture_device.cc
|
| index 70c24df0acdc4c8bd5d5e69faf3ce0513c3bae32..dabeed305d4a6c04cc8166679269ed71a08dfd6f 100644
|
| --- a/media/video/capture/video_capture_device.cc
|
| +++ b/media/video/capture/video_capture_device.cc
|
| @@ -58,6 +58,13 @@ VideoCaptureDevice::Name::Name(const std::string& name,
|
| capture_api_class_(api_type),
|
| transport_type_(transport_type),
|
| is_blacklisted_(false) {}
|
| +#elif defined(ANDROID)
|
| +VideoCaptureDevice::Name::Name(const std::string& name,
|
| + const std::string& id,
|
| + const CaptureApiType api_type)
|
| + : device_name_(name),
|
| + unique_id_(id),
|
| + capture_api_class_(api_type) {}
|
| #endif
|
|
|
| VideoCaptureDevice::Name::~Name() {}
|
| @@ -102,6 +109,25 @@ const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
|
| return "Unknown API";
|
| }
|
| }
|
| +#elif defined(OS_ANDROID)
|
| +const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
|
| + switch(capture_api_type()) {
|
| + case API1:
|
| + return "Camera API1";
|
| + case API2_LEGACY:
|
| + return "Camera API2 Legacy";
|
| + case API2_FULL:
|
| + return "Camera API2 Full";
|
| + case API2_LIMITED:
|
| + return "Camera API2 Limited";
|
| + case TANGO:
|
| + return "Tango API";
|
| + case API_TYPE_UNKNOWN:
|
| + default:
|
| + NOTREACHED() << "Unknown Video Capture API type!";
|
| + return "Unknown API";
|
| + }
|
| +}
|
| #endif
|
|
|
| VideoCaptureDevice::~VideoCaptureDevice() {}
|
|
|