Commit 1e32efc6 authored by Markus Handell's avatar Markus Handell Committed by Commit Bot

Revert "[PTZ] Add macOS support"

This reverts commit 6fc7c32c.

Reason for revert: crbug.com/1128470

Original change's description:
> [PTZ] Add macOS support
> 
> This CL makes sure a USB Webcam device on macOS properly advertises its
> PTZ support. When supported, the pan, tilt, and zoom controls (ranges
> and values) are available to websites that user has granted access to.
> 
> Bug: 934063
> Change-Id: I9d92d41fba0a6e9d518efb2501355d66cf77998f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368596
> Reviewed-by: François Beaufort <beaufort.francois@gmail.com>
> Reviewed-by: Guido Urdaneta <guidou@chromium.org>
> Reviewed-by: Reilly Grant <reillyg@chromium.org>
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
> Cr-Commit-Position: refs/heads/master@{#807387}

TBR=avi@chromium.org,beaufort.francois@gmail.com,reillyg@chromium.org,guidou@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 934063
Change-Id: I88b1a41d28f5ad34f149f489b22eae6753e051dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418577Reviewed-by: default avatarMarkus Handell <handellm@google.com>
Commit-Queue: Markus Handell <handellm@google.com>
Cr-Commit-Position: refs/heads/master@{#808384}
parent 8ce8acbb
...@@ -120,11 +120,10 @@ void VideoCaptureDeviceFactoryMac::GetDevicesInfo( ...@@ -120,11 +120,10 @@ void VideoCaptureDeviceFactoryMac::GetDevicesInfo(
: VideoCaptureTransportType::OTHER_TRANSPORT; : VideoCaptureTransportType::OTHER_TRANSPORT;
const std::string model_id = VideoCaptureDeviceMac::GetDeviceModelId( const std::string model_id = VideoCaptureDeviceMac::GetDeviceModelId(
device_id, capture_api, device_transport_type); device_id, capture_api, device_transport_type);
bool pan_tilt_zoom_supported =
VideoCaptureDeviceMac::IsPanTiltZoomSupported(model_id);
VideoCaptureDeviceDescriptor descriptor( VideoCaptureDeviceDescriptor descriptor(
[[[capture_devices valueForKey:key] deviceName] UTF8String], device_id, [[[capture_devices valueForKey:key] deviceName] UTF8String], device_id,
model_id, capture_api, pan_tilt_zoom_supported, device_transport_type); model_id, capture_api,
/*pan_tilt_zoom_supported=*/false, device_transport_type);
if (IsDeviceBlocked(descriptor)) if (IsDeviceBlocked(descriptor))
continue; continue;
devices_info.emplace_back(descriptor); devices_info.emplace_back(descriptor);
......
...@@ -101,8 +101,6 @@ class VideoCaptureDeviceMac ...@@ -101,8 +101,6 @@ class VideoCaptureDeviceMac
VideoCaptureApi capture_api, VideoCaptureApi capture_api,
VideoCaptureTransportType transport_type); VideoCaptureTransportType transport_type);
static bool IsPanTiltZoomSupported(const std::string& device_model);
private: private:
void SetErrorState(VideoCaptureError error, void SetErrorState(VideoCaptureError error,
const base::Location& from_here, const base::Location& from_here,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment