Bug 2055093 - Cherry-pick upstream libwebrtc commit bb91915655 r=webrtc-reviewers,dbaker
Upstream commit: https://webrtc.googlesource.com/src/+/bb91915655ac409c482e0bf25304605a06435608 In VideoCaptureDS use Stop instead of StopWhenReady As reported on Firefox an Insta360 Link 2 Pro camera has a driver bug that leaves the camera light on until reboot when using StopWhenReady during teardown of a capture session. See https://bugzilla.mozilla.org/show_bug.cgi?id=2055093 Using Stop instead works around the driver bug, and better matches Chromium's DirectShow backend. Bug: none Change-Id: I90862fb94907638394df476abf4fcca3b532f50c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/497541 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Andreas Pehrson <apehrson@mozilla.com> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48444} Differential Revision: https://phabricator.services.mozilla.com/D322705
This commit is contained in:
committed by
pehrsons@gmail.com
parent
84e9c8aabd
commit
59db3686ed
@@ -153,7 +153,7 @@ int32_t VideoCaptureDS::StartCapture(const VideoCaptureCapability& capability) {
|
||||
int32_t VideoCaptureDS::StopCapture() {
|
||||
RTC_DCHECK_RUN_ON(&api_checker_);
|
||||
|
||||
HRESULT hr = _mediaControl->StopWhenReady();
|
||||
HRESULT hr = _mediaControl->Stop();
|
||||
if (FAILED(hr)) {
|
||||
RTC_LOG(LS_INFO) << "Failed to stop the capture graph. " << hr;
|
||||
return -1;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
We cherry-picked this in bug 2055093
|
||||
Reference in New Issue
Block a user